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
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

View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="DebuggerBreakConditionDlg, EditorGuiGroup"
scriptFile="@assetFile=breakConditionDlg.ed.gui"
GUIFile="@assetFile=breakConditionDlg.ed.gui"
VersionId="1" />

View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="DebuggerConnectDlg, EditorGuiGroup"
scriptFile="@assetFile=connectDlg.ed.gui"
GUIFile="@assetFile=connectDlg.ed.gui"
VersionId="1" />

View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="DebuggerEditWatchDlg, EditorGuiGroup"
scriptFile="@assetFile=editWatchDlg.ed.gui"
GUIFile="@assetFile=editWatchDlg.ed.gui"
VersionId="1" />

View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="DebuggerFindDlg, EditorGuiGroup"
scriptFile="@assetFile=findDlg.ed.gui"
GUIFile="@assetFile=findDlg.ed.gui"
VersionId="1" />

View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="DebuggerGui, EditorGuiGroup"
scriptFile="@assetFile=debugger.ed.gui"
GUIFile="@assetFile=debugger.ed.gui"
VersionId="1" />

View file

@ -0,0 +1,7 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="DebuggerWatchDlg, EditorGuiGroup"
scriptFile="@assetFile=watchDlg.ed.gui"
GUIFile="@assetFile=watchDlg.ed.gui"
VersionId="1" />