Commit graph

9152 commits

Author SHA1 Message Date
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
James R 48c83be89e Merge branch 'respawndelaygametyperule' into 'next'
Gametype ruleset changes

See merge request STJr/SRB2!585
2020-01-01 17:49:53 -05:00
Jaime Passos 874d4d01ee Don't Y-billboard papersprite models (?!?!??!??!?!?) 2020-01-01 18:00:01 -03:00
Jaime Passos 03d4082f21 Rename functions 2020-01-01 17:46:26 -03:00
Jaime Passos c7794d4ce0 Remove unused parameter 2020-01-01 17:36:55 -03:00
Jaime Passos 6d2f2e0865 Update copyrights 2020-01-01 17:30:07 -03:00
Jaime Passos 401c35b407 Fix transparent PNG conversion 2020-01-01 17:28:22 -03:00
Zachary McAlpin 7123abd493 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2020-01-01 13:31:07 -06:00
Alam Ed Arias af57468e68 Merge branch 'master' into next 2020-01-01 14:29:30 -05:00
Jaime Passos 98b7d8aaca Fix broken model light lists in ACZ3 2020-01-01 15:55:18 -03:00
Jaime Passos 35ff383a4a Rename `seenplayer to seenfriend` 2020-01-01 15:17:29 -03:00
lachwright dc7f10e17d Allow 6-letter character names to be drawn with the thick font 2020-01-01 23:49:29 +08:00
MascaraSnake 4f26a8e73a 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 9cda82d896 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 6724b11c36 Whoops 2020-01-01 15:11:39 +01:00
MascaraSnake a41c640559 Move shared parts of sidedef initialization into P_InitializeSidedef 2020-01-01 15:10:41 +01:00
MascaraSnake fe198b8a32 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 b59532bcca Setup repeatcnt in P_LoadSidedefs instead of P_ProcessLinedefsWithSidedefs, since UDMF can set it directly 2020-01-01 14:13:24 +01:00
MascaraSnake 24d68ba07e 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 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 2728536589 Merge branch 'revert-09798876' 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 b41cd59e51 Revert "Merge branch 'software-clownery' into 'master'"
This reverts merge request !578
2019-12-31 23:40:17 +00:00
Tatsuru caf47019ce Or is it better like this? 2019-12-31 20:20:30 -03:00
Nami ef4840555e Add MobjLineCollide hook 2019-12-31 15:17:02 -08:00
Tatsuru 83467a7b3d The dumbass forgot NiGHTS mode is also a carry power 2019-12-31 20:13:16 -03:00
Tatsuru 6e330348bc Fix MP Special Stages crashing if a player is being carried when it ends 2019-12-31 19:38:11 -03:00
James R 2a9a3b9760 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 f77188ef0f 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 0cb76f63b7 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 bd0deea11c 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 c460775cd7 Merge branch 'fixcoronalist' into 'master'
Fix broken corona list

See merge request STJr/SRB2!605
2019-12-31 14:25:49 -05:00
fickleheart b22de48c03 Merge branch 'next' into next-newcontrols
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2019-12-31 12:58:36 -06: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
Jaime Passos 1c048275da **NEW!** hook_SeenPlayer 2019-12-31 14:37:45 -03:00
Jaime Passos cd1cc9a222 Fix desynch 2019-12-31 14:00:25 -03:00
Tatsuru 79f18a3c19 Got rid of the uhh 2019-12-31 11:19:54 -03:00
lachwright e5e96cb271 Make elemental crop circle flames obey player gravity 2019-12-31 18:06:40 +08:00
lachwright 10b71d40b8 Make Metal Sonic's jet fume opaque when re-emerging from water 2019-12-31 17:26:35 +08:00
lachwright 342d80198c Add missed semicolon, oops 2019-12-31 16:55:36 +08:00
lachwright 1a78b3548c Remove flight indicator on death as well 2019-12-31 16:54:52 +08:00
lachwright d3c56cd807 Remove flight indicator when AI Tails is taken over by second player 2019-12-31 16:48:29 +08:00
James R 939814d479 Merge remote-tracking branch 'origin/master' into next 2019-12-30 22:37:24 -08:00
James R 3112dff345 Merge branch 'oops' into 'next'
Fix unknown gametype for map command crashing the game

See merge request STJr/SRB2!606
2019-12-31 01:34:39 -05:00
James R 34687e85d7 Merge branch 'emeraldhunt-fix' into 'next'
Fix emerald hunt not working properly

See merge request STJr/SRB2!593
2019-12-31 01:34:17 -05:00
James R b5df2d5c3f Merge branch 'polyobj-waypoint-thinker-optimise' into 'next'
Polyobj waypoint thinker optimise

See merge request STJr/SRB2!586
2019-12-31 01:33:01 -05:00
James R 4b91e49bf4 Merge branch 'fix-lua-scorechains' into 'next'
Fix scoreadd not doing anything in certain cases when modified by Lua

See merge request STJr/SRB2!579
2019-12-31 01:32:22 -05:00
James R 077c453e33 Merge branch 'dashmode-ctf-monitors' into 'next'
Don't let Metal pop the enemy team's monitors (closes #94)

See merge request STJr/SRB2!584
2019-12-31 01:31:55 -05:00
James R 8e61b1003a Merge branch 'dashspeed-fix' into 'next'
Cap dashspeed between mindash and maxdash before revving.

See merge request STJr/SRB2!565
2019-12-31 01:31:43 -05:00
James R b4ebb01e2d Truncate gametype name in server list if it's too long 2019-12-30 22:23:19 -08:00