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
..
images	Converts all game, gui editor, and system classes to utilize assets	2021-07-19 01:07:08 -05:00
main.tscript	Added getShapeConstructorFilePath console function on shapeAsset	2021-08-02 04:20:27 -05:00
ParticleEditor.ed.gui	Merge remote-tracking branch 'devhead/Preview4_0' into tsneo	2021-08-13 20:14:39 -04:00
particleEditor.ed.tscript	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
particleEditorUndo.ed.tscript	Improve handling of non-default script filenames	2021-01-19 21:32:31 +01:00
particleEmitterEditor.ed.tscript	Added changes missed via merge failures.	2021-07-20 20:05:49 -05:00
particleParticleEditor.ed.tscript	Added changes missed via merge failures.	2021-07-20 20:05:49 -05:00
PE_Window.asset.taml	Converts all game, gui editor, and system classes to utilize assets	2021-07-19 01:07:08 -05:00