Jeff Hutchinson 717c7acca9 Merge remote-tracking branch 'devhead/Preview4_0' into tsneo ... # Conflicts: # Templates/BaseGame/game/data/ui/guis/loadingGui.gui # Templates/BaseGame/game/data/ui/guis/mainMenu.gui # Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui # Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui # Templates/BaseGame/game/tools/forestEditor/brushes.tscript		2021-08-13 20:14:39 -04:00
..
bin	Old project generator is dead	2019-11-26 22:02:12 +10:00
lib	Update usage of TinyXML to use TinyXML2	2021-07-31 21:54:19 +02:00
modules/Verve	(Mostly) updated verve implementation.	2019-03-07 16:23:41 -06:00
source	Merge remote-tracking branch 'devhead/Preview4_0' into tsneo	2021-08-13 20:14:39 -04:00