TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-04 12:01:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
Torque3D/Templates/BaseGame/game/tools/materialEditor
History
Jeff Hutchinson 17231ca9fb Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 
# Conflicts:
#	Engine/source/platform/types.visualc.h
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript
#	Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
#	Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui
2021-09-01 22:26:23 -04:00
..
gui Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 2021-08-13 20:14:39 -04:00
scripts Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 2021-09-01 22:26:23 -04:00
main.tscript Added getShapeConstructorFilePath console function on shapeAsset 2021-08-02 04:20:27 -05:00