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,6 @@
<GUIAsset
canSave="true"
canSaveDynamicFields="true"
scriptFile="@assetFile=shapeEdSelectWindow.ed.gui"
GUIFile="@assetFile=shapeEdSelectWindow.ed.gui"
VersionId="1" />

View file

@ -48,12 +48,12 @@ singleton GuiControlProfile(GuiShapeEdTextListProfile : ToolsGuiTextListProfile)
singleton GuiControlProfile(GuiShapeEdRolloutProfile : GuiInspectorRolloutProfile0)
{
bitmap = "tools/editorClasses/gui/images/rollout";
bitmapAsset = "ToolsModule:rollout_image";
category = "Editor";
};
singleton GuiControlProfile( GuiShapeEdTransitionSliderProfile )
{
bitmap = "tools/shapeEditor/images/transition_slider";
bitmapAsset = "ToolsModule:transition_slider_image";
category = "Core";
};

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -52,7 +52,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
position = "94 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -70,7 +70,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Show grid";
hovertime = "1000";
bitmap = "tools/gui/images/menubar/show-grid";
bitmapAsset = "ToolsModule:show_grid_n_image";
text = "";
groupNum = "-1";
buttonType = "ToggleButton";
@ -92,7 +92,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Fit Camera to Shape (F)";
hovertime = "1000";
bitmap = "tools/gui/images/menubar/fit-selection";
bitmapAsset = "ToolsModule:fit_selection_n_image";
text = "";
groupNum = "-1";
buttonType = "PushButton";
@ -114,7 +114,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Orbit the selected node";
hovertime = "1000";
bitmap = "tools/gui/images/menubar/orbit-cam";
bitmapAsset = "ToolsModule:orbit_cam_n_image";
text = "";
groupNum = "-1";
buttonType = "ToggleButton";
@ -125,7 +125,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
position = "202 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -143,7 +143,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Show Nodes (N)";
hovertime = "1000";
bitmap = "tools/shapeEditor/images/shownodes_btn";
bitmapAsset = "ToolsModule:shownodes_btn_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -164,7 +164,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Toggle shape transparency in the preview window (T)";
hovertime = "1000";
bitmap = "tools/shapeEditor/images/ghost_btn";
bitmapAsset = "ToolsModule:ghost_btn_n_image";
buttonType = "ToggleButton";
groupNum = "0";
useMouseEvents = "0";
@ -185,7 +185,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Toggle shape wireframe in the preview window (R)";
hovertime = "1000";
bitmap = "tools/shapeEditor/images/show-wireframe";
bitmapAsset = "ToolsModule:show_wireframe_n_image";
buttonType = "ToggleButton";
groupNum = "0";
useMouseEvents = "0";
@ -195,7 +195,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
position = "309 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -214,7 +214,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Toggle shape bounding box in the preview window";
hovertime = "1000";
bitmap = "tools/shapeEditor/images/object-bounds";
bitmapAsset = "ToolsModule:object_bounds_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -236,7 +236,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Toggle selected object bounding box in the preview window";
hovertime = "1000";
bitmap = "tools/shapeEditor/images/object-fit-bounds";
bitmapAsset = "ToolsModule:object_fit_bounds_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -258,7 +258,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Toggle rendering of collision meshes in the preview window";
hovertime = "1000";
bitmap = "tools/shapeEditor/images/collision-shape";
bitmapAsset = "ToolsModule:collision_shape_n_image";
groupNum = "-1";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -268,7 +268,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
position = "415 3";
Extent = "2 26";
MinExtent = "1 1";
bitmap = "tools/gui/images/separator-h.png";
bitmapAsset = "ToolsModule:separator_h_image";
};
new GuiBitmapButtonCtrl() {
internalName = "showAdvanced";
@ -286,7 +286,7 @@ $guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Toggle Advanced Properties Window";
hovertime = "1000";
bitmap = "tools/shapeEditor/images/detail-levels_btn";
bitmapAsset = "ToolsModule:detail_levels_btn_n_image";
buttonType = "ToggleButton";
groupNum = "0";
useMouseEvents = "0";

View file

@ -157,7 +157,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapCtrl(){
bitmap = "tools/gui/images/inactive-overlay";
bitmapAsset = "ToolsModule:inactive_overlay_image";
position = "57 19";
Extent = "122 20";
tooltip = "Levels needs to be selected to enable the detail level slider";
@ -690,7 +690,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapCtrl(){
bitmap = "tools/gui/images/inactive-overlay";
bitmapAsset = "ToolsModule:inactive_overlay_image";
position = "4 18";
Extent = "193 64";
tooltip = "Imposters must be enabled, and an imposter detail level selected to edit these properties";
@ -846,7 +846,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
profile = "ToolsGuiTextProfile";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -865,7 +865,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
isContainer = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/new";
bitmapAsset = "ToolsModule:new_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -989,7 +989,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/shapeEditor/images/playfwd_btn";
bitmapAsset = "ToolsModule:playfwd_btn_n_image";
groupNum = "0";
buttonType = "ToggleButton";
useMouseEvents = "0";
@ -1171,7 +1171,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
};
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1190,7 +1190,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/new";
bitmapAsset = "ToolsModule:new_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -1229,7 +1229,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/shapeEditor/images/playbkwd_btn";
bitmapAsset = "ToolsModule:playbkwd_btn_n_image";
groupNum = "0";
buttonType = "RadioButton";
useMouseEvents = "0";
@ -1250,7 +1250,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/shapeEditor/images/pause_btn";
bitmapAsset = "ToolsModule:pause_btn_n_image";
groupNum = "0";
buttonType = "RadioButton";
useMouseEvents = "0";
@ -1271,7 +1271,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/shapeEditor/images/playfwd_btn";
bitmapAsset = "ToolsModule:playfwd_btn_n_image";
groupNum = "0";
buttonType = "RadioButton";
useMouseEvents = "0";
@ -1747,7 +1747,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
canSaveDynamicFields = "0";
};
new GuiBitmapCtrl() {
bitmap = "tools/gui/images/inactive-overlay";
bitmapAsset = "ToolsModule:inactive_overlay_image";
position = "0 47";
extent = "199 175";
horizSizing = "right";

View file

@ -207,7 +207,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
groupNum = "0";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/shapeEditor/images/back_btn";
bitmapAsset = "ToolsModule:back_btn_n_image";
};
new GuiBitmapButtonCtrl() {
canSaveDynamicFields = "0";
@ -227,7 +227,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
groupNum = "0";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/shapeEditor/images/stepback_btn";
bitmapAsset = "ToolsModule:stepback_btn_n_image";
internalName = "stepBkwdBtn";
};
new GuiControl() {
@ -263,7 +263,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
groupNum = "0";
buttonType = "RadioButton";
useMouseEvents = "0";
bitmap = "tools/shapeEditor/images/playbkwd_btn";
bitmapAsset = "ToolsModule:playbkwd_btn_n_image";
};
new GuiBitmapButtonCtrl() {
internalName = "pauseBtn";
@ -284,7 +284,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
groupNum = "0";
buttonType = "RadioButton";
useMouseEvents = "0";
bitmap = "tools/shapeEditor/images/pause_btn";
bitmapAsset = "ToolsModule:pause_btn_n_image";
};
new GuiBitmapButtonCtrl() {
internalName = "playFwdBtn";
@ -305,7 +305,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
groupNum = "0";
buttonType = "RadioButton";
useMouseEvents = "0";
bitmap = "tools/shapeEditor/images/playfwd_btn";
bitmapAsset = "ToolsModule:playfwd_btn_n_image";
};
};
new GuiBitmapButtonCtrl() {
@ -326,7 +326,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
groupNum = "0";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/shapeEditor/images/stepfwd_btn";
bitmapAsset = "ToolsModule:stepfwd_btn_n_image";
internalName = "stepFwdBtn";
};
new GuiBitmapButtonCtrl() {
@ -347,7 +347,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
groupNum = "0";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/shapeEditor/images/fwd_btn";
bitmapAsset = "ToolsModule:fwd_btn_n_image";
};
new GuiButtonCtrl() {
canSaveDynamicFields = "0";
@ -388,7 +388,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
groupNum = "0";
buttonType = "ToggleButton";
useMouseEvents = "0";
bitmap = "tools/shapeEditor/images/pingpong_btn";
bitmapAsset = "ToolsModule:pingpong_btn_n_image";
};
new GuiTextEditCtrl() {
internalName = "timeScale";
@ -417,7 +417,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
position = "39 0";
Extent = "8 13";
MinExtent = "1 1";
bitmap = "tools/shapeEditor/images/seq_bar-in";
bitmapAsset = "ToolsModule:seq_bar_in_n_image";
ToolTip = "Set the In Point to the Current Frame";
Command = "ShapeEdSequences.onEditSeqInOut(\"in\", ShapeEdSeqSlider.getValue());";
};
@ -429,7 +429,7 @@ $guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
position = "765 0";
Extent = "8 13";
MinExtent = "1 1";
bitmap = "tools/shapeEditor/images/seq_bar-out";
bitmapAsset = "ToolsModule:seq_bar_out_n_image";
ToolTip = "Set the Out Point to the Current Frame";
Command = "ShapeEdSequences.onEditSeqInOut(\"out\", ShapeEdSeqSlider.getValue());";
};

