Commit graph

10315 commits

Author SHA1 Message Date
Hannu Hanhi 724e093ce8 Render stats cleanup 2020-05-02 23:14:08 +03:00
Hannu Hanhi 7e8543a408 More render stats for software mode, renamed and relocated some render stats variables 2020-05-02 23:13:53 +03:00
Hannu Hanhi 8dcc2fe20d Move some render stats variables to better locations, add I_FinishUpdate timing 2020-05-02 23:13:32 +03:00
Hannu Hanhi 64a153fdee Render stats 2020-05-02 23:13:08 +03:00
Monster Iestyn 1528f2aef8 Fix drop shadow and rotsprite code to use SHORT() 2020-05-02 17:13:16 +01:00
MascaraSnake d9ed914e14 Merge branch 'amyswings' into 'next'
Restore jump-related pflags properly during twinspin

See merge request STJr/SRB2!908
2020-05-02 10:03:49 -04:00
MascaraSnake b8a9686aaf Merge branch 'remove-polyobjects' into 'next'
Delete polyobjects

See merge request STJr/SRB2!911
2020-05-02 09:53:37 -04:00
MascaraSnake 452fd100b8 Refactor P_CheckBustableBlocks 2020-05-02 15:50:18 +02:00
MascaraSnake 122104815a Revert some very incorrect refactoring 2020-05-02 15:33:15 +02:00
MascaraSnake ddb4c2c97f Refactor P_PushableCheckBustables 2020-05-02 15:30:56 +02:00
MascaraSnake bc2d0dcea6 Some minor PTR_GlideClimbTraverse cleanup 2020-05-02 15:25:19 +02:00
MascaraSnake 929064b998 Refactor PTR_SlideTraverse 2020-05-02 15:21:53 +02:00
MascaraSnake a67c8786ae P_PlayerZMovement: Move PolyObject handling code into its own function 2020-05-02 13:49:16 +02:00
MascaraSnake 29192eff9a Merge branch 'remove-polyobjects' into movement-refactor 2020-05-02 13:37:13 +02:00
MascaraSnake afc6378868 P_PlayerZMovement: Move checks for Mario blocks into their own function 2020-05-02 13:34:24 +02:00
MascaraSnake 2605f29bd4 P_PlayerMobjThinker: Move check for floatbob platforms into its own function 2020-05-02 13:08:13 +02:00
MascaraSnake 19d77bfc53 P_PlayerMobjThinker: Move crumbling platforms check into its own function 2020-05-02 12:50:09 +02:00
MascaraSnake 485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
MascaraSnake 2a39265156 Make the laser thinker find the FOF itself instead of storing it in the thinker struct 2020-05-02 10:03:16 +02:00
MascaraSnake c1304e019d Clean up Thwomp spawning code 2020-05-02 09:15:34 +02:00
Zipper dd645d88ea Update p_user.c 2020-05-01 08:25:37 -04:00
MascaraSnake 2449c66b78 Merge branch 'find-sector-from-tag' into 'next'
Remove P_FindSectorFromLineTag and P_FindLineFromLineTag

See merge request STJr/SRB2!901
2020-05-01 05:49:52 -04:00
MascaraSnake 7922306113 Merge branch 'more-thinker-refactor' into 'next'
More thinker refactoring

See merge request STJr/SRB2!900
2020-05-01 05:47:14 -04:00
MascaraSnake 9029422311 Merge branch 'elevator-cleanup' into 'next'
elevator_t cleanup

See merge request STJr/SRB2!896
2020-05-01 05:46:37 -04:00
MascaraSnake 790affd13b Merge branch 'next' into elevator-cleanup
# Conflicts:
#	src/p_saveg.c
2020-05-01 11:42:05 +02:00
MascaraSnake be0959fa90 Remove bogus comments from p_saveg.c 2020-05-01 11:25:32 +02:00
LJ Sonic ef5f8f3bd2 Merge branch 'join-delay' into 'next'
Add a minimum delay between connections

See merge request STJr/SRB2!889
2020-05-01 03:29:15 -04:00
lachwright 165b6c2435 Dashmode fixes:
- Don't force the player's default normalspeed and jumpfactor while not in dashmode
- Properly trim the fuse for followmobj ghosts spawned during dashmode
- Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 08:26:23 +08:00
lachwright f9b831c00b Restore jump-related pflags properly during twinspin 2020-05-01 06:34:30 +08:00
Monster Iestyn 279ad0707e Merge branch 'strncpy-brullshit' into 'next'
Fix a few strncpy bullshit

See merge request STJr/SRB2!895
2020-04-30 14:53:46 -04:00
Monster Iestyn c49a170888 Merge branch 'netarchive-cleanup' into 'next'
Netgame $$$.sav code cleanup

See merge request STJr/SRB2!894
2020-04-30 14:53:22 -04:00
Hannu Hanhi be99670a39 More HWR_ProcessSeg sky code from master 2020-04-30 19:57:28 +03:00
Hannu Hanhi ff8f48647b HWR_ProcessSeg skywall processing from master 2020-04-30 19:57:15 +03:00
Monster Iestyn 0d3876abf3 Merge branch 'next' into netarchive-cleanup 2020-04-29 15:27:07 +01:00
Monster Iestyn 2f0bf3860f Don't discard const, added missing & 2020-04-29 15:24:28 +01:00
Monster Iestyn d89d2505bb Whoops the third 2020-04-29 14:45:52 +01:00
Louis-Antoine 9b3917cd72 Revert "Replace a few instance of strncpy with strlcpy"
This reverts commit 2e27f32d3e.
2020-04-29 10:55:49 +02:00
Louis-Antoine ae05f11c45 Optimise number archiving 2020-04-28 23:12:02 +02:00
Louis-Antoine 3e8fb8db25 Optimise boolean archiving 2020-04-28 23:11:28 +02:00
Louis-Antoine 2e3c110534 Optimise string archiving and allow for longer strings 2020-04-28 22:19:44 +02:00
LJ Sonic 5c16e33432 Merge branch 'fix-intermission-mouse' into 'next'
Fix mouse being grabbed in intermission and cutscenes

See merge request STJr/SRB2!891
2020-04-28 04:25:32 -04:00
Louis-Antoine 752b48de3a Update sound and closed captions in connection screen 2020-04-28 00:37:58 +02:00
Louis-Antoine 231a835bf6 Minor adjustements in Snake minigame 2020-04-27 23:15:18 +02:00
Louis-Antoine dfdace22bb Add bonuses and maluses to Snake minigame 2020-04-27 23:10:13 +02:00
Louis-Antoine a3dcc100c0 Add pause and retry to Snake minigame 2020-04-27 22:06:32 +02:00
SteelT 7c583b4c16 Merge branch 'shaders-optimizations' into 'sal-oglshaderport'
Shader optimizations

See merge request STJr/SRB2!893
2020-04-27 15:19:09 -04:00
MascaraSnake df692645c4 Merge branch 'raisethinker' into 'next'
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)

See merge request STJr/SRB2!899
2020-04-27 15:04:37 -04:00
Louis-Antoine 647d74bad5 Add a background to Snake minigame 2020-04-27 15:31:38 +02:00
MascaraSnake 4cec927bbb Replace P_FindLineFromLineTag with P_FindLineFromTag 2020-04-27 14:34:42 +02:00
MascaraSnake 0a0812bc57 Remove P_FindSectorFromLineTag 2020-04-27 14:31:37 +02:00