Commit graph

9266 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
Zachary McAlpin
e16dcb3609 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 17:39:13 -06:00
James R
b342301373 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:39:05 -08:00
Louis-Antoine
d4a2483c3e Grab mouse on game startup 2020-01-02 00:38:43 +01:00
MascaraSnake
14207f3297 P_LoadExtendedSubsectorsAndSegs: Slightly simplify the seg vertex reading code 2020-01-02 00:32:29 +01:00
Zachary McAlpin
7c0021aaac Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 17:11:19 -06:00
James R
2edea99c31 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
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
MascaraSnake
edb5cc7f97 P_LoadTextmap: Bail out if certain mandatory fields are not set 2020-01-01 23:52:30 +01: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
James R
75514def83 Merge branch 'respawndelaygametyperule' into 'next'
Gametype ruleset changes

See merge request STJr/SRB2!585
2020-01-01 17:49:53 -05:00
Jaime Passos
c32e481689 Don't Y-billboard papersprite models (?!?!??!??!?!?) 2020-01-01 18:00:01 -03:00
Jaime Passos
be2afe1e85 Rename functions 2020-01-01 17:46:26 -03:00
Jaime Passos
4630b8615c Remove unused parameter 2020-01-01 17:36:55 -03:00
Jaime Passos
c7db80a6fd Update copyrights 2020-01-01 17:30:07 -03:00
Jaime Passos
372bfe39f6 Fix transparent PNG conversion 2020-01-01 17:28:22 -03:00
Zachary McAlpin
7402797a2e Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 13:31:07 -06:00
Alam Ed Arias
be11a1d249 Merge branch 'master' into next 2020-01-01 14:29:30 -05:00
Jaime Passos
7f178d3bb7 Fix broken model light lists in ACZ3 2020-01-01 15:55:18 -03:00
Jaime Passos
0ab6fe1fd8 Rename `seenplayer to seenfriend` 2020-01-01 15:17:29 -03:00
lachwright
5df1de42b5 Allow 6-letter character names to be drawn with the thick font 2020-01-01 23:49:29 +08:00
MascaraSnake
4a5c550488 Move MAXFLATSIZE define to p_spec.h so p_spec.c doesn't have to redefine it 2020-01-01 16:01:07 +01:00
MascaraSnake
97c54bc5f0 Rework textmap parser to always read a parameter's value, even if it doesn't recognize the parameter 2020-01-01 15:52:59 +01:00
MascaraSnake
0ac318cd78 Whoops 2020-01-01 15:11:39 +01:00
MascaraSnake
9da0b78666 Move shared parts of sidedef initialization into P_InitializeSidedef 2020-01-01 15:10:41 +01:00
MascaraSnake
699de06c05 Check if certain mandatory linedef and sidedef fields are set, and use fallback values if not 2020-01-01 14:27:01 +01:00
MascaraSnake
3fc9749316 Setup repeatcnt in P_LoadSidedefs instead of P_ProcessLinedefsWithSidedefs, since UDMF can set it directly 2020-01-01 14:13:24 +01:00
MascaraSnake
b425f913f2 P_LoadTextmap: Set defaults for all linedef and sidedef fields that UDMF is allowed to set 2020-01-01 13:40:17 +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
Tatsuru
dda18dd080 Or is it better like this? 2019-12-31 20:20:30 -03:00
Nami
9219699b42 Add MobjLineCollide hook 2019-12-31 15:17:02 -08:00
Tatsuru
df9809f3d7 The dumbass forgot NiGHTS mode is also a carry power 2019-12-31 20:13:16 -03:00
Tatsuru
402b58ce42 Fix MP Special Stages crashing if a player is being carried when it ends 2019-12-31 19:38:11 -03:00
James R
d7fb3698fe Merge branch 'fix-flight-indicator' into 'next'
Remove flight indicator when AI Tails is taken over by second player

See merge request STJr/SRB2!611
2019-12-31 17:17:21 -05:00
James R
54bcde1376 Merge branch 'metal-fume-opacity' into 'next'
Make Metal Sonic's jet fume opaque when re-emerging from water

See merge request STJr/SRB2!612
2019-12-31 17:16:14 -05:00
James R
fa54d3359f Merge branch 'firefuck3' into 'next'
Make elemental crop circle flames obey player gravity

See merge request STJr/SRB2!613
2019-12-31 17:15:45 -05:00
James R
d2651ef092 Merge branch 'minecartspawner-fix' into 'next'
Disable minecart spawners for players already riding a minecart

See merge request STJr/SRB2!608
2019-12-31 17:15:18 -05: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
fickleheart
77ba835f4f Merge branch 'next' into next-newcontrols
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2019-12-31 12:58:36 -06: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
Jaime Passos
a811021112 **NEW!** hook_SeenPlayer 2019-12-31 14:37:45 -03:00
fickleheart
1419ec72d5 Software FOV ported from kart
also fixes high software FOVs having buggy walls
2019-12-31 11:22:05 -06:00
Jaime Passos
77d6601e8b Fix desynch 2019-12-31 14:00:25 -03:00
Tatsuru
24e4552d5b Got rid of the uhh 2019-12-31 11:19:54 -03:00
lachwright
b575e7ab47 Make elemental crop circle flames obey player gravity 2019-12-31 18:06:40 +08:00
lachwright
8132905436 Make Metal Sonic's jet fume opaque when re-emerging from water 2019-12-31 17:26:35 +08:00