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
..
clientServer	Merge remote-tracking branch 'devhead/Preview4_0' into tsneo	2021-08-13 20:14:39 -04:00
console	Merge remote-tracking branch 'devhead/Preview4_0' into tsneo	2021-08-13 20:14:39 -04:00
gameObjects	Added getShapeConstructorFilePath console function on shapeAsset	2021-08-02 04:20:27 -05:00
gui	Added getShapeConstructorFilePath console function on shapeAsset	2021-08-02 04:20:27 -05:00
lighting	Further conversions of missed file fields in core and tools	2021-07-24 02:08:23 -05:00
postFX	Merge remote-tracking branch 'devhead/Preview4_0' into tsneo	2021-08-13 20:14:39 -04:00
rendering	Added getShapeConstructorFilePath console function on shapeAsset	2021-08-02 04:20:27 -05:00
sfx	Converts all game, gui editor, and system classes to utilize assets	2021-07-19 01:07:08 -05:00
utility	Merge remote-tracking branch 'devhead/Preview4_0' into tsneo	2021-08-13 20:14:39 -04:00
core.module	followup: readd, and rename the module.ScriptFile entries to thier lower case	2021-07-20 12:15:05 -05:00
core.tscript	followup: readd, and rename the module.ScriptFile entries to thier lower case	2021-07-20 12:15:05 -05:00
settings.xml	Updated path handling for loose asset files for CPP, Image, Level, Material, PostFX, Shape, Terrain, TerrainMat and StateMachine assets to be more predictable in when and how they expando the loose file path into a full, useable path	2020-02-04 01:47:28 -06:00