James R
f1db264c25
Merge branch 'dd-is-dead' into 'master'
...
Remove Direct Draw from AppVeyor config
See merge request STJr/SRB2!622
2020-01-02 20:54:56 -05:00
LJ Sonic
f9d54b89c3
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
3ae44063f1
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
ff47e36b43
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
54b4a53f92
Add a "alwaysgrabmouse" console variable
2020-01-03 00:25:58 +01:00
James R
3762b638c7
Remove Direct Draw from AppVeyor config
2020-01-02 14:58:09 -08:00
Louis-Antoine
1864526f72
Revert "Ungrab mouse when watching a record"
...
This reverts commit bd25e7b4ac
2020-01-02 20:29:51 +01:00
James R
8720bbe044
Hahahahahahahahahahahahaha
2020-01-01 15:52:23 -08:00
Louis-Antoine
f750144c88
Minor code refactoring
2020-01-02 00:47:20 +01:00
Louis-Antoine
bd25e7b4ac
Ungrab mouse when watching a record
2020-01-02 00:46:50 +01:00
Louis-Antoine
61a681ed02
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01:00
Louis-Antoine
d4a2483c3e
Grab mouse on game startup
2020-01-02 00:38:43 +01:00
James R
6ea83c74c3
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
b83dfa9e5a
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
b8f465408b
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
30bc8af7e8
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
b756b45d16
Merge branch 'revert-938f81ba' into 'master'
...
Revert "Merge branch 'software-clownery' into 'master'"
See merge request STJr/SRB2!616
2019-12-31 18:42:53 -05:00
Jaime Passos
285a2ec05d
Revert "Merge branch 'software-clownery' into 'master'"
...
This reverts merge request !578
2019-12-31 23:40:17 +00:00
Jaime Passos
86e8f35c44
Merge branch 'fixcoronalist' into 'master'
...
Fix broken corona list
See merge request STJr/SRB2!605
2019-12-31 14:25:49 -05:00
Nev3r
938f81ba88
Merge branch 'software-clownery' into 'master'
...
Software clownery
See merge request STJr/SRB2!578
2019-12-31 12:49:44 -05:00
James R
ec72c69614
Make the menu option for renderer switching transparent under NOHW
2019-12-30 21:45:19 -08:00
James R
7616bf5734
IT_PAIR for when you want to define both sides of a menu item
2019-12-30 21:40:13 -08:00
James R
3b30fcc5fa
Don't let the user switch to OpenGL if NOHW
2019-12-30 20:29:41 -08:00
James R
73643dafaf
Fix NOHW compiling
2019-12-30 20:18:08 -08:00
James R
4f8775d560
Fix NOMIXER compiling
2019-12-30 20:08:29 -08:00
James R
cdadd86780
Fix NOOPENMPT compiling
2019-12-30 19:19:17 -08:00
James R
7d6d8b3b6e
Fix command not running if it was split by COM_BufAddText
...
(Looks at d57083264e93f1020c2730e072c7a7b5417e08b3...)
2019-12-30 18:47:21 -08:00
James R
46c0d62a06
Fix unclosed quotes leaving the escape character in
2019-12-30 18:44:13 -08:00
Jaime Passos
2bdd411736
Merge remote-tracking branch 'origin/master' into software-clownery
2019-12-30 23:21:42 -03:00
James R
14fb5dccc8
Merge branch 'renderswitch' into 'master'
...
Renderer switching
See merge request STJr/SRB2!550
2019-12-30 15:36:17 -05:00
Jaime Passos
8d1ad4dc2e
Fix alignment in R_ThickStepping
2019-12-30 12:02:09 -03:00
Jaime Passos
2c247d8210
Merge remote-tracking branch 'origin/master' into software-clownery
2019-12-30 11:49:12 -03:00
James R
a330a7ee40
Don't warn if we start in OpenGL
2019-12-29 18:37:44 -08:00
James R
3883d44bb5
Warn when going to OpenGL from the menu
2019-12-29 18:37:22 -08:00
Jaime Passos
ee94af04d5
Update r_segs.c
2019-12-29 19:43:38 -03:00
James R
909a9dccc7
Don't let us warp to a map that doesn't exist (really!)
...
Okay so 66524a1e3f
2019-12-29 02:44:27 -08:00
James R
d9e9a2e1ce
If we move the -warp code down, map searching can be used
2019-12-29 02:31:48 -08:00
James R
69535cf202
I'm still an idiot
2019-12-29 02:16:37 -08:00
James R
0004f47f94
Who cares?
2019-12-29 02:15:48 -08:00
James R
08016fbdca
Split map code checking from Command_Map_f
2019-12-29 02:14:02 -08:00
Alam Ed Arias
bdccabe6a7
Merge branch 'fixmain' into 'master'
...
Fix logfiles crashing Windoze (resolves #102 )
Closes #102
See merge request STJr/SRB2!591
2019-12-28 21:15:23 -05:00
Jaime Passos
ba40acf626
Fix broken dynlight list because of a SPR_NON2 that doesn't exist
2019-12-28 22:57:37 -03:00
Jaime Passos
ce138d67dc
Fix M_PathParts instead
2019-12-28 22:18:41 -03:00
Jaime Passos
ccbe29e5ab
Fix logfiles crashing Windoze
2019-12-28 22:14:23 -03:00
MascaraSnake
d182000223
Fixed/clarified some flag descriptions in the ZB config
2019-12-28 08:42:16 +01:00
Alam Ed Arias
1f143ca9d6
use size_t to count the sprites
2019-12-27 13:20:58 -05:00
Alam Ed Arias
848a144956
fread and fwrite use size_t, not int
2019-12-27 13:08:26 -05:00
Alam Ed Arias
7201e165a4
we only need link on unix systems
2019-12-27 13:05:15 -05:00
MascaraSnake
e673833780
Merge branch 'why-inline' into 'master'
...
I got a compiler warning from P_PlayerHitsPlayer being too big
See merge request STJr/SRB2!581
2019-12-27 02:12:01 -05:00
Jaime Passos
518714a51a
Fix sprite rotation crashes.
2019-12-27 00:37:40 -03:00
