TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source 
# 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
This commit is contained in:
Jeff Hutchinson 2021-08-13 20:14:39 -04:00
commit 717c7acca9
2266 changed files with 48780 additions and 26034 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Templates/BaseGame/game/data/gameUI/GUIs/PlayGui.asset.taml Normal file
View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="PlayGui"
scriptFile="@assetFile=playGui.gui"
GUIFile="@assetFile=playGui.gui"
VersionId="1" />

2
Templates/BaseGame/game/data/gameUI/gameUI.tscript
View file

@ -16,7 +16,7 @@ function gameUI::initClient(%this)
{
//guis
%this.queueExec("./GUIs/playGui.gui");
%this.queueExec("./GUIs/playGui." @ $TorqueScriptFileExtension);
%this.queueExec("./GUIs/playGui");
}
function gameUI::onCreateClientConnection(%this){}