James R
3ea51c943a
Merge branch 'trim-floats' into 'master'
...
Trim the trailing zeros off floats for cvars
See merge request STJr/SRB2!716
2020-02-17 00:04:15 -05:00
James R
132e8f82d5
Merge branch 'local-color-table' into 'master'
...
Local Color Table for GIF movie mode
See merge request STJr/SRB2!742
2020-02-16 23:58:11 -05:00
MascaraSnake
31bce6c857
Merge branch 'master' into next
2020-02-15 12:32:09 +01:00
GoldenTails
9f7bfd901b
I broke SHIFT in the Connect IP Textbox.. whoops.
...
It's okay, I literally had to remove one line lmao.
2020-02-11 19:07:48 -06:00
Jaime Passos
af66a2e5fa
Restore some functionality that went missing
2020-02-03 02:12:55 -03:00
Jaime Passos
520e2148fe
Merge remote-tracking branch 'origin/master' into local-color-table
2020-02-03 01:52:43 -03:00
James R
4238003887
Merge remote-tracking branch 'origin/master' into next
2020-01-30 23:54:56 -08:00
Jaime Passos
99c755c186
Update the Screenshot Options menu
2020-01-29 13:52:02 -03:00
Jaime Passos
1548a22ea9
Fix M_DrawNightsAttackMountains being broken for obvious reasons
2020-01-27 00:44:10 -03:00
Monster Iestyn
ef53672deb
Merge branch 'master' into next
...
# Conflicts:
# src/g_game.c
2020-01-26 19:23:05 +00:00
James R
5b08e1802d
Trim the trailing zeros off floats for cvars
2020-01-20 23:14:26 -08:00
Louis-Antoine
512435c59f
Fix mouse in controls setup menu
2020-01-18 20:18:20 +01:00
Tatsuru
8348123a70
Goal posts
2020-01-18 13:15:24 -03:00
Tatsuru
0c7c5742a8
Put cv_exitmove in the menus
2020-01-18 12:06:04 -03:00
Alam Ed Arias
709489cab8
Merge branch 'master' into next
2020-01-16 12:08:36 -05:00
James R
2bb8b85754
Merge branch 'split-emblem-hints' into 'next'
...
"Symmetrical"-ish Emblem Hint pages
See merge request STJr/SRB2!670
2020-01-12 17:16:03 -05:00
Zwip-Zwap Zapony
66c9e8e3aa
Fix "symmetrical"-ish emblem hints for ERRORMODE
...
"left_hints" is always 3, 4, or 5, so the signedness is irrelevant.
But with ERRORMODE set to 1 when compiling,
the compile would previously stop due to comparing INT32 to UINT32.
2020-01-12 23:09:27 +01:00
Monster Iestyn
c7ab065b0a
Merge branch 'master' into next
2020-01-11 18:38:09 +00:00
Zwip-Zwap Zapony
e6ddfc7cdf
Make >5 <10 emblem hints appear "symmetrical"-ish
...
With more than 5 but less than 10 emblem hints,
only put half of the hints on each side of the hint menu,
instead of putting e.g. 5 on the left and 1 on the right.
2020-01-11 14:59:10 +01:00
James R
407b00b22b
Merge branch 'showconditionset' into 'next'
...
Showconditionset
See merge request STJr/SRB2!651
2020-01-10 15:59:37 -05:00
James R
2491046bc2
Merge branch 'morehints' into 'next'
...
Allow for 10 emblem hints on a map by poking the drawer a bit.
See merge request STJr/SRB2!650
2020-01-10 15:59:22 -05:00
James R
134d1831e3
Menu option for 1upsound
2020-01-10 12:55:22 -08:00
James R
5c60f8b529
Merge branch 'software-fov' into 'master'
...
Software FOV
See merge request STJr/SRB2!662
2020-01-10 00:33:24 -05:00
James R
7deb18bdc9
Merge remote-tracking branch 'origin/master' into next
2020-01-08 13:27:14 -08:00
toaster
377194b077
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into showconditionset
...
# Conflicts:
# src/m_menu.c
2020-01-08 20:00:50 +00:00
toaster
d2da441a57
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into morehints
...
# Conflicts:
# src/m_menu.c
2020-01-08 19:18:35 +00:00
fickleheart
c133e645f7
Merge remote-tracking branch 'upstream/next' into next-newcontrols
2020-01-07 23:43:43 -06:00
Steel Titanium
808d731652
Update copyright statements for changed names
2020-01-06 17:16:27 -05:00
Alam Ed Arias
5b93230a94
Merge branch 'master' into next
2020-01-06 10:28:21 -05:00
Alam Ed Arias
0fbc459243
cleanup whitespace
2020-01-05 21:49:07 -05:00
James R
e4f88d142e
Merge branch 'connect-ip-textbox' into 'master'
...
Add clipboard functionality to the Connect via IP textbox.
See merge request STJr/SRB2!597
2020-01-05 17:06:45 -05:00
fickleheart
f8a3e3b898
Merge remote-tracking branch 'origin/next' into next-newcontrols
2020-01-04 09:57:09 -06:00
fickleheart
f0e6a56b6b
Merge branch 'newcontrols' into next-newcontrols
2020-01-04 09:56:24 -06:00
fickleheart
794d74c4d7
Merge remote-tracking branch 'origin/master' into newcontrols
2020-01-04 09:35:12 -06:00
Alam Ed Arias
a26c5f5428
Merge branch 'master' into next
2020-01-03 14:56:37 -05:00
LJ Sonic
c6aec51d99
Merge branch 'ungrab-mouse-in-menus' into 'master'
...
Let the mouse move freely when a menu is open or game is paused
See merge request STJr/SRB2!617
2020-01-02 18:48:38 -05:00
Louis-Antoine
3af00ac93e
Minor code refactoring
2020-01-02 00:47:20 +01:00
Louis-Antoine
5bde4df439
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01:00
James R
0c40a466d8
Merge remote-tracking branch 'origin/master' into next
2020-01-01 15:39:05 -08:00
James R
85fbf4f571
Merge branch 'custom-gametype-serverinfo' into 'next'
...
Gametype name in SERVERINFO
See merge request STJr/SRB2!610
2020-01-01 17:52:46 -05:00
fickleheart
b22de48c03
Merge branch 'next' into next-newcontrols
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2019-12-31 12:58:36 -06:00
fickleheart
8bc58807aa
Software FOV ported from kart
...
also fixes high software FOVs having buggy walls
2019-12-31 11:22:05 -06:00
James R
b4ebb01e2d
Truncate gametype name in server list if it's too long
2019-12-30 22:23:19 -08:00
James R
281f30c4fd
Replace gametype with gametypename in SERVERINFO
...
PACKETVERSION 1
2019-12-30 22:18:55 -08:00
James R
7af2533d23
Make the menu option for renderer switching transparent under NOHW
2019-12-30 21:45:19 -08:00
James R
38492073fa
IT_PAIR for when you want to define both sides of a menu item
2019-12-30 21:40:13 -08:00
Jaime Passos
181a366d4a
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
2019-12-30 18:39:31 -03:00
fickleheart
2c45ecbaa5
Fix camera reset button
2019-12-30 15:34:43 -06:00
James R
fc8c0f8a9a
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
fickleheart
a51f2500e0
Update playstyle menu handling to use analog/directionchar combo
2019-12-30 15:15:37 -06:00
