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

Merge pull request #13 from Azaezel/BaseUIUpdate_Wipwork

Browse source 
don't save map population elements when editing
This commit is contained in:
Areloch 2024-01-04 20:27:06 -06:00 • committed by GitHub
commit ee37a13190
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Templates/BaseGame/game/data/UI/guis/ChooseLevelMenu.gui
View file

@ -187,7 +187,7 @@ $guiContent = new GuiControl(ChooseLevelMenu) {
profile = "MenuMLSubHeaderText"; profile = "MenuMLSubHeaderText";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
}; };
new GuiTextEditCtrl() { new GuiTextEditCtrl(playerNameCTRL) {
text = "Visitor"; text = "Visitor";
position = "606 4"; position = "606 4";
extent = "295 22"; extent = "295 22";
@ -213,8 +213,8 @@ $guiContent = new GuiControl(ChooseLevelMenu) {
profile = "MenuMLSubHeaderText"; profile = "MenuMLSubHeaderText";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
}; };
new GuiTextEditCtrl() { new GuiTextEditCtrl(serverNameCTRL) {
text = "Torque 3D Server"; text = "";
position = "606 4"; position = "606 4";
extent = "295 22"; extent = "295 22";
horizSizing = "left"; horizSizing = "left";
@ -239,8 +239,8 @@ $guiContent = new GuiControl(ChooseLevelMenu) {
profile = "MenuMLSubHeaderText"; profile = "MenuMLSubHeaderText";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
}; };
new GuiTextEditCtrl() { new GuiTextEditCtrl(serverPassCTRL) {
text = "Torque 3D Server"; text = "";
position = "606 4"; position = "606 4";
extent = "295 22"; extent = "295 22";
horizSizing = "left"; horizSizing = "left";
@ -265,7 +265,7 @@ $guiContent = new GuiControl(ChooseLevelMenu) {
profile = "MenuMLSubHeaderText"; profile = "MenuMLSubHeaderText";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
}; };
new GuiTextEditCtrl() { new GuiTextEditCtrl(serverInfoCTRL) {
text = "This is a Torque 3D server."; text = "This is a Torque 3D server.";
position = "606 4"; position = "606 4";
extent = "295 22"; extent = "295 22";
@ -291,7 +291,7 @@ $guiContent = new GuiControl(ChooseLevelMenu) {
profile = "MenuMLSubHeaderText"; profile = "MenuMLSubHeaderText";
tooltipProfile = "GuiToolTipProfile"; tooltipProfile = "GuiToolTipProfile";
}; };
new GuiTextEditCtrl(JoinServerPlayerNameTxt) { new GuiTextEditCtrl(serverMaxPlayersCTRL) {
text = "64"; text = "64";
position = "606 4"; position = "606 4";
extent = "295 22"; extent = "295 22";

11
Templates/BaseGame/game/data/UI/guis/ChooseLevelMenu.tscript
View file

@ -28,8 +28,18 @@ function ChooseLevelMenu::onAdd( %this )
%this.previewButtonSize = "445 120"; %this.previewButtonSize = "445 120";
} }
function ChooseLevelMenu::fillPrefEntries( %this )
{
playerNameCTRL.setText($Pref::Player::Name);
serverNameCTRL.setText($Pref::Server::Name);
serverPassCTRL.setText($Pref::Server::Password);
serverInfoCTRL.setText($Pref::Server::Info);
serverMaxPlayersCTRL.setText($Pref::Server::MaxPlayers);
}
function ChooseLevelMenu::onWake(%this) function ChooseLevelMenu::onWake(%this)
{ {
%this.fillPrefEntries();
LevelPreviewArray.clear(); LevelPreviewArray.clear();
ChooseLevelAssetQuery.clear(); ChooseLevelAssetQuery.clear();
@ -87,6 +97,7 @@ function ChooseLevelMenu::onWake(%this)
textLocation = "left"; textLocation = "left";
textMargin = 120; textMargin = 120;
groupNum = 2; groupNum = 2;
cansave = false;
}; };
LevelPreviewArray.add(%preview); LevelPreviewArray.add(%preview);

7
Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
View file

@ -19,6 +19,7 @@ function OptionsMenu::onAdd(%this)
function OptionsMenu::onWake(%this) function OptionsMenu::onWake(%this)
{ {
%this.optsListCount = -1;
$optionsChangeRequiresRestart = false; $optionsChangeRequiresRestart = false;
%this.populateVideoSettings(); %this.populateVideoSettings();
@ -759,6 +760,7 @@ function OptionsMenu::resetSettings(%this)
// Option types // Option types
function addOptionGroup(%displayName) function addOptionGroup(%displayName)
{ {
OptionsMenu.optsListCount++;
%group = new GuiTextCtrl() { %group = new GuiTextCtrl() {
text = %displayName; text = %displayName;
position = "0 0"; position = "0 0";
@ -785,6 +787,7 @@ function optionsMenuButton::onHighlighted(%this, %highlighted)
function addOptionEntry(%optionObj) function addOptionEntry(%optionObj)
{ {
OptionsMenu.optsListCount++;
if(!isObject(%optionObj) || (%optionObj.class !$= "OptionsSettings" && %optionObj.class !$= "AudioOptionsSettings")) if(!isObject(%optionObj) || (%optionObj.class !$= "OptionsSettings" && %optionObj.class !$= "AudioOptionsSettings"))
{ {
error("addOptionsEntry() - attempting to create a new options entry, but was provided an invalid options object"); error("addOptionsEntry() - attempting to create a new options entry, but was provided an invalid options object");
@ -818,6 +821,7 @@ function addOptionEntry(%optionObj)
class = "OptionsListEntry"; class = "OptionsListEntry";
optionsObject = %optionObj; optionsObject = %optionObj;
currentOptionIndex = %qualityLevelIndex; currentOptionIndex = %qualityLevelIndex;
selectionID = OptionsMenu.optsListCount;
canSave = "0"; canSave = "0";
new GuiButtonCtrl() { new GuiButtonCtrl() {
@ -862,6 +866,7 @@ function addOptionEntry(%optionObj)
text = "<"; text = "<";
profile = GuiMenuButtonProfile; profile = GuiMenuButtonProfile;
internalName = "prevValButton"; internalName = "prevValButton";
command = "$MenuList.listPosition = $thisControl.getParent().getParent().selectionID; OptionMenuPrevSetting(1);";
}; };
new GuiTextCtrl() { new GuiTextCtrl() {
@ -881,6 +886,7 @@ function addOptionEntry(%optionObj)
text = ">"; text = ">";
profile = GuiMenuButtonProfile; profile = GuiMenuButtonProfile;
internalName = "nextValButton"; internalName = "nextValButton";
command = "$MenuList.listPosition = $thisControl.getParent().getParent().selectionID; OptionMenuNextSetting(1);";
}; };
}; };
}; };
@ -890,6 +896,7 @@ function addOptionEntry(%optionObj)
function addOptionSlider(%optionName, %optionDesc, %prefName, %sliderMin, %sliderMax, %sliderTicks) function addOptionSlider(%optionName, %optionDesc, %prefName, %sliderMin, %sliderMax, %sliderTicks)
{ {
OptionsMenu.optsListCount++;
%currentVal = getVariable(%prefName); %currentVal = getVariable(%prefName);
%tempVarName = %prefName @ "_tempVar"; %tempVarName = %prefName @ "_tempVar";