diff --git a/Templates/BaseGame/game/core/fonts/Arial 14 (ansi).uft b/Templates/BaseGame/game/core/fonts/Arial 14 (ansi).uft index a5fc4ef5f..159010c68 100644 Binary files a/Templates/BaseGame/game/core/fonts/Arial 14 (ansi).uft and b/Templates/BaseGame/game/core/fonts/Arial 14 (ansi).uft differ diff --git a/Templates/BaseGame/game/core/fonts/Arial Bold 18 (ansi).uft b/Templates/BaseGame/game/core/fonts/Arial Bold 18 (ansi).uft index c93889322..3460f7db9 100644 Binary files a/Templates/BaseGame/game/core/fonts/Arial Bold 18 (ansi).uft and b/Templates/BaseGame/game/core/fonts/Arial Bold 18 (ansi).uft differ diff --git a/Templates/BaseGame/game/core/fonts/ArialBold 14 (ansi).uft b/Templates/BaseGame/game/core/fonts/ArialBold 14 (ansi).uft index 08d83901e..9b103b3f7 100644 Binary files a/Templates/BaseGame/game/core/fonts/ArialBold 14 (ansi).uft and b/Templates/BaseGame/game/core/fonts/ArialBold 14 (ansi).uft differ diff --git a/Templates/BaseGame/game/core/fonts/ArialItalic 14 (ansi).uft b/Templates/BaseGame/game/core/fonts/ArialItalic 14 (ansi).uft index d718df5ce..ca4a222cf 100644 Binary files a/Templates/BaseGame/game/core/fonts/ArialItalic 14 (ansi).uft and b/Templates/BaseGame/game/core/fonts/ArialItalic 14 (ansi).uft differ diff --git a/Templates/BaseGame/game/core/fonts/Lucida Console 12 (ansi).uft b/Templates/BaseGame/game/core/fonts/Lucida Console 12 (ansi).uft index bd148fa9b..cdb46f5ba 100644 Binary files a/Templates/BaseGame/game/core/fonts/Lucida Console 12 (ansi).uft and b/Templates/BaseGame/game/core/fonts/Lucida Console 12 (ansi).uft differ diff --git a/Templates/BaseGame/game/core/images/materials.cs b/Templates/BaseGame/game/core/images/materials.cs index 2441947e6..a13c751b3 100644 --- a/Templates/BaseGame/game/core/images/materials.cs +++ b/Templates/BaseGame/game/core/images/materials.cs @@ -20,13 +20,6 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -singleton Material( BlankWhite ) -{ - diffuseMap[0] = "data/art/white"; - mapTo = "white"; - materialTag0 = "Miscellaneous"; -}; - singleton Material( Empty ) { }; diff --git a/Templates/BaseGame/game/data/clientServer/scripts/server/prefs.cs b/Templates/BaseGame/game/data/clientServer/scripts/server/prefs.cs deleted file mode 100644 index d9fc4a687..000000000 --- a/Templates/BaseGame/game/data/clientServer/scripts/server/prefs.cs +++ /dev/null @@ -1,13 +0,0 @@ -$Pref::Server::AdminPassword = ""; -$Pref::Server::BanTime = 1800; -$Pref::Server::ConnectionError = "You do not have the correct version of TEST or the related art needed to play on this server, please contact the server administrator."; -$Pref::Server::FloodProtectionEnabled = 1; -$Pref::Server::Info = "This is a Torque 3D server."; -$Pref::Server::KickBanTime = 300; -$Pref::Server::MaxChatLen = 120; -$Pref::Server::MaxPlayers = 64; -$Pref::Server::Name = "Torque 3D Server"; -$Pref::Server::Password = ""; -$Pref::Server::Port = 28000; -$Pref::Server::RegionMask = 2; -$Pref::Server::TimeLimit = 20; diff --git a/Templates/BaseGame/game/data/ui/scripts/chooseLevelDlg.cs b/Templates/BaseGame/game/data/ui/scripts/chooseLevelDlg.cs index 9dccc2481..7f2ee4506 100644 --- a/Templates/BaseGame/game/data/ui/scripts/chooseLevelDlg.cs +++ b/Templates/BaseGame/game/data/ui/scripts/chooseLevelDlg.cs @@ -26,7 +26,30 @@ function ChooseLevelDlg::onWake( %this ) CL_levelList.clear(); ChooseLevelWindow->SmallPreviews.clear(); + %this->CurrentPreview.visible = false; + %this->levelName.visible = false; + %this->LevelDescriptionLabel.visible = false; + %this->LevelDescription.visible = false; + %count = LevelFilesList.count(); + + if(%count == 0) + { + //We have no levels found. Prompt the user to open the editor to the default level if the tools are present + if(IsDirectory("tools")) + { + MessageBoxYesNo("Error", "No levels were found in any modules. Do you want to load the editor and start a new level?", + "fastLoadWorldEdit(1);", "Canvas.popDialog(ChooseLevelDlg); Canvas.setContent(MainMenuGUI);"); + } + else + { + MessageBoxOK("Error", "No levels were found in any modules. Please ensure you have modules loaded that contain gameplay code and level files.", + "Canvas.popDialog(ChooseLevelDlg); Canvas.setContent(MainMenuGUI);"); + } + + return; + } + for ( %i=0; %i < %count; %i++ ) { %file = LevelFilesList.getKey( %i ); @@ -211,21 +234,38 @@ function ChooseLevelWindow::previewSelected(%this, %preview) // Set the large preview image if (isObject(%preview) && %preview.bitmap !$= "") + { + %this->CurrentPreview.visible = true; %this->CurrentPreview.setBitmap(%preview.bitmap); + } else - %this->CurrentPreview.setBitmap("data/ui/art/no-preview"); + { + %this->CurrentPreview.visible = false; + } // Set the current level name if (isObject(%preview) && %preview.levelName !$= "") + { + %this->LevelName.visible = true; %this->LevelName.setText(%preview.levelName); + } else - %this->LevelName.setText("Level"); + { + %this->LevelName.visible = false; + } // Set the current level description if (isObject(%preview) && %preview.levelDesc !$= "") + { + %this->LevelDescription.visible = true; + %this->LevelDescriptionLabel.visible = true; %this->LevelDescription.setText(%preview.levelDesc); + } else - %this->LevelDescription.setText("A Torque Level"); + { + %this->LevelDescription.visible = false; + %this->LevelDescriptionLabel.visible = false; + } } function ChooseLevelWindow::previousPreviews(%this) diff --git a/Templates/BaseGame/game/data/ui/scripts/guis/chooseLevelDlg.gui b/Templates/BaseGame/game/data/ui/scripts/guis/chooseLevelDlg.gui index d6dec3e48..bcf9b1747 100644 --- a/Templates/BaseGame/game/data/ui/scripts/guis/chooseLevelDlg.gui +++ b/Templates/BaseGame/game/data/ui/scripts/guis/chooseLevelDlg.gui @@ -1,7 +1,7 @@ //--- OBJECT WRITE BEGIN --- %guiContent = new GuiControl(ChooseLevelDlg) { position = "0 0"; - extent = "1024 768"; + extent = "1280 1024"; minExtent = "8 8"; horizSizing = "width"; vertSizing = "height"; @@ -13,7 +13,7 @@ isContainer = "1"; canSave = "1"; canSaveDynamicFields = "1"; - Enabled = "1"; + enabled = "1"; launchInEditor = "0"; returnGui = "MainMenuGui"; @@ -33,7 +33,8 @@ canSaveDynamicFields = "0"; new GuiBitmapCtrl() { - bitmap = "./art/no-preview"; + bitmap = "data/ui/scripts/guis/art/no-preview"; + color = "255 255 255 255"; wrap = "0"; position = "369 31"; extent = "400 300"; @@ -41,15 +42,16 @@ horizSizing = "right"; vertSizing = "bottom"; profile = "GuiDefaultProfile"; - visible = "1"; + visible = "0"; active = "1"; tooltipProfile = "GuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; internalName = "CurrentPreview"; + hidden = "1"; canSave = "1"; canSaveDynamicFields = "1"; - Enabled = "1"; + enabled = "1"; }; new GuiTextCtrl() { text = "Empty Room"; @@ -66,12 +68,13 @@ horizSizing = "right"; vertSizing = "bottom"; profile = "GuiMenuButtonProfile"; - visible = "1"; + visible = "0"; active = "1"; tooltipProfile = "GuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; internalName = "levelName"; + hidden = "1"; canSave = "1"; canSaveDynamicFields = "0"; }; @@ -90,11 +93,13 @@ horizSizing = "right"; vertSizing = "bottom"; profile = "GuiMenuButtonProfile"; - visible = "1"; + visible = "0"; active = "1"; tooltipProfile = "GuiToolTipProfile"; hovertime = "1000"; isContainer = "0"; + internalName = "LevelDescriptionLabel"; + hidden = "1"; canSave = "1"; canSaveDynamicFields = "0"; }; @@ -104,7 +109,7 @@ maxChars = "-1"; useURLMouseCursor = "0"; position = "370 380"; - extent = "165 28"; + extent = "165 14"; minExtent = "8 8"; horizSizing = "right"; vertSizing = "bottom"; @@ -119,11 +124,12 @@ canSaveDynamicFields = "0"; }; new GuiBitmapButtonCtrl() { - bitmap = "./art/previous-button"; + bitmap = "data/ui/scripts/guis/art/previous-button"; bitmapMode = "Stretched"; autoFitExtents = "0"; useModifiers = "0"; useStates = "1"; + masked = "0"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; @@ -143,15 +149,16 @@ hidden = "1"; canSave = "1"; canSaveDynamicFields = "1"; - Enabled = "1"; + enabled = "1"; wrap = "0"; }; new GuiBitmapButtonCtrl() { - bitmap = "./art/next-button"; + bitmap = "data/ui/scripts/guis/art/next-button"; bitmapMode = "Stretched"; autoFitExtents = "0"; useModifiers = "0"; useStates = "1"; + masked = "0"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; @@ -171,7 +178,7 @@ hidden = "1"; canSave = "1"; canSaveDynamicFields = "1"; - Enabled = "1"; + enabled = "1"; wrap = "0"; }; new GuiTextListCtrl(CL_levelList) { @@ -219,28 +226,6 @@ internalName = "SmallPreviews"; canSave = "1"; canSaveDynamicFields = "0"; - - new GuiButtonCtrl() { - text = "Empty"; - groupNum = "-1"; - buttonType = "ToggleButton"; - useMouseEvents = "0"; - position = "0 0"; - extent = "368 35"; - minExtent = "8 2"; - horizSizing = "right"; - vertSizing = "bottom"; - profile = "GuiMenuButtonProfile"; - visible = "1"; - active = "1"; - command = "ChooseLevelWindow.previewSelected(ChooseLevelWindow->SmallPreviews->SmallPreview0);"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "0"; - internalName = "SmallPreview0"; - canSave = "1"; - canSaveDynamicFields = "0"; - }; }; new GuiButtonCtrl(ChooseLevelDlgGoBtn) { text = "Start Level"; @@ -284,4 +269,4 @@ }; }; }; -//--- OBJECT WRITE END --- \ No newline at end of file +//--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/data/ui/scripts/guis/mainMenu.gui b/Templates/BaseGame/game/data/ui/scripts/guis/mainMenu.gui index a757274ed..3d4964b5f 100644 --- a/Templates/BaseGame/game/data/ui/scripts/guis/mainMenu.gui +++ b/Templates/BaseGame/game/data/ui/scripts/guis/mainMenu.gui @@ -6,7 +6,7 @@ exec( "tools/gui/profiles.ed.cs" ); useVariable = "0"; tile = "0"; position = "0 0"; - extent = "1024 768"; + extent = "1280 1024"; minExtent = "8 8"; horizSizing = "width"; vertSizing = "height"; @@ -18,7 +18,7 @@ exec( "tools/gui/profiles.ed.cs" ); isContainer = "1"; canSave = "1"; canSaveDynamicFields = "1"; - Enabled = "1"; + enabled = "1"; isDecoy = "0"; new GuiBitmapButtonCtrl(MainMenuAppLogo) { @@ -27,10 +27,11 @@ exec( "tools/gui/profiles.ed.cs" ); autoFitExtents = "0"; useModifiers = "0"; useStates = "1"; + masked = "0"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; - position = "368 30"; + position = "624 30"; extent = "443 139"; minExtent = "8 2"; horizSizing = "left"; @@ -44,7 +45,6 @@ exec( "tools/gui/profiles.ed.cs" ); isContainer = "0"; canSave = "1"; canSaveDynamicFields = "1"; - }; new GuiControl(MainMenuButtonContainer) { position = "67 321"; @@ -168,7 +168,7 @@ exec( "tools/gui/profiles.ed.cs" ); canSaveDynamicFields = "0"; }; new GuiButtonCtrl() { - text = "Exit"; + text = "Launch World Editor"; groupNum = "-1"; buttonType = "PushButton"; useMouseEvents = "0"; @@ -180,6 +180,46 @@ exec( "tools/gui/profiles.ed.cs" ); profile = "GuiBlankMenuButtonProfile"; visible = "1"; active = "1"; + command = "fastLoadWorldEdit(1);"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl() { + text = "Launch GUI Editor"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "0 200"; + extent = "442 40"; + minExtent = "8 8"; + horizSizing = "relative"; + vertSizing = "bottom"; + profile = "GuiBlankMenuButtonProfile"; + visible = "1"; + active = "1"; + command = "fastLoadGUIEdit(1);"; + tooltipProfile = "GuiToolTipProfile"; + hovertime = "1000"; + isContainer = "0"; + canSave = "1"; + canSaveDynamicFields = "0"; + }; + new GuiButtonCtrl() { + text = "Exit"; + groupNum = "-1"; + buttonType = "PushButton"; + useMouseEvents = "0"; + position = "0 240"; + extent = "442 40"; + minExtent = "8 8"; + horizSizing = "relative"; + vertSizing = "bottom"; + profile = "GuiBlankMenuButtonProfile"; + visible = "1"; + active = "1"; command = "quit();"; tooltipProfile = "GuiToolTipProfile"; hovertime = "1000"; diff --git a/Templates/BaseGame/game/data/ui/scripts/guis/messageBoxOK.ed.gui b/Templates/BaseGame/game/data/ui/scripts/guis/messageBoxOK.gui similarity index 100% rename from Templates/BaseGame/game/data/ui/scripts/guis/messageBoxOK.ed.gui rename to Templates/BaseGame/game/data/ui/scripts/guis/messageBoxOK.gui diff --git a/Templates/BaseGame/game/data/ui/scripts/guis/messageBoxYesNo.gui b/Templates/BaseGame/game/data/ui/scripts/guis/messageBoxYesNo.gui index b58aa170b..3cd7d18ef 100644 --- a/Templates/BaseGame/game/data/ui/scripts/guis/messageBoxYesNo.gui +++ b/Templates/BaseGame/game/data/ui/scripts/guis/messageBoxYesNo.gui @@ -1,126 +1,75 @@ //--- OBJECT WRITE BEGIN --- %guiContent = new GuiControl(MessageBoxYesNoDlg) { - position = "0 0"; - extent = "1024 768"; - minExtent = "8 8"; - horizSizing = "width"; - vertSizing = "height"; - profile = "GuiOverlayProfile"; - visible = "1"; - active = "1"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "1"; - canSave = "1"; - canSaveDynamicFields = "1"; - helpTag = "0"; + profile = "GuiOverlayProfile"; + horizSizing = "width"; + vertSizing = "height"; + position = "0 0"; + extent = "640 480"; + minExtent = "8 8"; + visible = "1"; + helpTag = "0"; - new GuiContainer() { - margin = "0 0 0 0"; - padding = "0 0 0 0"; - anchorTop = "1"; - anchorBottom = "0"; - anchorLeft = "1"; - anchorRight = "0"; - position = "168 352"; - extent = "700 64"; - minExtent = "8 2"; + new GuiWindowCtrl(MBYesNoFrame) { + profile = "GuiWindowProfile"; horizSizing = "center"; vertSizing = "center"; - profile = "GuiDefaultProfile"; + position = "170 175"; + extent = "300 100"; + minExtent = "48 92"; visible = "1"; - active = "1"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "1"; - canSave = "1"; - canSaveDynamicFields = "0"; + helpTag = "0"; + maxLength = "255"; + resizeWidth = "1"; + resizeHeight = "1"; + canMove = "1"; + canClose = "1"; + canMinimize = "0"; + canMaximize = "0"; + minSize = "50 50"; + text = ""; + closeCommand = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.noCallback);"; - new GuiChunkedBitmapCtrl() { - bitmap = "data/ui/art/hudfill.png"; - useVariable = "0"; - tile = "0"; - position = "0 0"; - extent = "700 64"; - minExtent = "8 2"; - horizSizing = "right"; + new GuiMLTextCtrl(MBYesNoText) { + profile = "GuiMLTextProfile"; + horizSizing = "center"; vertSizing = "bottom"; - profile = "GuiDefaultProfile"; - visible = "1"; - active = "1"; - command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.noCallback);"; - accelerator = "escape"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "0"; - canSave = "1"; - canSaveDynamicFields = "0"; - }; - new GuiTextCtrl(MBYesNoText) { - text = "Re-bind \"\" to..."; - maxLength = "255"; - margin = "0 0 0 0"; - padding = "0 0 0 0"; - anchorTop = "1"; - anchorBottom = "0"; - anchorLeft = "1"; - anchorRight = "0"; - position = "177 8"; - extent = "384 20"; + position = "11 38"; + extent = "280 14"; minExtent = "8 8"; - horizSizing = "width"; - vertSizing = "height"; - profile = "GuiMenuButtonProfile"; visible = "1"; - active = "1"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "1"; - canSave = "1"; - canSaveDynamicFields = "0"; - }; - new GuiButtonCtrl() { - text = "Yes"; - groupNum = "-1"; - buttonType = "PushButton"; - useMouseEvents = "0"; - position = "270 36"; - extent = "80 22"; - minExtent = "8 8"; + helpTag = "0"; + lineSpacing = "2"; + allowColorChars = "0"; + maxChars = "-1"; + }; + new GuiButtonCtrl() { + profile = "GuiButtonProfile"; horizSizing = "right"; vertSizing = "top"; - profile = "GuiButtonProfile"; + position = "70 68"; + extent = "80 22"; + minExtent = "8 8"; visible = "1"; - active = "1"; - command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.yesCallback);"; + command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.yesCallback);"; accelerator = "return"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "0"; - canSave = "1"; - canSaveDynamicFields = "0"; - }; - new GuiButtonCtrl() { - text = "No"; - groupNum = "-1"; - buttonType = "PushButton"; - useMouseEvents = "0"; - position = "367 36"; - extent = "80 22"; - minExtent = "8 8"; + helpTag = "0"; + text = "Yes"; + simpleStyle = "0"; + }; + new GuiButtonCtrl() { + profile = "GuiButtonProfile"; horizSizing = "right"; vertSizing = "top"; - profile = "GuiButtonProfile"; + position = "167 68"; + extent = "80 22"; + minExtent = "8 8"; visible = "1"; - active = "1"; - command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.noCallback);"; + command = "MessageCallback(MessageBoxYesNoDlg,MessageBoxYesNoDlg.noCallback);"; accelerator = "escape"; - tooltipProfile = "GuiToolTipProfile"; - hovertime = "1000"; - isContainer = "0"; - canSave = "1"; - canSaveDynamicFields = "0"; - }; - }; + helpTag = "0"; + text = "No"; + simpleStyle = "0"; + }; + }; }; //--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs b/Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs index 98a121db6..9a130b7ca 100644 --- a/Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs +++ b/Templates/BaseGame/game/data/ui/scripts/messageBoxes.cs @@ -22,25 +22,14 @@ // Cleanup Dialog created by 'core' -if( isObject( MessagePopupDlg ) ) - MessagePopupDlg.delete(); if( isObject( MessageBoxYesNoDlg ) ) MessageBoxYesNoDlg.delete(); -if( isObject( MessageBoxYesNoCancelDlg ) ) - MessageBoxYesNoCancelDlg.delete(); -if( isObject( MessageBoxOKCancelDetailsDlg ) ) - MessageBoxOKCancelDetailsDlg.delete(); -if( isObject( MessageBoxOKCancelDlg ) ) - MessageBoxOKCancelDlg.delete(); if( isObject( MessageBoxOKDlg ) ) MessageBoxOKDlg.delete(); -if( isObject( IODropdownDlg ) ) - IODropdownDlg.delete(); - // Load Editor Dialogs -exec("./guis/messageBoxOk.ed.gui"); -exec("./guis/messageBoxYesNo.ed.gui"); +exec("./guis/messageBoxOk.gui"); +exec("./guis/messageBoxYesNo.gui"); // -------------------------------------------------------------------- // Message Sound diff --git a/Templates/BaseGame/game/tools/base/images/512_black.png b/Templates/BaseGame/game/tools/base/images/512_black.png new file mode 100644 index 000000000..5e57c16c2 Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/512_black.png differ diff --git a/Templates/BaseGame/game/tools/base/images/512_blue.png b/Templates/BaseGame/game/tools/base/images/512_blue.png new file mode 100644 index 000000000..2511284dd Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/512_blue.png differ diff --git a/Templates/BaseGame/game/tools/base/images/512_forestgreen.png b/Templates/BaseGame/game/tools/base/images/512_forestgreen.png new file mode 100644 index 000000000..179831bea Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/512_forestgreen.png differ diff --git a/Templates/BaseGame/game/tools/base/images/512_forestgreen_lines.png b/Templates/BaseGame/game/tools/base/images/512_forestgreen_lines.png new file mode 100644 index 000000000..4a09fc4a1 Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/512_forestgreen_lines.png differ diff --git a/Templates/BaseGame/game/tools/base/images/512_green.png b/Templates/BaseGame/game/tools/base/images/512_green.png new file mode 100644 index 000000000..d2cbde68e Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/512_green.png differ diff --git a/Templates/BaseGame/game/tools/base/images/512_grey.png b/Templates/BaseGame/game/tools/base/images/512_grey.png new file mode 100644 index 000000000..c4b574c76 Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/512_grey.png differ diff --git a/Templates/BaseGame/game/tools/base/images/512_grey_base.png b/Templates/BaseGame/game/tools/base/images/512_grey_base.png new file mode 100644 index 000000000..a1e440f29 Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/512_grey_base.png differ diff --git a/Templates/BaseGame/game/tools/convexEditor/images/512_orange.png b/Templates/BaseGame/game/tools/base/images/512_orange.png similarity index 100% rename from Templates/BaseGame/game/tools/convexEditor/images/512_orange.png rename to Templates/BaseGame/game/tools/base/images/512_orange.png diff --git a/Templates/BaseGame/game/tools/base/images/512_orange_lines.png b/Templates/BaseGame/game/tools/base/images/512_orange_lines.png new file mode 100644 index 000000000..51813d98c Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/512_orange_lines.png differ diff --git a/Templates/BaseGame/game/tools/base/images/512_red.png b/Templates/BaseGame/game/tools/base/images/512_red.png new file mode 100644 index 000000000..a9f95638a Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/512_red.png differ diff --git a/Templates/BaseGame/game/tools/base/images/black.png b/Templates/BaseGame/game/tools/base/images/black.png new file mode 100644 index 000000000..f3d8a1d2a Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/black.png differ diff --git a/Templates/BaseGame/game/tools/base/images/gray.png b/Templates/BaseGame/game/tools/base/images/gray.png new file mode 100644 index 000000000..566fd5e6c Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/gray.png differ diff --git a/Templates/BaseGame/game/tools/base/images/materials.cs b/Templates/BaseGame/game/tools/base/images/materials.cs new file mode 100644 index 000000000..11b766b04 --- /dev/null +++ b/Templates/BaseGame/game/tools/base/images/materials.cs @@ -0,0 +1,80 @@ +//----------------------------------------------------------------------------- +// Torque +// Copyright GarageGames, LLC 2011 +//----------------------------------------------------------------------------- + +singleton CubemapData( BlankSkyCubemap ) +{ + cubeFace[0] = "./skybox_1"; + cubeFace[1] = "./skybox_2"; + cubeFace[2] = "./skybox_3"; + cubeFace[3] = "./skybox_4"; + cubeFace[4] = "./skybox_5"; + cubeFace[5] = "./skybox_6"; +}; + +singleton Material( BlankSkyMat ) +{ + cubemap = BlankSkyCubemap; + isSky = true; +}; + +singleton Material(White) +{ + diffuseMap[0] = "./white.png"; +}; + +singleton Material(Gray) +{ + diffuseMap[0] = "./gray.png"; +}; + +singleton Material(Black) +{ + diffuseMap[0] = "./black.png"; +}; + +singleton Material(Grid_512_Black) +{ + diffuseMap[0] = "./512_black.png"; +}; + +singleton Material(Grid_512_ForestGreen) +{ + diffuseMap[0] = "./512_forestgreen.png"; +}; + +singleton Material(Grid_512_ForestGreen_Lines) +{ + diffuseMap[0] = "./512_forestgreen_lines.png"; +}; + +singleton Material(Grid_512_Green) +{ + diffuseMap[0] = "./512_green.png"; +}; + +singleton Material(Grid_512_Grey) +{ + diffuseMap[0] = "./512_grey.png"; +}; + +singleton Material(Grid_512_Grey_Base) +{ + diffuseMap[0] = "./512_grey_base.png"; +}; + +singleton Material(Grid_512_Orange) +{ + diffuseMap[0] = "./512_orange.png"; +}; + +singleton Material(Grid_512_Orange_Lines) +{ + diffuseMap[0] = "./512_orange_lines.png"; +}; + +singleton Material(Grid_512_Red) +{ + diffuseMap[0] = "./512_red.png"; +}; \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/base/images/sky_skybox.dml b/Templates/BaseGame/game/tools/base/images/sky_skybox.dml new file mode 100644 index 000000000..5ca0a1cb6 --- /dev/null +++ b/Templates/BaseGame/game/tools/base/images/sky_skybox.dml @@ -0,0 +1,7 @@ +skybox_1 +skybox_2 +skybox_3 +skybox_4 +skybox_5 +skybox_6 +skybox_6 \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/base/images/skybox_1.jpg b/Templates/BaseGame/game/tools/base/images/skybox_1.jpg new file mode 100644 index 000000000..871322e94 Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/skybox_1.jpg differ diff --git a/Templates/BaseGame/game/tools/base/images/skybox_2.jpg b/Templates/BaseGame/game/tools/base/images/skybox_2.jpg new file mode 100644 index 000000000..3e2a810de Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/skybox_2.jpg differ diff --git a/Templates/BaseGame/game/tools/base/images/skybox_3.jpg b/Templates/BaseGame/game/tools/base/images/skybox_3.jpg new file mode 100644 index 000000000..757f99b33 Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/skybox_3.jpg differ diff --git a/Templates/BaseGame/game/tools/base/images/skybox_4.jpg b/Templates/BaseGame/game/tools/base/images/skybox_4.jpg new file mode 100644 index 000000000..30eb1d2a3 Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/skybox_4.jpg differ diff --git a/Templates/BaseGame/game/tools/base/images/skybox_5.jpg b/Templates/BaseGame/game/tools/base/images/skybox_5.jpg new file mode 100644 index 000000000..10a24db73 Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/skybox_5.jpg differ diff --git a/Templates/BaseGame/game/tools/base/images/skybox_6.jpg b/Templates/BaseGame/game/tools/base/images/skybox_6.jpg new file mode 100644 index 000000000..3ec28d02e Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/skybox_6.jpg differ diff --git a/Templates/BaseGame/game/tools/base/images/white.png b/Templates/BaseGame/game/tools/base/images/white.png new file mode 100644 index 000000000..410223f25 Binary files /dev/null and b/Templates/BaseGame/game/tools/base/images/white.png differ diff --git a/Templates/BaseGame/game/tools/convexEditor/images/materials.cs b/Templates/BaseGame/game/tools/convexEditor/images/materials.cs deleted file mode 100644 index 945a824f6..000000000 --- a/Templates/BaseGame/game/tools/convexEditor/images/materials.cs +++ /dev/null @@ -1,5 +0,0 @@ -singleton Material(DefaultConvexShapeMat) -{ - mapTo = "unmapped_mat"; - diffuseMap[0] = "./512_orange.png"; -}; \ No newline at end of file diff --git a/Templates/BaseGame/game/tools/convexEditor/main.cs b/Templates/BaseGame/game/tools/convexEditor/main.cs index bdc06687c..71e6b3090 100644 --- a/Templates/BaseGame/game/tools/convexEditor/main.cs +++ b/Templates/BaseGame/game/tools/convexEditor/main.cs @@ -201,7 +201,7 @@ function ConvexEditorPlugin::onSaveMission( %this, %missionFile ) function ConvexEditorPlugin::initSettings( %this ) { EditorSettings.beginGroup( "ConvexEditor", true ); - EditorSettings.setDefaultValue( "MaterialName", "DefaultConvexShapeMat" ); + EditorSettings.setDefaultValue( "MaterialName", "Grid_512_Orange" ); EditorSettings.endGroup(); } diff --git a/Templates/BaseGame/game/tools/levels/BlankRoom.mis b/Templates/BaseGame/game/tools/levels/BlankRoom.mis index 5ca65ed5a..d8cd0768b 100644 --- a/Templates/BaseGame/game/tools/levels/BlankRoom.mis +++ b/Templates/BaseGame/game/tools/levels/BlankRoom.mis @@ -1,42 +1,57 @@ //--- OBJECT WRITE BEGIN --- new SimGroup(MissionGroup) { + canSave = "1"; canSaveDynamicFields = "1"; cdTrack = "2"; CTF_scoreLimit = "5"; - Enabled = "1"; + enabled = "1"; musicTrack = "lush"; - new LevelInfo(theLevelInfo) { + new LevelInfo(TheLevelInfo) { + nearClip = "0.1"; visibleDistance = "1000"; + visibleGhostDistance = "0"; + decalBias = "0.0015"; fogColor = "0.6 0.6 0.7 1"; fogDensity = "0"; fogDensityOffset = "700"; fogAtmosphereHeight = "0"; canvasClearColor = "0 0 0 255"; - canSaveDynamicFields = "1"; + ambientLightBlendPhase = "1"; + ambientLightBlendCurve = "0 0 -1 -1"; + advancedLightmapSupport = "0"; + soundAmbience = "AudioAmbienceDefault"; + soundDistanceModel = "Linear"; + canSave = "1"; + canSaveDynamicFields = "1"; + desc0 = "A blank room ready to be populated with Torque objects. Guns, anyone?"; + enabled = "1"; levelName = "Blank Room"; - desc0 = "A blank room ready to be populated with Torque objects.\n\nGuns, anyone?"; - Enabled = "1"; }; new SkyBox(theSky) { - canSaveDynamicFields = "1"; - Position = "0 0 0"; - rotation = "1 0 0 0"; - scale = "1 1 1"; - Material = "BlackSkyMat"; + Material = "BlankSkyMat"; drawBottom = "0"; fogBandHeight = "0"; - }; - new Sun(theSun) { - canSaveDynamicFields = "1"; - Position = "0 0 0"; + position = "0 0 0"; rotation = "1 0 0 0"; scale = "1 1 1"; + canSave = "1"; + canSaveDynamicFields = "1"; + }; + new Sun(theSun) { azimuth = "230.396"; elevation = "45"; color = "0.968628 0.901961 0.901961 1"; - ambient = "0.078431 0.113725 0.156863 1"; + ambient = "0.337255 0.533333 0.619608 1"; + brightness = "1"; castShadows = "1"; + staticRefreshFreq = "250"; + dynamicRefreshFreq = "8"; + coronaEnabled = "1"; + coronaScale = "0.5"; + coronaTint = "1 1 1 1"; + coronaUseLightColor = "1"; + flareScale = "1"; attenuationRatio = "0 1 1"; shadowType = "PSSM"; texSize = "1024"; @@ -47,47 +62,36 @@ new SimGroup(MissionGroup) { logWeight = "0.9"; fadeStartDistance = "0"; lastSplitTerrainOnly = "0"; - splitFadeDistances = "1 1 1 1"; + representedInLightmap = "0"; + shadowDarkenColor = "0 0 0 -1"; + includeLightmappedGeometryInShadow = "0"; + position = "0 0 0"; + rotation = "1 0 0 0"; + scale = "1 1 1"; + canSave = "1"; + canSaveDynamicFields = "1"; bias = "0.1"; Blur = "1"; - Enabled = "1"; + enabled = "1"; height = "1024"; lightBleedFactor = "0.8"; minVariance = "0"; pointShadowType = "PointShadowType_Paraboloid"; shadowBox = "-100 -100 -100 100 100 100"; + splitFadeDistances = "1 1 1 1"; width = "3072"; }; - new SimGroup(PlayerDropPoints) { + new GroundPlane() { + squareSize = "128"; + scaleU = "25"; + scaleV = "25"; + Material = "Grid_512_Grey"; + canSave = "1"; canSaveDynamicFields = "1"; - Enabled = "1"; - - new SpawnSphere() { - canSaveDynamicFields = "1"; - Position = "0 0 2"; + enabled = "1"; + position = "0 0 0"; rotation = "1 0 0 0"; scale = "1 1 1"; - dataBlock = "SpawnSphereMarker"; - radius = "5"; - autoSpawn = "false"; - sphereWeight = "1"; - indoorWeight = "1"; - outdoorWeight = "1"; - Enabled = "1"; - homingCount = "0"; - lockCount = "0"; - }; - }; - new GroundPlane() { - canSaveDynamicFields = "1"; - Position = "0 0 0"; - rotation = "1 0 0 0"; - scale = "1 1 1"; - squareSize = "128"; - scaleU = "12"; - scaleV = "12"; - Material = "BlankWhite"; - Enabled = "1"; }; }; //--- OBJECT WRITE END --- diff --git a/Templates/BaseGame/game/tools/levels/BlankRoom.postfxpreset.cs b/Templates/BaseGame/game/tools/levels/BlankRoom.postfxpreset.cs new file mode 100644 index 000000000..8b616a84a --- /dev/null +++ b/Templates/BaseGame/game/tools/levels/BlankRoom.postfxpreset.cs @@ -0,0 +1,53 @@ +$PostFXManager::Settings::ColorCorrectionRamp = "core/images/null_color_ramp.png"; +$PostFXManager::Settings::DOF::BlurCurveFar = ""; +$PostFXManager::Settings::DOF::BlurCurveNear = ""; +$PostFXManager::Settings::DOF::BlurMax = ""; +$PostFXManager::Settings::DOF::BlurMin = ""; +$PostFXManager::Settings::DOF::EnableAutoFocus = ""; +$PostFXManager::Settings::DOF::EnableDOF = ""; +$PostFXManager::Settings::DOF::FocusRangeMax = ""; +$PostFXManager::Settings::DOF::FocusRangeMin = ""; +$PostFXManager::Settings::EnableDOF = "1"; +$PostFXManager::Settings::EnabledSSAO = "1"; +$PostFXManager::Settings::EnableHDR = "1"; +$PostFXManager::Settings::EnableLightRays = "1"; +$PostFXManager::Settings::EnablePostFX = "1"; +$PostFXManager::Settings::EnableSSAO = "1"; +$PostFXManager::Settings::EnableVignette = "1"; +$PostFXManager::Settings::HDR::adaptRate = "2"; +$PostFXManager::Settings::HDR::blueShiftColor = "1.05 0.97 1.27"; +$PostFXManager::Settings::HDR::brightPassThreshold = "1"; +$PostFXManager::Settings::HDR::enableBloom = "1"; +$PostFXManager::Settings::HDR::enableBlueShift = "0"; +$PostFXManager::Settings::HDR::enableToneMapping = "0.5"; +$PostFXManager::Settings::HDR::gaussMean = "0"; +$PostFXManager::Settings::HDR::gaussMultiplier = "0.3"; +$PostFXManager::Settings::HDR::gaussStdDev = "0.8"; +$PostFXManager::Settings::HDR::keyValue = "0.117347"; +$PostFXManager::Settings::HDR::minLuminace = "0.0459184"; +$PostFXManager::Settings::HDR::whiteCutoff = "1"; +$PostFXManager::Settings::LightRays::brightScalar = "0.75"; +$PostFXManager::Settings::LightRays::decay = "1.0"; +$PostFXManager::Settings::LightRays::density = "0.94"; +$PostFXManager::Settings::LightRays::numSamples = "40"; +$PostFXManager::Settings::LightRays::weight = "5.65"; +$PostFXManager::Settings::SSAO::blurDepthTol = "0.001"; +$PostFXManager::Settings::SSAO::blurNormalTol = "0.95"; +$PostFXManager::Settings::SSAO::lDepthMax = "2"; +$PostFXManager::Settings::SSAO::lDepthMin = "0.2"; +$PostFXManager::Settings::SSAO::lDepthPow = "0.2"; +$PostFXManager::Settings::SSAO::lNormalPow = "2"; +$PostFXManager::Settings::SSAO::lNormalTol = "-0.5"; +$PostFXManager::Settings::SSAO::lRadius = "1"; +$PostFXManager::Settings::SSAO::lStrength = "10"; +$PostFXManager::Settings::SSAO::overallStrength = "2"; +$PostFXManager::Settings::SSAO::quality = "0"; +$PostFXManager::Settings::SSAO::sDepthMax = "1"; +$PostFXManager::Settings::SSAO::sDepthMin = "0.1"; +$PostFXManager::Settings::SSAO::sDepthPow = "1"; +$PostFXManager::Settings::SSAO::sNormalPow = "1"; +$PostFXManager::Settings::SSAO::sNormalTol = "0"; +$PostFXManager::Settings::SSAO::sRadius = "0.1"; +$PostFXManager::Settings::SSAO::sStrength = "6"; +$PostFXManager::Settings::Vignette::VMax = 0.830218; +$PostFXManager::Settings::Vignette::VMin = 0.2; diff --git a/Templates/BaseGame/game/tools/main.cs b/Templates/BaseGame/game/tools/main.cs index d1a0df811..dd238eac0 100644 --- a/Templates/BaseGame/game/tools/main.cs +++ b/Templates/BaseGame/game/tools/main.cs @@ -223,12 +223,31 @@ function fastLoadWorldEdit(%val) onStart(); } - if(Canvas.getContent() == MainMenuGui.getId()) + if(!$Game::running) { //startGame(); activatePackage( "BootEditor" ); ChooseLevelDlg.launchInEditor = false; StartGame("tools/levels/BlankRoom.mis", "SinglePlayer"); + + if(!isObject(Observer)) + { + datablock CameraData(Observer) {}; + } + + %cam = new Camera() + { + datablock = Observer; + }; + + %cam.scopeToClient(LocalClientConnection); + + LocalClientConnection.setCameraObject(%cam); + LocalClientConnection.setControlObject(%cam); + + LocalClientConnection.camera = %cam; + + %cam.setPosition("0 0 0"); } else { diff --git a/Templates/BaseGame/game/tools/settings.xml b/Templates/BaseGame/game/tools/settings.xml deleted file mode 100644 index 9d10b160b..000000000 --- a/Templates/BaseGame/game/tools/settings.xml +++ /dev/null @@ -1,205 +0,0 @@ - - - - E:/gamedev/T3DMIT/CLEAN/My Projects/TemplateTest/game/data/scripts/gui - 1280 1024 - - http://www.garagegames.com/products/torque-3d/documentation/user - ../../../Documentation/Official Documentation.html - ../../../Documentation/Torque 3D - Script Manual.chm - - - 1 - 1 - - - 0 - 0 - 0 - - - 0 - 1 - 8 - 1 - 1 - 1 - 2 - 1 - - - 0 - - - Categorized - - - - WorldEditorInspectorPlugin - 50 - 0 - 40 - screenCenter - 1 - 6 - - 0 - 0 - 2 - 0 - 100 - 1 - 1 - - - 1 - 51 51 51 100 - 255 255 255 100 - 1 - 102 102 102 100 - - - 20 - 1 - 255 - 0 - 8 - - - 0 255 0 255 - 255 0 0 255 - 255 255 0 255 - 0 0 255 255 - 255 255 255 255 - 255 255 0 255 - 100 100 100 255 - - - ../../../Documentation/Torque 3D - Script Manual.chm - ../../../Documentation/Official Documentation.html - http://www.garagegames.com/products/torque-3d/documentation/user - http://www.garagegames.com/products/torque-3d/forums - - - 1 - 1 - 1 - 1 - 1 - - - tools/worldEditor/images/DefaultHandle - tools/worldEditor/images/LockedHandle - tools/worldEditor/images/SelectHandle - - - - raiseHeight - - 1 - 0 - 90 - 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 - 0.1 - 1 - 50 - 100 - 10 - 1.000000 0.833333 0.666667 0.500000 0.333333 0.166667 0.000000 - - - 40 40 - ellipse - 1 - 1 1 - 1 - - - - 255 255 255 255 - 1 - 1 - 0 - 135 - 45 - 1 - 0 0 0 100 - 40 40 - 1 - 180 180 180 255 - 0 - 1 - 1 - 0.1 - - - DefaultDecalRoadMaterial - 0 255 0 255 - 10 - 255 255 255 255 - 255 0 0 255 - - - 0 - 0.8 - 1 - 15 - 0.8 - 0 - 100 - - 10 10 10 - 255 255 255 20 - 0 - 1 - 500 - 0 - - - - 0 255 0 255 - 255 255 255 255 - 5 - 0 0 1 - 255 0 0 255 - DefaultRoadMaterialTop - 10 - DefaultRoadMaterialOther - DefaultRoadMaterialOther - - - 5 - 10 - 0 0 1 - 255 255 255 255 - 255 0 0 255 - 0 255 0 255 - - - AIPlayer - DefaultPlayerData - 1 - - - 0 - - - - - 25 - - - 25 - - - 25 - - - 25 - - - - - Grid512_OrangeLines_Mat - - diff --git a/Templates/BaseGame/game/tools/worldEditor/main.cs b/Templates/BaseGame/game/tools/worldEditor/main.cs index f876480fd..8102438c6 100644 --- a/Templates/BaseGame/game/tools/worldEditor/main.cs +++ b/Templates/BaseGame/game/tools/worldEditor/main.cs @@ -49,7 +49,8 @@ function initializeWorldEditor() exec("./scripts/menus.ed.cs"); exec("./scripts/menuHandlers.ed.cs"); exec("./scripts/editor.ed.cs"); - exec("./scripts/editor.bind.ed.cs"); + exec("./scripts/editorInputCommands.cs"); + exec("./scripts/editor.keybinds.cs"); exec("./scripts/undoManager.ed.cs"); exec("./scripts/lighting.ed.cs"); exec("./scripts/EditorGui.ed.cs"); diff --git a/Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.cs b/Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.cs index 92ac42d8c..b08200869 100644 --- a/Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.cs +++ b/Templates/BaseGame/game/tools/worldEditor/scripts/editor.keybinds.cs @@ -20,51 +20,51 @@ // IN THE SOFTWARE. //----------------------------------------------------------------------------- -if ( isObject( editorMoveMap ) ) - editorMoveMap.delete(); +if ( isObject( EditorMap ) ) + EditorMap.delete(); -new ActionMap(editorMoveMap); +new ActionMap(EditorMap); //------------------------------------------------------------------------------ // Non-remapable binds //------------------------------------------------------------------------------ -editorMoveMap.bindCmd(keyboard, "escape", "", "Canvas.pushDialog(PauseMenu);"); +EditorMap.bindCmd(keyboard, "escape", "", "Canvas.pushDialog(PauseMenu);"); //------------------------------------------------------------------------------ // Movement Keys //------------------------------------------------------------------------------ -editorMoveMap.bind( keyboard, a, editorMoveleft ); -editorMoveMap.bind( keyboard, d, editorMoveright ); -editorMoveMap.bind( keyboard, left, editorMoveleft ); -editorMoveMap.bind( keyboard, right, editorMoveright ); +EditorMap.bind( keyboard, a, editorMoveleft ); +EditorMap.bind( keyboard, d, editorMoveright ); +EditorMap.bind( keyboard, left, editorMoveleft ); +EditorMap.bind( keyboard, right, editorMoveright ); -editorMoveMap.bind( keyboard, w, editorMoveforward ); -editorMoveMap.bind( keyboard, s, editorMovebackward ); -editorMoveMap.bind( keyboard, up, editorMoveforward ); -editorMoveMap.bind( keyboard, down, editorMovebackward ); +EditorMap.bind( keyboard, w, editorMoveforward ); +EditorMap.bind( keyboard, s, editorMovebackward ); +EditorMap.bind( keyboard, up, editorMoveforward ); +EditorMap.bind( keyboard, down, editorMovebackward ); -editorMoveMap.bind( keyboard, e, editorMoveup ); -editorMoveMap.bind( keyboard, c, editorMovedown ); +EditorMap.bind( keyboard, e, editorMoveup ); +EditorMap.bind( keyboard, c, editorMovedown ); -editorMoveMap.bind( mouse, xaxis, editorYaw ); -editorMoveMap.bind( mouse, yaxis, editorPitch ); +EditorMap.bind( mouse, xaxis, editorYaw ); +EditorMap.bind( mouse, yaxis, editorPitch ); //------------------------------------------------------------------------------ // Mouse Trigger //------------------------------------------------------------------------------ -editorMoveMap.bind( mouse, button0, editorClick ); -editorMoveMap.bind( mouse, button1, editorRClick ); +EditorMap.bind( mouse, button0, editorClick ); +EditorMap.bind( mouse, button1, editorRClick ); //------------------------------------------------------------------------------ // Camera & View functions //------------------------------------------------------------------------------ -editorMoveMap.bind(keyboard, "alt c", toggleCamera); +EditorMap.bind(keyboard, "alt c", toggleCamera); //------------------------------------------------------------------------------ // Helper Functions //------------------------------------------------------------------------------ -editorMoveMap.bind(keyboard, "F8", dropCameraAtPlayer); -editorMoveMap.bind(keyboard, "F7", dropPlayerAtCamera); +EditorMap.bind(keyboard, "F8", dropCameraAtPlayer); +EditorMap.bind(keyboard, "F7", dropPlayerAtCamera); //------------------------------------------------------------------------------ // Debugging Functions @@ -77,4 +77,4 @@ GlobalActionMap.bind(keyboard, "ctrl F3", doProfile); //------------------------------------------------------------------------------ GlobalActionMap.bind(keyboard, "tilde", toggleConsole); -editorMoveMap.bind( mouse, "alt zaxis", editorWheelFadeScroll ); +EditorMap.bind( mouse, "alt zaxis", editorWheelFadeScroll );