Commit graph

8486 commits

Author SHA1 Message Date
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
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
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
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
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
Jaime Passos
b8e91a50a5 OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos
252ac7516a Merge branch 'renderswitch' of https://git.magicalgirl.moe/STJr/SRB2 into renderswitch 2019-12-26 23:53:03 -03:00
Jaime Passos
543f80510b And the sound test 2019-12-26 23:52:42 -03:00
Jaime Passos
ed11e89fdc Same deal, but for the level platter and save select screen 2019-12-26 23:49:31 -03:00
James R
02104402ed Save the renderer 2019-12-26 18:44:02 -08:00
James R
8311380146 Merge branch 'time' into 'master'
haha log files

See merge request STJr/SRB2!567
2019-12-26 21:43:46 -05:00
Jaime Passos
6de7b7eb99 Handle character select screen correctly after a renderer switch 2019-12-26 23:39:40 -03:00
Jaime Passos
a5ef201e3f PU_PATCH funny 2019-12-26 23:26:43 -03:00
James R
d57083264e One more optimization 2019-12-26 18:23:01 -08:00
James R
bbed1a16ba e 2019-12-26 18:20:48 -08:00
James R
e3d08831f2 Make cv_renderer CV_NOLUA instead of hidden!!! 2019-12-26 18:15:52 -08:00
James R
4100e43a9d CV_NOLUA for when a cvar should not be changed via Lua 2019-12-26 18:15:19 -08:00
James R
43dab49e74 A system to encode flags in the command buffer 2019-12-26 18:12:10 -08:00
James R
bd472eb353 Merge branch 'turnmultiplier' into 'master'
Option to increase the turning speed

See merge request STJr/SRB2!553
2019-12-26 18:18:23 -05:00
James R
2c93621d5c P_PlayerHitsPlayer is too big for inline, and these other functions are getting there 2019-12-26 14:59:31 -08:00
Jaime Passos
b90236281c Rename R_WorldSegTextured 2019-12-26 18:13:03 -03:00
Jaime Passos
96980749ac Masked stuff 2019-12-26 17:39:18 -03:00
Jaime Passos
51e51dfa4c I forgot a `static` 2019-12-26 17:20:17 -03:00
Jaime Passos
1ac4b608dc Thick stuff. Hoping I didn't break anything. 2019-12-26 17:15:30 -03:00
Jaime Passos
c8f9896e2d struct time 2019-12-26 16:25:04 -03:00
Jaime Passos
9b68e48923 Move all the thick/masked/splat stuff to the end of the file 2019-12-26 15:34:33 -03:00
Jaime Passos
08ab0664f5 ifdef this right so it works like before without the define 2019-12-26 15:27:16 -03:00