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 branch 'development' into imageAsset_refactor_rev3

Browse source
This commit is contained in:
marauder2k7 2025-03-24 20:07:06 +00:00 • committed by GitHub
commit 0da0903599
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4189 changed files with 29881 additions and 635347 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/data/UI/guis/joinServerMenu.tscript
View file

@ -11,8 +11,8 @@ function JoinServerMenu::onWake(%this)
function JoinServerMenu::onSleep(%this)
{
echo("Exporting client prefs");
%prefPath = getPrefpath();
echo("Exporting client prefs to "@ getUserHomeDirectory() @ "/clientPrefs." @ $TorqueScriptFileExtension);
export("$pref::*", %prefPath @ "/clientPrefs." @ $TorqueScriptFileExtension, false);
}

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

@ -1,3 +1,4 @@
$reportKeymapping = false;
$optionsEntryPad = 10;
$OptionsMenuCategories[0] = "Video";
@ -672,8 +673,8 @@ function OptionsMenu::populateKeybinds(%this, %device, %controlsList)
%keyMap = buildFullMapString( %i, $RemapActionMap[%i], %device );
%description = $RemapDescription[%i];
echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %device @ " | " @ %keymap @ " | " @ %description);
if ($reportKeymapping)
echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %device @ " | " @ %keymap @ " | " @ %description);
%remapEntry = addActionMapEntry(%actionMapName, %device, %keyMap, %i, %description);
%controlsList.add(%remapEntry);
@ -1074,7 +1075,8 @@ function addActionMapEntry(%actionMap, %device, %keyMap, %index, %description)
};
%buttonContainer = %entry.findObjectByInternalName("valuesContainer");
echo("Keymap: " @ %keymap @ " | Keymap word count: " @ getWordCount(getField(%keyMap, 1)));
if ($reportKeymapping)
echo("Keymap: " @ %keymap @ " | Keymap word count: " @ getWordCount(getField(%keyMap, 1)));
if(getWordCount(getField(%keyMap, 1)) == 2)
{
%modifierBtn = new GuiIconButtonCtrl() {

16
Templates/BaseGame/game/data/gameUI/GUIs/playGui.tscript
View file

@ -37,12 +37,18 @@ function PlayGui::onWake(%this)
if(isObject(moveMap))
moveMap.push();
callOnModules("Playgui_onWake");
%modulesIDList = getModulesAndGameModesList(true, "Game");
%numModsNeedingLoaded = getNumCanCallOnObjectList("Playgui_onWake", %modulesIDList);
if (%numModsNeedingLoaded)
callOnObjectList("Playgui_onWake", %modulesIdList);
}
function PlayGui::onSleep(%this)
{
callOnModules("Playgui_onSleep");
%modulesIDList = getModulesAndGameModesList(true, "Game");
%numModsNeedingLoaded = getNumCanCallOnObjectList("Playgui_onSleep", %modulesIDList);
if (%numModsNeedingLoaded)
callOnObjectList("Playgui_onSleep", %modulesIdList);
// pop the keymaps
if(isObject(moveMap))
@ -51,7 +57,11 @@ function PlayGui::onSleep(%this)
function PlayGui::clearHud( %this )
{
callOnModules("Playgui_clearHud");
%modulesIDList = getModulesAndGameModesList(true, "Game");
%numModsNeedingLoaded = getNumCanCallOnObjectList("Playgui_clearHud", %modulesIDList);
if (%numModsNeedingLoaded)
callOnObjectList("Playgui_clearHud", %modulesIdList);
Canvas.popDialog( MainChatHud );
while ( %this.getCount() > 0 )