lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8963 commits 1 branch 29 tags 122 MiB
Commit graph

8963 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R 12e87d58b4 Merge branch 'findvar' into 'next' 
CV_FindVar for Lua

See merge request STJr/SRB2!583
 2020-01-02 20:54:16 -05: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
James R 658b8dcfa9 Use GCC 8.1 for x86_64 2020-01-02 15:45:13 -08: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
James R 945f50c273 Remove Direct Draw from AppVeyor config 2020-01-02 14:58:09 -08:00
MascaraSnake dc0c17dbb8 P_LoadExtendedSubsectorsAndSegs: Print size_t with %s 2020-01-02 22:28:32 +01:00
Louis-Antoine e0e5e83869 Revert "Ungrab mouse when watching a record" 
This reverts commit 17636ccc01.
 2020-01-02 20:29:51 +01:00
MascaraSnake 5ba179ad7c Fix two bugs in extended segs loading, and add some error checking while I'm at it 2020-01-02 09:51:07 +01:00
Nami ad610ba4aa Move MobjLineCollide up a bit to where we first know for sure that we hit a line 2020-01-01 19:38:48 -08:00
James R 9931f0d58f Merge branch 'thiccnames' into 'next' 
Allow 6-letter character names to be drawn with the thick font

See merge request STJr/SRB2!618
 2020-01-01 21:49:13 -05:00
James R 69dd8acf7f Merge branch 'sstailscarry-fix' into 'next' 
Fix MP Special Stages crashing if a player is being carried when it ends

See merge request STJr/SRB2!615
 2020-01-01 21:49:01 -05:00
James R 99f020adb6 Merge branch 'sound-slots' into 'next' 
Add slots for unused sounds and remove unused sound slots

See merge request STJr/SRB2!603
 2020-01-01 21:48:46 -05:00
James R a358702700 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:53:18 -08: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
James R 0c40a466d8 Merge remote-tracking branch 'origin/master' into next 2020-01-01 15:39:05 -08:00
Louis-Antoine 62397a36ec Grab mouse on game startup 2020-01-02 00:38:43 +01:00
MascaraSnake 02acf6222b P_LoadExtendedSubsectorsAndSegs: Slightly simplify the seg vertex reading code 2020-01-02 00:32:29 +01:00
James R 85fbf4f571 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 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
MascaraSnake 2da9c3cf81 P_LoadTextmap: Bail out if certain mandatory fields are not set 2020-01-01 23:52:30 +01: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
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
Alam Ed Arias af57468e68 Merge branch 'master' into next 2020-01-01 14:29:30 -05: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