TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
4918 commits 5 branches 33 tags 958 MiB
Commit graph

4 commits

Author SHA1 Message Date
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
Areloch
3e131f5b8e Added changes missed via merge failures. 
Removed some unused files/references that were causing errors, related to issues #502 & #512
 2021-07-20 20:05:49 -05:00
Jeff Hutchinson
b2bbd771f6 more torquescript template fixes. 2021-05-04 22:49:19 -04:00
Lukas Aldershaab
099dd4f1f3 Parametrize script extension, default to 'tscript' 2021-01-19 21:32:31 +01:00
Renamed from Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.cs (Browse further)