TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-27 16:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into BugfixQOL_20210909

Browse source
This commit is contained in:
Areloch 2021-09-10 02:20:13 -05:00
commit dec9f54a9b
322 changed files with 10473 additions and 10241 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorSettingsTab.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ShapeEditorSettingsTab,EditorGuiGroup) {
$guiContent = new GuiControl(ShapeEditorSettingsTab,EditorGuiGroup) {
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";
HorizSizing = "right";

2
Templates/BaseGame/game/tools/shapeEditor/gui/ShapeEditorToolbar.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
$guiContent = new GuiControl(ShapeEditorToolbar, EditorGuiGroup) {
canSaveDynamicFields = "0";
internalName = "";
isContainer = "1";

2
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAdvancedWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
$guiContent = new GuiWindowCollapseCtrl(ShapeEdAdvancedWindow, EditorGuiGroup) {
text = "Advanced Properties";
resizeWidth = "0";
resizeHeight = "0";

2
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdAnimWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
$guiContent = new GuiWindowCtrl(ShapeEdAnimWindow) {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "ToolsGuiToolbarWindowProfile";

2
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPreviewWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl() {
$guiContent = new GuiControl() {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";

2
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdPropWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
$guiContent = new GuiWindowCollapseCtrl(ShapeEdPropWindow) {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "ToolsGuiWindowProfile";

2
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui
View file

@ -1,5 +1,5 @@
//--- OBJECT WRITE BEGIN ---
%guiContent = new GuiControl() {
$guiContent = new GuiControl() {
canSaveDynamicFields = "0";
isContainer = "1";
Profile = "ToolsGuiDefaultProfile";

4
Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript
View file

@ -1444,6 +1444,8 @@ function ShapeEdPropWindow::update_onSequenceBlendChanged( %this, %seqName, %ble
%proxyName = ShapeEditor.getProxyName( %seqName );
if ( ShapeEditor.shape.getSequenceIndex( %proxyName ) != -1 )
{
//TODO
%oldBlend = false;
if ( %blend && %oldBlend )
ShapeEditor.shape.setSequenceBlend( %proxyName, false, %oldBlendSeq, %oldBlendFrame );
ShapeEditor.shape.setSequenceBlend( %proxyName, %blend, %blendSeq, %blendFrame );
@ -2228,7 +2230,7 @@ function ShapeEdTriggerList::updateItem( %this, %oldFrame, %oldState, %frame, %s
if ( %frame != %oldFrame )
{
%pos = ShapeEdAnimWindow.getTimelineBitmapPos( ShapeEdAnimWindow-->seqIn.getText() + %frame, 2 );
eval( "%ctrl = ShapeEdAnimWindow-->trigger" @ %updatedId @ ";" );
%ctrl = eval( "return ShapeEdAnimWindow-->trigger" @ %updatedId @ ";" );
%ctrl.position = %pos SPC "0";
}
}