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

@ -170,7 +170,7 @@ singleton GuiControlProfile ( VEditorScrollProfile : VEditorDefaultProfile )
border = false;
hasBitmapArray = true;
bitmap = "./Images/ScrollBar";
bitmapAsset = "ToolsModule:Images_ScrollBar_image";
};
singleton GuiControlProfile ( VEditorCheckBoxProfile : GuiCheckBoxProfile )
@ -184,7 +184,7 @@ singleton GuiControlProfile( VEditorPropertyRolloutProfile : GuiRolloutProfile )
{
border = 0;
hasBitmapArray = true;
bitmap = "./Images/PropertyRollout";
bitmapAsset = "ToolsModule:PropertyRollout_image";
fontType = "Arial";
fontSize = 12;
@ -210,4 +210,4 @@ singleton GuiControlProfile( VEditorPreferenceLabelProfile : GuiTextProfile )
fillColor = "242 241 240";
fillColorHL = "242 241 240";
fillColorNA = "242 241 240";
};
};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="GroupBackground_h_image"
imageFile="@assetFile=GroupBackground_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="GroupBackground_i_image"
imageFile="@assetFile=GroupBackground_i.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="GroupBackground_image"
imageFile="@assetFile=GroupBackground.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Images_ScrollBar_image"
imageFile="@assetFile=scrollBar.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="PropertyRollout_image"
imageFile="@assetFile=PropertyRollout.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="ScrollBar__image"
imageFile="@assetFile=ScrollBar_.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="Spacer_image"
imageFile="@assetFile=Spacer.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddEvent_d_image"
imageFile="@assetFile=btn_AddEvent_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddEvent_h_image"
imageFile="@assetFile=btn_AddEvent_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddEvent_image"
imageFile="@assetFile=btn_AddEvent.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddGroup_d_image"
imageFile="@assetFile=btn_AddGroup_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddGroup_h_image"
imageFile="@assetFile=btn_AddGroup_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddGroup_image"
imageFile="@assetFile=btn_AddGroup.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddL_d_image"
imageFile="@assetFile=btn_AddL_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddL_h_image"
imageFile="@assetFile=btn_AddL_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddL_image"
imageFile="@assetFile=btn_AddL.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddR_d_image"
imageFile="@assetFile=btn_AddR_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddR_h_image"
imageFile="@assetFile=btn_AddR_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddR_image"
imageFile="@assetFile=btn_AddR.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddSml_d_image"
imageFile="@assetFile=btn_AddSml_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddSml_h_image"
imageFile="@assetFile=btn_AddSml_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddSml_image"
imageFile="@assetFile=btn_AddSml.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddTrack_d_image"
imageFile="@assetFile=btn_AddTrack_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddTrack_h_image"
imageFile="@assetFile=btn_AddTrack_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_AddTrack_image"
imageFile="@assetFile=btn_AddTrack.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_DeleteSml_d_image"
imageFile="@assetFile=btn_DeleteSml_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_DeleteSml_h_image"
imageFile="@assetFile=btn_DeleteSml_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_DeleteSml_image"
imageFile="@assetFile=btn_DeleteSml.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Delete_d_image"
imageFile="@assetFile=btn_Delete_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Delete_h_image"
imageFile="@assetFile=btn_Delete_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Delete_image"
imageFile="@assetFile=btn_Delete.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Forward_d_image"
imageFile="@assetFile=btn_Forward_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Forward_h_image"
imageFile="@assetFile=btn_Forward_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Forward_image"
imageFile="@assetFile=btn_Forward.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Palette_d_image"
imageFile="@assetFile=btn_Palette_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Palette_h_image"
imageFile="@assetFile=btn_Palette_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Palette_n_image"
imageFile="@assetFile=btn_Palette_n.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Pause_d_image"
imageFile="@assetFile=btn_Pause_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Pause_h_image"
imageFile="@assetFile=btn_Pause_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Pause_image"
imageFile="@assetFile=btn_Pause.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Play_d_image"
imageFile="@assetFile=btn_Play_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Play_h_image"
imageFile="@assetFile=btn_Play_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Play_image"
imageFile="@assetFile=btn_Play.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Rewind_d_image"
imageFile="@assetFile=btn_Rewind_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Rewind_h_image"
imageFile="@assetFile=btn_Rewind_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_Rewind_image"
imageFile="@assetFile=btn_Rewind.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_StepB_d_image"
imageFile="@assetFile=btn_StepB_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_StepB_h_image"
imageFile="@assetFile=btn_StepB_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_StepB_image"
imageFile="@assetFile=btn_StepB.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_StepF_d_image"
imageFile="@assetFile=btn_StepF_d.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_StepF_h_image"
imageFile="@assetFile=btn_StepF_h.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -0,0 +1,8 @@
<ImageAsset
canSave="true"
canSaveDynamicFields="true"
AssetName="btn_StepF_image"
imageFile="@assetFile=btn_StepF.png"
UseMips="true"
isHDRImage="false"
imageType="Albedo" />

