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

Added fallback handling to MaterialAssets if the asset was found but the matDef was not

Browse source 
Added import config handling for prepending Directory to asset name
Added handling for import config of appending a sound suffix
Integrated handling of directory prepend and asset type suffix to rename issue resolution of asset importing
Corrected miswording of warn message for duplicate object names
Correct GUI issues with verve tools
Convert verve tools to utilize assets for their GUI elements
Fix window binding/naming issue depending on window mode for verve
Fix popup menus formatting for verve
WIP fix for material swap in Material editor. Corrects crash, but swap action is unreliable depending on object type
Fix display issue with mission area editor toolbar button image
Fix tooltip display of SFXEmitters in editor tree to correctly show the bound asset
Changed network graph accelerator keybind from just N to Ctrl N to avoid keybind issues when typing
Fixed Create New Emitter button in particle emitter that was showing as no texture
This commit is contained in:
Areloch 2021-10-28 23:52:58 -05:00
parent 59bebe0bb4
commit 0fab2ebf54
34 changed files with 590 additions and 636 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/VerveEditor/GUI/GuiProfiles.tscript
View file

@ -92,7 +92,7 @@ singleton GuiControlProfile ( VEditorBitmapButtonProfile : VEditorDefaultProfile
justify = "center";
hasBitmapArray = true;
bitmap = "./Images/Button";
bitmapAsset = "ToolsModule:button_image";
};
//-----------------------------------------------------------------------------

70
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditor.gui
View file

