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
..
cache/shaderCache	comparison flaw in spotlight animation check. also, proper location of shadercache dir	2020-07-07 16:54:25 -05:00
ExampleModule	Merge remote-tracking branch 'devhead/Preview4_0' into tsneo	2021-08-13 20:14:39 -04:00
gameUI	Merge remote-tracking branch 'devhead/Preview4_0' into tsneo	2021-08-13 20:14:39 -04:00
Prototyping	Added getShapeConstructorFilePath console function on shapeAsset	2021-08-02 04:20:27 -05:00
ui	Merge remote-tracking branch 'devhead/Preview4_0' into tsneo	2021-08-13 20:14:39 -04:00
defaults.tscript	Merge remote-tracking branch 'devhead/Preview4_0' into tsneo	2021-05-06 21:08:53 -04:00
splash.png	Initial pass to rework and cleanup the main UI interface	2020-05-20 17:19:52 -05:00
torque.png	Initial pass to rework and cleanup the main UI interface	2020-05-20 17:19:52 -05:00