View file

@ -307,7 +307,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_AddGroup";
bitmapAsset = "ToolsModule:btn_AddGroup_image";
};
new GuiBitmapButtonCtrl(VerveEditorAddTrackButton) {
canSaveDynamicFields = "0";
@ -330,7 +330,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_AddTrack";
bitmapAsset = "ToolsModule:btn_AddTrack_image";
};
new GuiBitmapButtonCtrl(VerveEditorAddEventButton) {
canSaveDynamicFields = "0";
@ -352,7 +352,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_AddEvent";
bitmapAsset = "ToolsModule:btn_AddEvent_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -374,7 +374,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_Delete";
bitmapAsset = "ToolsModule:btn_Delete_image";
};
};
};
@ -623,7 +623,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_Rewind";
bitmapAsset = "ToolsModule:btn_Rewind_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -645,7 +645,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_StepB";
bitmapAsset = "ToolsModule:btn_StepB_image";
};
new GuiBitmapButtonCtrl(VerveEditorPlayButton) {
canSaveDynamicFields = "0";
@ -667,7 +667,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_Play";
bitmapAsset = "ToolsModule:btn_Play_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -689,7 +689,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_StepF";
bitmapAsset = "ToolsModule:btn_StepF_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -711,7 +711,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_Forward";
bitmapAsset = "ToolsModule:btn_Forward_image";
};
};
new GuiBitmapButtonCtrl() {
@ -734,7 +734,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_AddL";
bitmapAsset = "ToolsModule:btn_AddL_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -756,7 +756,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "./Images/btn_AddR";
bitmapAsset = "ToolsModule:btn_AddR_image";
};
};
};

View file

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

View file

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

View file

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

View file

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

View file

@ -22,4 +22,4 @@ function VerveEditor::InitInspectorFieldScripts()
exec( "./TypeVShapeAnimationEnum." @ $TorqueScriptFileExtension );
exec( "./TypeToggleEnum." @ $TorqueScriptFileExtension );
}
VerveEditor::InitInspectorFieldScripts();
VerveEditor::InitInspectorFieldScripts();

View file

@ -17,4 +17,4 @@ function VerveEditor::InitInspectorScripts()
exec( "./Fields/main." @ $TorqueScriptFileExtension );
}
VerveEditor::InitInspectorScripts();
VerveEditor::InitInspectorScripts();

View file

@ -26,7 +26,7 @@ function VerveEditorPlugin::onWorldEditorStartup( %this )
%tooltip = "Verve Editor (" @ %accel @ ")";
// Add ourselves to the ToolsToolbar
EditorGui.addToToolsToolbar( "VerveEditorPlugin", "VerveEditorPluginPalette", expandFilename( "tools/VerveEditor/GUI/Images/btn_Palette" ), %tooltip );
EditorGui.addToToolsToolbar( "VerveEditorPlugin", "VerveEditorPluginPalette", "ToolsModule:btn_Palette_n_image", %tooltip );
// Find and Store the Button.
%this.ToolbarButton = ToolsToolbarArray.findObjectByInternalName( "VerveEditorPluginPalette", false );

View file

@ -231,4 +231,4 @@ function VerveEditor::Reset()
// Stop.
$VerveEditor::Controller.Stop();
}
}
}