View file

@ -430,7 +430,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
groupNum = "0";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/new";
bitmapAsset = "ToolsModule:new_n_image";
};
new GuiBitmapButtonCtrl() {
internalName = "deleteTriggerBtn";
@ -451,7 +451,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
groupNum = "0";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
// Trigger list
new GuiControl() {
@ -617,7 +617,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
treeView = ShapeEdNodeTreeView;
};
new GuiBitmapButtonCtrl() {
bitmap = "tools/gui/images/clear-icon";
bitmapAsset = "ToolsModule:clear_icon_n_image";
groupNum = "-1";
buttonType = "PushButton";
useMouseEvents = "0";
@ -838,7 +838,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
buttonType = "RadioButton";
useMouseEvents = "0";
buttonMargin = "0 4";
iconBitmap = "tools/gui/images/menubar/world-transform_n";
bitmapAsset = "ToolsModule:world_transform_n_image";
textMargin = "25";
};
new GuiIconButtonCtrl() {
@ -862,7 +862,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
buttonType = "RadioButton";
useMouseEvents = "0";
buttonMargin = "0 4";
iconBitmap = "tools/gui/images/menubar/object-transform_n";
bitmapAsset = "ToolsModule:object_transform_n_image";
textMargin = "26";
};
new GuiTextEditCtrl() {
@ -1137,7 +1137,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
internalName = "objectNode";
};
new GuiBitmapCtrl(){
bitmap = "tools/gui/images/inactive-overlay";
bitmapAsset = "ToolsModule:inactive_overlay_image";
position = "4 45";
extent = "193 42";
tooltip = "A mesh must be selected to edit these properties";
@ -1353,7 +1353,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
buttonType = "PushButton";
useMouseEvents = "0";
buttonMargin = "0 4";
iconBitmap = "tools/worldEditor/images/toolbar/material-editor_n";
bitmapAsset = "ToolsModule:material_editor_n_image";
textMargin = "25";
};
new GuiCheckBoxCtrl() {
@ -1393,7 +1393,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
groupNum = "0";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/save-icon";
bitmapAsset = "ToolsModule:save_icon_n_image";
};
new GuiBitmapButtonCtrl() {
internalName = "newBtn";
@ -1414,7 +1414,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
groupNum = "0";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/new";
bitmapAsset = "ToolsModule:new_n_image";
};
new GuiBitmapButtonCtrl() {
internalName = "deleteBtn";
@ -1435,7 +1435,7 @@ $guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
groupNum = "0";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/delete";
bitmapAsset = "ToolsModule:delete_n_image";
};
};
//--- OBJECT WRITE END ---

View file

@ -213,7 +213,7 @@ $guiContent = new GuiControl() {
groupNum = "0";
buttonType = "PushButton";
useMouseEvents = "0";
bitmap = "tools/gui/images/folderUp";
bitmapAsset = "ToolsModule:folderUp_image";
};
new GuiPopUpMenuCtrl(ShapeEdSelectMenu) {
canSaveDynamicFields = "0";