adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge post-0.7.0 commits through 'c8250d8b8' into v0.7.2.

Browse Source 
sdl_common.c has lost some commits in the restructuring and those
will need to be replayed over the restructured files for SDL1 and 2.
This commit is contained in:
Michael Martin
2020-04-03 17:43:49 -07:00
parent 0e021ac55a c8250d8b8b
commit 562917b456
597 changed files with 10714 additions and 5297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/content/base/ui/setupmenu.txt
+55 -20
View File
@@ -30,10 +30,12 @@ Positional Audio
Sound Driver
Sound Quality
Slave Shields
Player One
Player Two
Bottom Player
Top Player
Control Set
UQM Remixes
Speech
Aspect Ratio
#(CAT_0_OPTS)
320x240
@@ -314,28 +316,28 @@ Placeholder
Placeholder
#(CAT_18_OPT_0_DESC)
Player 1 controls the bottom player in
Super Melee, and the entire Full Game.
Controls the bottom player in Super
Melee, and the entire Full Game.
#(CAT_18_OPT_1_DESC)
Player 1 controls the bottom player in
Super Melee, and the entire Full Game.
Controls the bottom player in Super
Melee, and the entire Full Game.
#(CAT_18_OPT_2_DESC)
Player 1 controls the bottom player in
Super Melee, and the entire Full Game.
Controls the bottom player in Super
Melee, and the entire Full Game.
#(CAT_18_OPT_3_DESC)
Player 1 controls the bottom player in
Super Melee, and the entire Full Game.
Controls the bottom player in Super
Melee, and the entire Full Game.
#(CAT_18_OPT_4_DESC)
Player 1 controls the bottom player in
Super Melee, and the entire Full Game.
Controls the bottom player in Super
Melee, and the entire Full Game.
#(CAT_18_OPT_5_DESC)
Player 1 controls the bottom player in
Super Melee, and the entire Full Game.
Controls the bottom player in Super
Melee, and the entire Full Game.
#(CAT_19_OPTS)
Placeholder
@@ -346,27 +348,27 @@ Placeholder
Placeholder
#(CAT_19_OPT_0_DESC)
Player 2 controls the top player
Controls the top player
in Super Melee.
#(CAT_19_OPT_1_DESC)
Player 2 controls the top player
Controls the top player
in Super Melee.
#(CAT_19_OPT_2_DESC)
Player 2 controls the top player
Controls the top player
in Super Melee.
#(CAT_19_OPT_3_DESC)
Player 2 controls the top player
Controls the top player
in Super Melee.
#(CAT_19_OPT_4_DESC)
Player 2 controls the top player
Controls the top player
in Super Melee.
#(CAT_19_OPT_5_DESC)
Player 2 controls the top player
Controls the top player
in Super Melee.
#(CAT_20_OPTS)
@@ -420,10 +422,39 @@ Overrides PC or 3do soundtrack with the
modern soundtrack written by The Precursors.
Requires a restart of UQM to take effect.
#(CAT_22_OPTS)
Disabled
Enabled
#(CAT_22_OPT_0_DESC)
Do not load the 3DO Speech Pack.
Uses script closer to PC version.
Requires a restart of UQM to take effect.
#(CAT_22_OPT_1_DESC)
Use 3DO speech. The script is closer to 3DO
version where there are differences.
Requires a restart of UQM to take effect.
#(CAT_23_OPTS)
Any
Force 4:3
#(CAT_23_OPT_0_DESC)
Allow any aspect ratio. The game may be
stretched in windows that are not 4:3.
Currently only meaningful in OpenGL mode.
#(CAT_23_OPT_1_DESC)
Display the game with 4:3 aspect even when
the window is not.
Currently only meaningful in OpenGL mode.
#(SLIDERS)
Music Volume
SFX Volume
Speech Volume
Gamma Correction
#(SLIDER_0_DESC)
Sets the music volume.
@@ -434,6 +465,10 @@ Sets the sound effects volume.
#(SLIDER_2_DESC)
Sets the speech volume.
#(SLIDER_3_DESC)
Sets the gamma correction.
May not work on all hardware.
#(BUTTONS)
Quit Setup Menu
Return to Main Menu