Merge branch 'master' into Release

PapaPeach · Apr 19, 2024 · 226f304 · 226f304
2 parents 9747ed5 + d4d25a1
commit 226f304
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 23 deletions.
diff --git a/resource/gamemenu.res b/resource/gamemenu.res
@@ -44,7 +44,7 @@
  {
  "label" ""
  "command" "engine play items/samurai/tf_samurai_noisemaker_setb_02.wav"
- "tooltip" "Released August 14, 2022"
+ "tooltip" "Released April 19, 2024"
  "OnlyAtMenu" "1"
  }
  ///////////////////////////////////////////////////////////////////

diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res
@@ -13,7 +13,7 @@
  "visible" "1"
  "enabled" "1"
  "tabPosition" "0"
- "settitlebarvisible" "0"
+ "settitlebarvisible" "1"
  "PaintBackgroundType" "0"
  "bgcolor_override" "Blank"
  "infocus_bgcolor_override" "Blank"
@@ -98,7 +98,7 @@
  "tabwidth" "240"
  "tabheight" "18"
  "transition_time" "0"
- "yoffset" "30"
+ "yoffset" "14"
 
  "HeaderLine"
  {

diff --git a/resource/ui/hudmannvsmachinestatus.res b/resource/ui/hudmannvsmachinestatus.res
@@ -43,18 +43,6 @@
  "pin_corner_to_sibling" "4" 
  "pin_to_sibling_corner" "6" 
  }
-
- "CurrencyStatusPanel"
- {
- "ControlName" "CCurrencyStatusPanel"
- "fieldName" "CurrencyStatusPanel"
- "xpos" "c-50"
- "ypos" "r124"
- "wide" "100"
- "tall" "20"
- "visible" "1"
- "enabled" "1"
- }
 
  "InWorldCurrencyPanel"
  {

diff --git a/resource/ui/mainmenuoverride.res b/resource/ui/mainmenuoverride.res
@@ -247,17 +247,17 @@
  "textAlignment" "west"
  "AllCaps" "0"
  "use_proportional_insets" "1"
- "labelText" "Version 3.3.1"
+ "labelText" "Version 3.3.3"
  }
 
  "InfoSeparatorLine"
  {
  "ControlName" "EditablePanel"
  "fieldname" "InfoSeparatorLine"
- "xpos" "55" //xpos
+ "xpos" "56" //xpos
  "ypos" "148" //148
  "zpos" "2"
- "wide" "277" //xpos+wide=332
+ "wide" "276" //xpos+wide=332
  "tall" "1"
  "visible" "1"
  "bgcolor_override" "WhiteTransparent"
@@ -270,7 +270,7 @@
  "xpos" "12"
  "ypos" "145"
  "zpos" "100"
- "wide" "42" //Button Width
+ "wide" "43" //Button Width
  "tall" "6"
  "visible" "1"
 

diff --git a/resource/ui/pvprankpanel_peach.res b/resource/ui/pvprankpanel_peach.res
@@ -313,7 +313,7 @@
  {
  "ControlName" "EditablePanel"
  "fieldName" "StatsContainer"
- "xpos" "45" //StatsContainer xpos + ProgressBarsContainer wide=322
+ "xpos" "46" //StatsContainer xpos + ProgressBarsContainer wide=322
  "ypos" "rs1"
  "wide" "300"
  "tall" "40"
@@ -351,7 +351,7 @@
  "fieldName" "ProgressBarsContainer"
  "xpos" "0"
  "ypos" "r2"
- "wide" "277" //StatsContainer xpos + ProgressBarsContainer wide=322
+ "wide" "276" //StatsContainer xpos + ProgressBarsContainer wide=322
  "tall" "1"
  "proportionaltoparent" "1"
 

diff --git a/scripts/hudlayout_default.res b/scripts/hudlayout_default.res
@@ -355,6 +355,22 @@
  "PaintBackgroundType" "2"
  }
 
+ "CurrencyStatusPanel"
+ {
+ "ControlName" "CCurrencyStatusPanel"
+ "fieldName" "CurrencyStatusPanel"
+ "xpos" "0"
+ "ypos" "r100"
+ "wide" "100"
+ "tall" "100"
+ "xpos_minmode" "65"
+ "ypos_minmode" "r88"
+ "visible" "0"
+ "enabled" "1"
+
+ "PaintBackgroundType" "2"
+ }
+
  HudProgressBar
  {
  "fieldName" "HudProgressBar"
@@ -1504,5 +1520,4 @@
  "mouseinputenabled" "0"
  "alpha" "100"
  }
-}
-
+}
diff --git a/scripts/hudlayout_peach.res b/scripts/hudlayout_peach.res
@@ -184,6 +184,16 @@
  "pin_to_sibling" "BuildingAnchor"
  }
 
+ "CurrencyStatusPanel"
+ {
+ "xpos" "c-50"
+ "ypos" "r124"
+ "xpos_minmode" "c-50"
+ "ypos_minmode" "r124"
+ "wide" "100"
+ "tall" "20"
+ }
+
  HudDeathNotice
  {
  "xpos" "r634"