fickleheart
794d74c4d7
Merge remote-tracking branch 'origin/master' into newcontrols
2020-01-04 09:35:12 -06:00
Louis-Antoine
b45ee059e3
Fix major issue
2020-01-03 02:58:23 +01:00
LJ Sonic
ff8cb3ddb0
Merge branch 'do-not-save-netvars' into 'master'
...
Do not save netgame-synced console variables
See merge request STJr/SRB2!623
2020-01-02 20:50:00 -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
1845266bc8
Do not save netgame-synced console variables
...
This is a bad thing to do, because if you join a server,
your game will save the host's settings.
2020-01-03 00:40:49 +01:00
Louis-Antoine
49934007d7
Add a "alwaysgrabmouse" console variable
2020-01-03 00:25:58 +01:00
Louis-Antoine
e0e5e83869
Revert "Ungrab mouse when watching a record"
...
This reverts commit 17636ccc01
2020-01-02 20:29:51 +01:00
James R
b9cecea25c
Hahahahahahahahahahahahaha
2020-01-01 15:52:23 -08:00
Louis-Antoine
3af00ac93e
Minor code refactoring
2020-01-02 00:47:20 +01:00
Louis-Antoine
17636ccc01
Ungrab mouse when watching a record
2020-01-02 00:46:50 +01:00
Louis-Antoine
5bde4df439
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01:00
Louis-Antoine
62397a36ec
Grab mouse on game startup
2020-01-02 00:38:43 +01:00
James R
e9843590da
Merge branch 'nohw-renderswitch' into 'master'
...
NOHW V.S. Renderer Switching
See merge request STJr/SRB2!609
2020-01-01 17:52:35 -05:00
James R
35fe2e7281
Merge branch 'quote-shenanigans' into 'master'
...
Stuff I Broke: Commands
See merge request STJr/SRB2!607
2020-01-01 17:52:21 -05:00
James R
01be810aee
Merge branch 'warp-by-name' into 'master'
...
Properly fix the issue that !528 tried to; let the -warp parameter work with map name
See merge request STJr/SRB2!596
2020-01-01 17:51:21 -05:00
Louis-Antoine
caadf6aa61
Let the mouse move freely when a menu is open or game is paused
...
That means you can now easily move your mouse out of SRB2's window
and switch between several windows easily by just pressing escape!
Any phase of the game that isn't actual gameplay counts as a menu,
which means you can also move the mouse in cutscenes,
at the title screen, server connection screen,
and even when the chat or console are open.
2020-01-01 13:29:07 +01:00
Jaime Passos
b41cd59e51
Revert "Merge branch 'software-clownery' into 'master'"
...
This reverts merge request !578
2019-12-31 23:40:17 +00:00
Jaime Passos
c460775cd7
Merge branch 'fixcoronalist' into 'master'
...
Fix broken corona list
See merge request STJr/SRB2!605
2019-12-31 14:25:49 -05:00
Nev3r
0979887600
Merge branch 'software-clownery' into 'master'
...
Software clownery
See merge request STJr/SRB2!578
2019-12-31 12:49:44 -05: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
James R
e8db39229c
Don't let the user switch to OpenGL if NOHW
2019-12-30 20:29:41 -08:00
James R
36c5bb7b0d
Fix NOHW compiling
2019-12-30 20:18:08 -08:00
James R
782bf8d31e
Fix NOMIXER compiling
2019-12-30 20:08:29 -08:00
James R
4bf3597116
Fix NOOPENMPT compiling
2019-12-30 19:19:17 -08:00
James R
ff47f911dc
Fix command not running if it was split by COM_BufAddText
...
(Looks at 4865a190578b900b48571e74e0bd97bef88ea71b...)
2019-12-30 18:47:21 -08:00
James R
ab410652ae
Fix unclosed quotes leaving the escape character in
2019-12-30 18:44:13 -08:00
Jaime Passos
7b54846a02
Merge remote-tracking branch 'origin/master' into software-clownery
2019-12-30 23:21:42 -03:00
James R
5e5f3c4fa7
Merge branch 'renderswitch' into 'master'
...
Renderer switching
See merge request STJr/SRB2!550
2019-12-30 15:36:17 -05:00
fickleheart
631b5ff883
Disable lock-on in Ringslinger
2019-12-30 12:13:41 -06:00
fickleheart
085c39128f
Save separate camera settings for standard/simple modes
2019-12-30 12:10:38 -06:00
fickleheart
b46cbe76d6
Somehow miss committing the ACTUAL stickyhold part
2019-12-30 11:36:59 -06:00
fickleheart
d980d526c8
Change defaults to match my personal settings
2019-12-30 11:36:40 -06:00
fickleheart
7fa9eed573
Fix camera reset snap in simple controls
2019-12-30 11:22:54 -06:00
fickleheart
ebbe5938a8
Fix tailsbot flying weird with P1=standard P2=simple controls
2019-12-30 11:07:29 -06:00
fickleheart
f4e7227e11
Fix compilation errors
2019-12-30 11:01:56 -06:00
fickleheart
a9b80bf1f0
Merge branch 'master' into newcontrols
...
# Conflicts:
# src/d_netcmd.c
# src/g_game.c
# src/g_game.h
# src/m_menu.c
2019-12-30 10:47:09 -06:00
Jaime Passos
a04834d1aa
Fix alignment in R_ThickStepping
2019-12-30 12:02:09 -03:00
Jaime Passos
590d6729e6
Merge remote-tracking branch 'origin/master' into software-clownery
2019-12-30 11:49:12 -03:00
James R
7886a4bbee
Don't warn if we start in OpenGL
2019-12-29 18:37:44 -08:00
James R
569453ee93
Warn when going to OpenGL from the menu
2019-12-29 18:37:22 -08:00
Jaime Passos
2f4c270a7b
Update r_segs.c
2019-12-29 19:43:38 -03:00
James R
566b4a1626
Don't let us warp to a map that doesn't exist (really!)
...
Okay so 6464df9876
2019-12-29 02:44:27 -08:00
James R
404f3c13e4
If we move the -warp code down, map searching can be used
2019-12-29 02:31:48 -08:00
James R
0a014755b9
I'm still an idiot
2019-12-29 02:16:37 -08:00
James R
2ffff56b39
Who cares?
2019-12-29 02:15:48 -08:00
James R
19aafbfd0b
Split map code checking from Command_Map_f
2019-12-29 02:14:02 -08:00
Jaime Passos
f997866b4d
Fix broken dynlight list because of a SPR_NON2 that doesn't exist
2019-12-28 22:57:37 -03:00
Jaime Passos
244f0b228f
Fix M_PathParts instead
2019-12-28 22:18:41 -03:00
Jaime Passos
3bb7fd4cbf
Fix logfiles crashing Windoze
2019-12-28 22:14:23 -03:00