@ -4,15 +4,15 @@ $guiContent = new GuiControl(VerveEditorGui) {
Enabled = "1";
isContainer = "1";
Profile = "VEditorDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
HorizSizing = "width";
VertSizing = "height";
Position = "0 0";
Extent = "1024 768";
MinExtent = "8 2";
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
new GuiControl() {
@ -44,7 +44,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -80,7 +80,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
new VEditorButton() {
@ -96,7 +96,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
MinExtent = "210 1";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
text = "";
groupNum = "-1";
@ -122,7 +122,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
};
};
@ -140,7 +140,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -176,7 +176,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
new VTimeLineControl(VerveEditorTrackTimeLine) {
@ -192,7 +192,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
IsController = "0";
Controller = "VerveEditorController";
@ -211,7 +211,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
MinExtent = "8 8";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
text = "";
groupNum = "-1";
@ -237,7 +237,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
};
};
@ -256,7 +256,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiDefaultProfile";
tooltipprofile = "ToolsGuiDefaultProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -283,7 +283,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
new GuiBitmapButtonCtrl(VerveEditorAddGroupButton) {
@ -300,7 +300,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = "Add New Group";
command = "$ThisControl.DisplayContextMenu();";
hovertime = "1000";
@ -323,7 +323,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = "Add New Track";
command = "$ThisControl.DisplayContextMenu();";
hovertime = "1000";
@ -345,7 +345,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = "Add New Event";
command = "VerveEditor::AddEvent();";
hovertime = "1000";
@ -367,7 +367,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = "Delete Selected Object(s)";
command = "VerveEditor::DeleteSelection();";
hovertime = "1000";
@ -391,7 +391,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -427,7 +427,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
new VTimeLineControl(VerveEditorTimeLine) {
@ -443,7 +443,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
IsController = "1";
Controller = "VerveEditorController";
@ -465,7 +465,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -496,7 +496,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
};
};
@ -513,7 +513,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiDefaultProfile";
tooltipprofile = "ToolsGuiDefaultProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -540,7 +540,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
};
};
@ -557,7 +557,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiDefaultProfile";
tooltipprofile = "ToolsGuiDefaultProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -584,7 +584,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
new GuiControl() {
@ -600,7 +600,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
new GuiBitmapButtonCtrl() {
@ -616,7 +616,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = "Jump Backwards";
command = "VerveEditor::Rewind();";
hovertime = "1000";
@ -638,7 +638,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = "Step Backwards 1 Frame";
command = "VerveEditor::StepB();";
hovertime = "1000";
@ -660,7 +660,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = "Play / Pause";
command = "VerveEditor::TogglePlay( $ThisControl );";
hovertime = "1000";
@ -682,7 +682,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = "Step Forward 1 Frame";
command = "VerveEditor::StepF();";
hovertime = "1000";
@ -704,7 +704,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = "Jump Forward";
command = "VerveEditor::Forward();";
hovertime = "1000";
@ -727,7 +727,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = "Insert Time (Front)";
command = "VerveEditor::InsertTimeFront();";
hovertime = "1000";
@ -749,7 +749,7 @@ $guiContent = new GuiControl(VerveEditorGui) {
canSave = "1";
isDecoy = "0";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
tooltip = "Insert Time (Back)";
command = "VerveEditor::InsertTimeBack();";
hovertime = "1000";

54
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorGroupBuilder.gui
View file

@ -1,7 +1,7 @@
//--- OBJECT WRITE BEGIN ---
$guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
isContainer = "1";
Profile = "GuiDefaultProfile";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "0 0";
@ -9,7 +9,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
MinExtent = "8 8";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
@ -30,7 +30,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "1";
Profile = "GuiWindowProfile";
Profile = "ToolsGuiWindowProfile";
HorizSizing = "center";
VertSizing = "center";
position = "268 181";
@ -38,7 +38,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
MinExtent = "256 8";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
@ -52,7 +52,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "0";
Profile = "GuiTextProfile";
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "14 30";
@ -60,7 +60,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
MinExtent = "8 8";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
};
@ -78,7 +78,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "0";
Profile = "GuiTextEditProfile";
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "width";
VertSizing = "bottom";
position = "79 29";
@ -86,13 +86,13 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
MinExtent = "8 8";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
};
new GuiBitmapBorderCtrl() {
isContainer = "0";
Profile = "GuiGroupBorderProfile";
Profile = "ToolsGuiGroupBorderProfile";
HorizSizing = "width";
VertSizing = "bottom";
position = "7 55";
@ -100,7 +100,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
MinExtent = "1 1";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
@ -112,7 +112,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
ChangeChildSizeToFit = "1";
ChangeChildPosition = "1";
isContainer = "1";
Profile = "GuiTransparentProfile";
Profile = "ToolsGuiTransparentProfile";
HorizSizing = "width";
VertSizing = "height";
position = "3 3";
@ -120,13 +120,13 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
MinExtent = "8 8";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
new GuiControl() {
isContainer = "1";
Profile = "GuiTransparentProfile";
Profile = "ToolsGuiTransparentProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "0 0";
@ -134,7 +134,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
@ -148,7 +148,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "0";
Profile = "GuiTextProfile";
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "center";
position = "4 1";
@ -156,7 +156,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
};
@ -181,7 +181,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
internalName = "SceneObjectList";
canSaveDynamicFields = "0";
@ -195,7 +195,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
buttonType = "PushButton";
useMouseEvents = "0";
isContainer = "0";
Profile = "GuiButtonProfile";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "left";
VertSizing = "top";
position = "66 139";
@ -204,7 +204,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
canSave = "1";
Visible = "1";
Command = "VerveEditorGroupBuilderGUI._Build( VerveEditorGroupBuilderNameField.getText() );";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
};
@ -214,7 +214,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
buttonType = "PushButton";
useMouseEvents = "0";
isContainer = "0";
Profile = "GuiButtonProfile";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "left";
VertSizing = "top";
position = "174 139";
@ -223,7 +223,7 @@ $guiContent = new GuiControl(VerveEditorGroupBuilderGUI) {
canSave = "1";
Visible = "1";
Command = "VerveEditorGroupBuilderGUI.Close();";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
};
@ -283,7 +283,7 @@ function VerveEditorGroupBuilderGUI::_Build( %this, %groupLabel )
{
if ( %groupLabel $= "" )
{
toolsMessageBox( "Warning", "You must provide a Valid Group Label.", "Ok" );
MessageBox( "Warning", "You must provide a Valid Group Label.", "Ok" );
return;
}
@ -316,7 +316,7 @@ function VerveEditorGroupBuilderFieldStack::CreateObjectList( %this, %objectType
{
%container = new GuiControl()
{
Profile = "GuiTransparentProfile";
Profile = "ToolsGuiTransparentProfile";
HorizSizing = "right";
VertSizing = "bottom";
@ -326,7 +326,7 @@ function VerveEditorGroupBuilderFieldStack::CreateObjectList( %this, %objectType
%label = new GuiTextCtrl()
{
Profile = "GuiTextProfile";
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "center";
@ -392,7 +392,7 @@ function VerveEditorGroupBuilderFieldStack::CreateCheckbox( %this, %internalName
{
%container = new GuiControl()
{
Profile = "GuiTransparentProfile";
Profile = "ToolsGuiTransparentProfile";
HorizSizing = "right";
VertSizing = "bottom";
@ -402,7 +402,7 @@ function VerveEditorGroupBuilderFieldStack::CreateCheckbox( %this, %internalName
%label = new GuiTextCtrl()
{
Profile = "GuiTextProfile";
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "center";
@ -415,7 +415,7 @@ function VerveEditorGroupBuilderFieldStack::CreateCheckbox( %this, %internalName
%checkBox = new GuiCheckBoxCtrl()
{
Profile = "GuiCheckboxProfile";
Profile = "ToolsGuiCheckboxProfile";
HorizSizing = "left";
VertSizing = "center";

24
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorImportPathNodes.gui
View file

@ -1,7 +1,7 @@
//--- OBJECT WRITE BEGIN ---
$guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
isContainer = "1";
Profile = "GuiDefaultProfile";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "0 0";
@ -9,7 +9,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
MinExtent = "8 8";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "1";
@ -30,7 +30,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "1";
Profile = "GuiWindowProfile";
Profile = "ToolsGuiWindowProfile";
HorizSizing = "center";
VertSizing = "center";
Position = "268 181";
@ -38,7 +38,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
MinExtent = "256 8";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
@ -52,7 +52,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "0";
Profile = "GuiTextProfile";
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "bottom";
Position = "14 30";
@ -60,7 +60,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
MinExtent = "8 8";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
};
@ -78,7 +78,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
AnchorLeft = "1";
AnchorRight = "0";
isContainer = "0";
Profile = "GuiTextEditProfile";
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "width";
VertSizing = "bottom";
Position = "79 29";
@ -86,7 +86,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
MinExtent = "8 8";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
};
@ -96,7 +96,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
buttonType = "PushButton";
useMouseEvents = "0";
isContainer = "0";
Profile = "GuiButtonProfile";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "left";
VertSizing = "top";
Position = "66 62";
@ -105,7 +105,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
canSave = "1";
Visible = "1";
Command = "VMotionTrack::_ImportPathNodes( VerveEditorImportPathNodesSpeed.getText() );";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
};
@ -115,7 +115,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
buttonType = "PushButton";
useMouseEvents = "0";
isContainer = "0";
Profile = "GuiButtonProfile";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "left";
VertSizing = "top";
Position = "174 62";
@ -124,7 +124,7 @@ $guiContent = new GuiControl(VerveEditorImportPathNodesGUI) {
canSave = "1";
Visible = "1";
Command = "VerveEditorWindow.popDialog( VerveEditorImportPathNodesGUI );";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
canSaveDynamicFields = "0";
};

64
Templates/BaseGame/game/tools/VerveEditor/GUI/VerveEditorPreferences.gui
View file

@ -2,7 +2,7 @@
$guiContent = new GuiControl(VerveEditorPreferenceGui) {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "GuiDefaultProfile";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "0 0";
@ -10,13 +10,13 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
new GuiWindowCtrl() {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "GuiWindowProfile";
Profile = "ToolsGuiWindowProfile";
HorizSizing = "center";
VertSizing = "center";
position = "392 253";
@ -24,7 +24,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Docking = "None";
Margin = "4 24 4 4";
@ -50,7 +50,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
new GuiControl() {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "GuiDefaultProfile";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "10 93";
@ -58,13 +58,13 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
new GuiBitmapBorderCtrl() {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "GuiBitmapBorderProfile";
Profile = "ToolsGuiBitmapBorderProfile";
HorizSizing = "width";
VertSizing = "height";
position = "0 10";
@ -72,7 +72,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
};
new GuiTextEditCtrl() {
@ -87,7 +87,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -101,7 +101,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
new GuiTextCtrl() {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "GuiTextProfile";
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "30 50";
@ -109,7 +109,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -123,7 +123,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
new GuiCheckBoxCtrl() {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "GuiCheckBoxProfile";
Profile = "ToolsGuiCheckBoxProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "6 30";
@ -132,7 +132,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
canSave = "1";
Visible = "1";
Variable = "$Pref::VerveEditor::Event::SnapToTime";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
text = " Snap to Time";
groupNum = "-1";
@ -143,7 +143,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
new GuiTextEditCtrl() {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "GuiTextEditProfile";
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "150 50";
@ -152,7 +152,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
canSave = "1";
Visible = "1";
Variable = "$Pref::VerveEditor::Event::SnapToTimeThreshold";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -170,7 +170,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
new GuiCheckBoxCtrl() {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "GuiCheckBoxProfile";
Profile = "ToolsGuiCheckBoxProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "6 80";
@ -179,7 +179,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
canSave = "1";
Visible = "1";
Variable = "$Pref::VerveEditor::Event::SnapToSiblings";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
text = " Snap to Siblings";
groupNum = "-1";
@ -190,7 +190,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
new GuiTextCtrl() {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "GuiTextProfile";
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "30 100";
@ -198,7 +198,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -212,7 +212,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
new GuiTextEditCtrl() {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "GuiTextEditProfile";
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "150 100";
@ -221,7 +221,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
canSave = "1";
Visible = "1";
Variable = "$Pref::VerveEditor::Event::SnapToSiblingThreshold";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -240,7 +240,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
new GuiControl() {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "GuiDefaultProfile";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "10 30";
@ -248,13 +248,13 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
new GuiBitmapBorderCtrl() {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "GuiBitmapBorderProfile";
Profile = "ToolsGuiBitmapBorderProfile";
HorizSizing = "width";
VertSizing = "height";
position = "0 10";
@ -262,7 +262,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
};
new GuiTextEditCtrl() {
@ -277,7 +277,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -291,7 +291,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
new GuiTextEditCtrl() {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "GuiTextEditProfile";
Profile = "ToolsGuiTextEditProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "6 30";
@ -300,7 +300,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
canSave = "1";
Visible = "1";
Variable = "$Pref::VerveEditor::RecentFileSize";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -318,7 +318,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
new GuiTextCtrl() {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "GuiTextProfile";
Profile = "ToolsGuiTextProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "56 30";
@ -326,7 +326,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
MinExtent = "8 2";
canSave = "1";
Visible = "1";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
Margin = "0 0 0 0";
Padding = "0 0 0 0";
@ -341,7 +341,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
new GuiButtonCtrl() {
canSaveDynamicFields = "0";
isContainer = "0";
Profile = "GuiButtonProfile";
Profile = "ToolsGuiButtonProfile";
HorizSizing = "right";
VertSizing = "bottom";
position = "151 228";
@ -350,7 +350,7 @@ $guiContent = new GuiControl(VerveEditorPreferenceGui) {
canSave = "1";
Visible = "1";
Command = "VerveEditor::CloseEditorPreferences();";
tooltipprofile = "GuiToolTipProfile";
tooltipprofile = "ToolsGuiToolTipProfile";
hovertime = "1000";
text = "OK";
groupNum = "-1";

8
Templates/BaseGame/game/tools/VerveEditor/Scripts/Controller/VControllerProperties.tscript
View file

@ -103,13 +103,13 @@ function VController::DisplayContextMenu( %this, %x, %y )
Item[1] = "" TAB "";
Item[2] = "Cu&t" TAB "" TAB "";
Item[3] = "&Copy" TAB "" TAB "";
Item[4] = "&Paste" TAB "" TAB "VerveEditor::Paste();";
Item[2] = "Cut" TAB "" TAB "";
Item[3] = "Copy" TAB "" TAB "";
Item[4] = "Paste" TAB "" TAB "VerveEditor::Paste();";
Item[5] = "" TAB "";
Item[6] = "&Delete" TAB "" TAB "";
Item[6] = "Delete" TAB "" TAB "";
PasteIndex = 4;
};

42
Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorMenu.tscript
View file

@ -76,7 +76,7 @@ function VerveEditorWindow::onCreateMenu( %this )
// Store Menu Bars.
if ( !isObject( %this.MenuSet ) )
{
%this.MenuSet = new SimSet();
%this.MenuSet = new GuiMenuBar();
}
// CMD Key.
@ -103,14 +103,14 @@ function VerveEditorWindow::onCreateMenu( %this )
{
SuperClass = "VerveWindowMenu";
Label = "&File";
Label = "File";
Position = 0;
Item[0] = "&New" TAB %cmdKey @ "+N" TAB "VerveEditor::NewFile();";
Item[1] = "&Open" TAB %cmdKey @ "+O" TAB "VerveEditor::LoadFile();";
Item[0] = "New" TAB %cmdKey @ "+N" TAB "VerveEditor::NewFile();";
Item[1] = "Open" TAB %cmdKey @ "+O" TAB "VerveEditor::LoadFile();";
Item[2] = "" TAB "";
Item[3] = "&Save" TAB %cmdKey @ "+S" TAB "VerveEditor::SaveFile();";
Item[4] = "Save &As" TAB %cmdKey @ "-Shift+S" TAB "VerveEditor::SaveFile( true );";
Item[3] = "Save" TAB %cmdKey @ "+S" TAB "VerveEditor::SaveFile();";
Item[4] = "Save As" TAB %cmdKey @ "-Shift+S" TAB "VerveEditor::SaveFile( true );";
Item[5] = "" TAB "";
Item[6] = "Recent Files" TAB %recentSequenceMenu;
};
@ -133,34 +133,38 @@ function VerveEditorWindow::onCreateMenu( %this )
Class = "VerveWindowEditMenu";
SuperClass = "VerveWindowMenu";
Label = "&Edit";
Label = "Edit";
Position = 1;
Item[0] = "&Undo" TAB %cmdKey @ "+Z" TAB "VerveEditor::Undo();";
Item[1] = "&Redo" TAB %cmdKey @ "+Y" TAB "VerveEditor::Redo();";
Item[0] = "Undo" TAB %cmdKey @ "+Z" TAB "VerveEditor::Undo();";
Item[1] = "Redo" TAB %cmdKey @ "+Y" TAB "VerveEditor::Redo();";
Item[2] = "" TAB "";
Item[3] = "Cu&t" TAB %cmdKey @ "+X" TAB "VerveEditor::CutSelection();" TAB VerveEditorEditMap;
Item[4] = "&Copy" TAB %cmdKey @ "+C" TAB "VerveEditor::CopySelection();" TAB VerveEditorEditMap;
Item[5] = "&Paste" TAB %cmdKey @ "+V" TAB "VerveEditor::Paste();" TAB VerveEditorEditMap;
Item[3] = "Cut" TAB %cmdKey @ "+X" TAB "VerveEditor::CutSelection();" TAB VerveEditorEditMap;
Item[4] = "Copy" TAB %cmdKey @ "+C" TAB "VerveEditor::CopySelection();" TAB VerveEditorEditMap;
Item[5] = "Paste" TAB %cmdKey @ "+V" TAB "VerveEditor::Paste();" TAB VerveEditorEditMap;
Item[6] = "" TAB "";
Item[7] = "&Delete" TAB "Del" TAB "VerveEditor::DeleteSelection();" TAB VerveEditorEditMap;
Item[7] = "Delete" TAB "Del" TAB "VerveEditor::DeleteSelection();" TAB VerveEditorEditMap;
Item[8] = "" TAB "";
Item[9] = "&Clear Selection" TAB "Esc" TAB "VerveEditor::ClearSelection();";
Item[9] = "Clear Selection" TAB "Esc" TAB "VerveEditor::ClearSelection();";
Item[10] = "" TAB "";
Item[11] = "&Preferences" TAB %cmdKey @ "+P" TAB "VerveEditor::LaunchEditorPreferences();";
Item[11] = "Preferences" TAB %cmdKey @ "+P" TAB "VerveEditor::LaunchEditorPreferences();";
};
%this.MenuSet.add( %editMenu );
// Init Popups.
%fileMenu.Init();
%editMenu.Init();
//%fileMenu.Init();
//%editMenu.Init();
// Attach.
%fileMenu.attachToMenuBar( %this, %fileMenu.Position, %fileMenu.Label );
%editMenu.attachToMenuBar( %this, %editMenu.Position, %editMenu.Label );
if($Verve::UseSeparateWindow)
{
%this.setMenuBar(%this.MenuSet);
//%fileMenu.attachToMenuBar( %this, %fileMenu.Position, %fileMenu.Label );
//%editMenu.attachToMenuBar( %this, %editMenu.Position, %editMenu.Label );
}
}
function VerveEditorWindow::ClearMenu( %this )

32
Templates/BaseGame/game/tools/VerveEditor/Scripts/EditorWindow.tscript
View file

@ -50,8 +50,9 @@ function VerveEditorWindow::Open()
{
%editorWindow = new guiWindowCtrl(VerveEditorWindow)
{
Profile = "ToolsGuiWindowProfile";
position = "0 0";
extent = "1024 768";
extent = "1024 788";
minExtent = "8 2";
horizSizing = "right";
vertSizing = "bottom";
@ -62,20 +63,23 @@ function VerveEditorWindow::Open()
function VerveEditorWindow::UpdateWindowTitle( %this )
{
%fileName = fileName( $VerveEditor::Controller.FileName );
if ( %fileName $= "" )
{
%fileName = "Untitled.vsf";
}
%fileName = fileName( $VerveEditor::Controller.FileName );
if ( %fileName $= "" )
{
%fileName = "Untitled.vsf";
}
if ( VerveEditor::IsDirty() )
{
// Signify Unsaved Work.
%fileName = %fileName @ "*";
}
if ( VerveEditor::IsDirty() )
{
// Signify Unsaved Work.
%fileName = %fileName @ "*";
}
// Set Title.
%this.setWindowTitle( %fileName SPC "- Verve" );
// Set Title.
if($Verve::UseSeparateWindow)
%this.setWindowTitle( %fileName SPC "- Verve" );
else
%this.text = %fileName SPC "- Verve";
}
function VerveEditorWindow::onGainFocus( %this )

12
Templates/BaseGame/game/tools/VerveEditor/Scripts/Groups/VGroup.tscript
View file

@ -188,13 +188,13 @@ function VGroup::DisplayContextMenu( %this, %x, %y )
Item[1] = "" TAB "";
Item[2] = "Cu&t" TAB "" TAB "VerveEditor::CutSelection();";
Item[3] = "&Copy" TAB "" TAB "VerveEditor::CopySelection();";
Item[4] = "&Paste" TAB "" TAB "VerveEditor::Paste();";
Item[2] = "Cut" TAB "" TAB "VerveEditor::CutSelection();";
Item[3] = "Copy" TAB "" TAB "VerveEditor::CopySelection();";
Item[4] = "Paste" TAB "" TAB "VerveEditor::Paste();";
Item[5] = "" TAB "";
Item[6] = "&Delete" TAB "" TAB "VerveEditor::DeleteSelection();";
Item[6] = "Delete" TAB "" TAB "VerveEditor::DeleteSelection();";
AddIndex = 0;
PasteIndex = 4;
@ -283,7 +283,7 @@ function VerveEditor::CreateGroupControl( %object )
Class = "VEditorSelectableGroup";
Profile = "VEditorGroupHeaderProfile";
Bitmap = "~/VerveEditor/GUI/Images/GroupBackground";
bitmapAsset = "ToolsModule:GroupBackground_image";
HorizSizing = "width";
VertSizing = "bottom";
@ -322,7 +322,7 @@ function VerveEditor::CreateGroupControl( %object )
Class = "VEditorSelectableGroup";
Profile = "VEditorGroupTrackProfile";
Bitmap = "~/VerveEditor/GUI/Images/GroupBackground";
bitmapAsset = "ToolsModule:GroupBackground_image";
HorizSizing = "width";
VertSizing = "bottom";

4
Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Controls.tscript
View file

@ -33,7 +33,7 @@ function VerveEditorPropertyStack::CreatePropertyRollout( %this, %groupLabel )
%propertyStack = new GuiStackControl()
{
Class = "VEditorPropertyStack";
Profile = "GuiTransparentProfile";
Profile = "ToolsGuiTransparentProfile";
HorizSizing = "width";
VertSizing = "bottom";
@ -123,7 +123,7 @@ function VerveEditor::CreateField( %targetStack, %fieldName, %fieldType )
if ( isMethod( "VerveEditor", "Create" @ %fieldType @ "Field" ) )
{
// Create the Input Control.
%fieldInput = eval( "return VerveEditor::Create" @ %fieldType @ "Field( %fieldContainer, %fieldName );" );
%fieldInput = eval( "return VerveEditor::Create" @ %fieldType @ "Field(" @ %fieldContainer @ "," @ %fieldName @ ");" );
}
else
{

4
Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Fields/TypeData.tscript
View file

@ -56,7 +56,7 @@ function VerveEditor::CreateDataField( %fieldContainer, %fieldName )
Position = %fieldWidth - 24 SPC 0;
Extent = "18 18";
Bitmap = "tools/VerveEditor/GUI/Images/btn_DeleteSml";
bitmapAsset = "ToolsModule:btn_DeleteSml_image";
Command = %fieldInput @ ".Remove();";
};
@ -274,7 +274,7 @@ function VerveEditor::CreateAddDataField( %targetStack )
Position = %fieldWidth - 24 SPC 0;
Extent = "18 18";
Bitmap = "tools/VerveEditor/GUI/Images/btn_AddSml";
bitmapAsset = "ToolsModule:btn_AddSml_image";
Command = "VEditorDataPropertyField::Insert(" @ %fieldType @ ".getText(), " @ %fieldName @ ".getText(), " @ %fieldValue @ ".getText() );";
};

3
Templates/BaseGame/game/tools/VerveEditor/Scripts/Inspector/Selection.tscript
View file

@ -114,7 +114,8 @@ function VEditorSelectable::OnRightMouseUp( %this, %position, %modifiers, %click
VerveEditor::SetSelection( %this );
// Repaint.
VerveEditorWindow.Repaint();
if($Verve::UseSeparateWindow)
VerveEditorWindow.Repaint();
if ( %this.Proxy.isMethod( "DisplayContextMenu" ) )
{

12
Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VMotionTrack.tscript
View file

@ -105,21 +105,21 @@ function VMotionTrack::GetContextMenu( %this )
Label = "VTrackContextMenu";
Position = 0;
Item[0] = "&Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();";
Item[0] = "Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();";
Item[1] = "" TAB "";
Item[2] = "&Import Path Nodes" TAB "" TAB "VMotionTrack::ImportPathNodes();";
Item[2] = "Import Path Nodes" TAB "" TAB "VMotionTrack::ImportPathNodes();";
Item[3] = "" TAB "";
Item[4] = "Cu&t" TAB "" TAB "VerveEditor::CutSelection();";
Item[5] = "&Copy" TAB "" TAB "VerveEditor::CopySelection();";
Item[6] = "&Paste" TAB "" TAB "VEditorSelectableTrack::PasteEvent();";
Item[4] = "Cut" TAB "" TAB "VerveEditor::CutSelection();";
Item[5] = "Copy" TAB "" TAB "VerveEditor::CopySelection();";
Item[6] = "Paste" TAB "" TAB "VEditorSelectableTrack::PasteEvent();";
Item[7] = "" TAB "";
Item[8] = "&Delete" TAB "" TAB "VerveEditor::DeleteSelection();";
Item[8] = "Delete" TAB "" TAB "VerveEditor::DeleteSelection();";
AddIndex = 0;
PasteIndex = 4;

10
Templates/BaseGame/game/tools/VerveEditor/Scripts/Tracks/VTrack.tscript
View file

@ -175,17 +175,17 @@ function VTrack::GetContextMenu( %this )
Label = "VTrackContextMenu";
Position = 0;
Item[0] = "&Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();";
Item[0] = "Add Event" TAB "" TAB "VEditorSelectableTrack::AddEvent();";
Item[1] = "" TAB "";
Item[2] = "Cu&t" TAB "" TAB "VerveEditor::CutSelection();";
Item[3] = "&Copy" TAB "" TAB "VerveEditor::CopySelection();";
Item[4] = "&Paste" TAB "" TAB "VEditorSelectableTrack::PasteEvent();";
Item[2] = "Cut" TAB "" TAB "VerveEditor::CutSelection();";
Item[3] = "Copy" TAB "" TAB "VerveEditor::CopySelection();";
Item[4] = "Paste" TAB "" TAB "VEditorSelectableTrack::PasteEvent();";
Item[5] = "" TAB "";
Item[6] = "&Delete" TAB "" TAB "VerveEditor::DeleteSelection();";
Item[6] = "Delete" TAB "" TAB "VerveEditor::DeleteSelection();";
AddIndex = 0;
PasteIndex = 4;

5
Templates/BaseGame/game/tools/VerveEditor/main.tscript
View file

@ -5,7 +5,7 @@
function InitializeVerveEditor()
{
$Verve::UseSeparateWindow = true;
$Verve::UseSeparateWindow = ($pref::Video::deviceMode == 0); //can't do separate window atm if you're in fullscreen or borderless full
// Preferences.
exec( "./DefaultPrefs." @ $TorqueScriptFileExtension );
@ -59,7 +59,7 @@ function DestroyVerveEditor()
function ToggleVerveEditor( %value )
{
if ( %value && $Verve::UseSeparateWindow )
if ( %value)
{
if ( !isObject( VerveEditorWindow ) )
{
@ -97,7 +97,6 @@ function VerveEditor::LaunchEditor()
VerveEditor::ClearHistory();
// Update Window Title.
if($Verve::UseSeparateWindow)
VerveEditorWindow.UpdateWindowTitle();
// Update Selection.