LJ Sonic
fa9c2f43f7
Merge branch 'skip-empty-gametypes' into 'master'
...
Skip empty gametypes in level select menu
See merge request STJr/SRB2!819
2020-03-21 08:52:54 -04:00
fickleheart
78ec210896
hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
2020-03-19 18:55:10 -05:00
fickleheart
725826a64b
Avoid infinite loops if no maps are selectable (y tho)
2020-03-18 22:56:20 -05:00
SteelT
04131d3268
Merge branch 'fix-nights-mode-menu-wrong-return' into 'master'
...
NiGHTS Mode menu fixes
See merge request STJr/SRB2!841
2020-03-18 15:41:17 -04:00
LJ Sonic
38bcfe4997
Merge branch 'screenshot-menu-header' into 'master'
...
Actually use the "SCREENSHOT OPTIONS" header for its menu.
See merge request STJr/SRB2!832
2020-03-18 10:56:35 -04:00
Steel Titanium
e5270ad9c7
Fix guest data being deleted regardless of choice
2020-03-08 00:34:15 -05:00
Steel Titanium
a3f3dd649f
Fix guest deletion confirmation returning to Record Attack menu from Nights Mode menu
2020-03-08 00:02:43 -05:00
Jaime Passos
b8db3e2216
Fix NiGHTS Attack crash after render mode change
2020-03-04 09:42:34 -03:00
SteelT
7d14796954
Merge branch 'fix-ogllib' into 'master'
...
Fix -OGLlib
See merge request STJr/SRB2!794
2020-03-02 15:21:50 -05:00
sphere
c671097c04
Actually use the "SCREENSHOT OPTIONS" header for its menu.
2020-03-02 13:23:54 +01:00
fickleheart
1848ce4b97
Skip empty gametypes in level select menu
2020-02-24 10:02:48 -06:00
James R
711c8ed6b4
Merge branch 'console-in-menus-mk-ii' into 'master'
...
Console in menus again!
See merge request STJr/SRB2!797
2020-02-23 18:15:43 -05:00
Steel Titanium
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Steel Titanium
f0e2ba9e6a
Merge branch 'next' into the-colors-feel-so-right
2020-02-18 14:29:50 -05:00
Monster Iestyn
2b3034a7af
Merge branch 'master' into next
2020-02-18 17:38:05 +00:00
James R
b78fc670d0
Don't let console open with menu keys while the menu is open
2020-02-17 17:10:29 -08:00
Jaime Passos
cac5f9d171
add -nogl parm
2020-02-17 12:14:51 -03:00
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
8e4cb953c8
Merge branch 'extra-emblem-display' into 'next'
...
Extra emblem hint display
See merge request STJr/SRB2!721
2020-02-17 00:00:36 -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
Steel Titanium
0299f21dc7
Merge branch 'next' into the-colors-feel-so-right
2020-02-16 22:56:27 -05:00
Steel Titanium
2b615aa09c
Add prefoppoistecolor support to save cards
2020-02-15 17:34:21 -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
Bartu İnce
875774a45f
no message
2020-01-22 22:08:08 +01:00
Bartu İnce
c72e0efee4
"page x of y"
2020-01-22 21:57:28 +01:00
Bartu İnce
912734ffe6
Extra emblems display, take 2.
2020-01-22 21:52:15 +01:00
Bartu İnce
aa05581de2
Added support for 10+ emblem hints
2020-01-22 18:53:17 +01: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
