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
..
componentFile.tscript.template	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
CppAssetTypeClassFile.cpp.template	Adjusts handling of C++ asset types by sidestepping the asset definition(as the C++ files don't directly interface with the engine at runtime anyways, so it's unneeded)	2021-01-02 01:58:15 -06:00
CppAssetTypeClassFile.h.template	Adjusts handling of C++ asset types by sidestepping the asset definition(as the C++ files don't directly interface with the engine at runtime anyways, so it's unneeded)	2021-01-02 01:58:15 -06:00
CppModuleFile.cpp.template	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
CppRenderClassFile.cpp.template	Adjusts handling of C++ asset types by sidestepping the asset definition(as the C++ files don't directly interface with the engine at runtime anyways, so it's unneeded)	2021-01-02 01:58:15 -06:00
CppRenderClassFile.h.template	Adjusts handling of C++ asset types by sidestepping the asset definition(as the C++ files don't directly interface with the engine at runtime anyways, so it's unneeded)	2021-01-02 01:58:15 -06:00
CppSceneObjectClassFile.cpp.template	Adjusts handling of C++ asset types by sidestepping the asset definition(as the C++ files don't directly interface with the engine at runtime anyways, so it's unneeded)	2021-01-02 01:58:15 -06:00
CppSceneObjectClassFile.h.template	Adjusts handling of C++ asset types by sidestepping the asset definition(as the C++ files don't directly interface with the engine at runtime anyways, so it's unneeded)	2021-01-02 01:58:15 -06:00
CppScriptClassFile.cpp.template	Adjusts handling of C++ asset types by sidestepping the asset definition(as the C++ files don't directly interface with the engine at runtime anyways, so it's unneeded)	2021-01-02 01:58:15 -06:00
CppScriptClassFile.h.template	Adjusts handling of C++ asset types by sidestepping the asset definition(as the C++ files don't directly interface with the engine at runtime anyways, so it's unneeded)	2021-01-02 01:58:15 -06:00
CppStaticClassFile.cpp.template	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
CppStaticClassFile.h.template	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
guiFile.gui.template	lotsa fixes.	2021-05-04 21:18:15 -04:00
guiFile.tscript.template	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
module.tscript.template	Added changes missed via merge failures.	2021-07-20 20:05:49 -05:00
postFXFile.tscript.template	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
postFXFileP.glsl.template	Reorgs the editing of postFX so the editor settings edits the default config, and Scene > edit postFX to edit scene	2020-09-11 02:28:15 -05:00
postFXFileP.hlsl.template	Reorgs the editing of postFX so the editor settings edits the default config, and Scene > edit postFX to edit scene	2020-09-11 02:28:15 -05:00
terrainMaterial.tscript.template	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00