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="IODropdownDlg"
scriptFile="@assetFile=IODropdownDlg.ed.gui"
GUIFile="@assetFile=IODropdownDlg.ed.gui"
VersionId="1" />

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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