MascaraSnake
96ae5dda22
Merge branch 'remove-polyobjects' into 'next'
...
Delete polyobjects
See merge request STJr/SRB2!911
2020-05-02 09:53:37 -04:00
MascaraSnake
c4190f2d3f
Refactor P_CheckBustableBlocks
2020-05-02 15:50:18 +02:00
MascaraSnake
4e6a0c0ae9
Revert some very incorrect refactoring
2020-05-02 15:33:15 +02:00
MascaraSnake
5a6d3753c0
Refactor P_PushableCheckBustables
2020-05-02 15:30:56 +02:00
MascaraSnake
0f16d55384
Some minor PTR_GlideClimbTraverse cleanup
2020-05-02 15:25:19 +02:00
MascaraSnake
40459adbb5
Refactor PTR_SlideTraverse
2020-05-02 15:21:53 +02:00
MascaraSnake
cd9f6a2b7e
P_PlayerZMovement: Move PolyObject handling code into its own function
2020-05-02 13:49:16 +02:00
MascaraSnake
1cee43f945
Merge branch 'remove-polyobjects' into movement-refactor
2020-05-02 13:37:13 +02:00
MascaraSnake
147a1a8a0a
P_PlayerZMovement: Move checks for Mario blocks into their own function
2020-05-02 13:34:24 +02:00
MascaraSnake
1929b62133
P_PlayerMobjThinker: Move check for floatbob platforms into its own function
2020-05-02 13:08:13 +02:00
MascaraSnake
d037a12e54
P_PlayerMobjThinker: Move crumbling platforms check into its own function
2020-05-02 12:50:09 +02:00
MascaraSnake
8efec04051
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
MascaraSnake
58508e199d
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
b9c5f65cbf
Clean up Thwomp spawning code
2020-05-02 09:15:34 +02:00
Zipper
d6511190fd
Update p_user.c
2020-05-01 08:25:37 -04:00
MascaraSnake
238513ffd6
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
e967c32a10
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
d295996d88
Merge branch 'elevator-cleanup' into 'next'
...
elevator_t cleanup
See merge request STJr/SRB2!896
2020-05-01 05:46:37 -04:00
MascaraSnake
5cf3fd0074
Merge branch 'next' into elevator-cleanup
...
# Conflicts:
# src/p_saveg.c
2020-05-01 11:42:05 +02:00
MascaraSnake
2973b79715
Remove bogus comments from p_saveg.c
2020-05-01 11:25:32 +02:00
LJ Sonic
2c74085826
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
1568114d13
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
d780d82ba8
Restore jump-related pflags properly during twinspin
2020-05-01 06:34:30 +08:00
Monster Iestyn
a96f0a0df3
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
405d5e1fc6
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
5287303a5e
More HWR_ProcessSeg sky code from master
2020-04-30 19:57:28 +03:00
Hannu Hanhi
e3edf5e3a2
HWR_ProcessSeg skywall processing from master
2020-04-30 19:57:15 +03:00
Monster Iestyn
edfbd799db
Merge branch 'next' into netarchive-cleanup
2020-04-29 15:27:07 +01:00
Monster Iestyn
0ab7d0b4b5
Don't discard const, added missing &
2020-04-29 15:24:28 +01:00
Monster Iestyn
5f3a827609
Whoops the third
2020-04-29 14:45:52 +01:00
Louis-Antoine
4130a30008
Revert "Replace a few instance of strncpy with strlcpy"
...
This reverts commit b03e0d1289
2020-04-29 10:55:49 +02:00
Zachary McAlpin
ebadb85e00
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-28 18:31:15 -05:00
Louis-Antoine
1f830836ba
Optimise number archiving
2020-04-28 23:12:02 +02:00
Louis-Antoine
9ce73e9790
Optimise boolean archiving
2020-04-28 23:11:28 +02:00
Louis-Antoine
6ec3ec4933
Optimise string archiving and allow for longer strings
2020-04-28 22:19:44 +02:00
LJ Sonic
355912cf35
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
0540548a98
Update sound and closed captions in connection screen
2020-04-28 00:37:58 +02:00
Louis-Antoine
829bb84b5e
Minor adjustements in Snake minigame
2020-04-27 23:15:18 +02:00
Louis-Antoine
1c78e9cdfb
Add bonuses and maluses to Snake minigame
2020-04-27 23:10:13 +02:00
Louis-Antoine
3ab29047bd
Add pause and retry to Snake minigame
2020-04-27 22:06:32 +02:00
SteelT
e60e115e5c
Merge branch 'shaders-optimizations' into 'sal-oglshaderport'
...
Shader optimizations
See merge request STJr/SRB2!893
2020-04-27 15:19:09 -04:00
MascaraSnake
34c379b479
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
0bdf93e48d
Add a background to Snake minigame
2020-04-27 15:31:38 +02:00
MascaraSnake
8e5646d708
Replace P_FindLineFromLineTag with P_FindLineFromTag
2020-04-27 14:34:42 +02:00
MascaraSnake
c2cf8d57d0
Remove P_FindSectorFromLineTag
2020-04-27 14:31:37 +02:00
Louis-Antoine
41253ee689
Call rand() a few times after calling srand()
2020-04-27 14:22:45 +02:00
MascaraSnake
398ee65646
Store "no bosses" setting for lasers in thinker instead of checking sourceline.
2020-04-27 13:09:57 +02:00
MascaraSnake
0dbcd8766b
Pass thwomp settings to P_AddThwompThinker
2020-04-27 13:01:31 +02:00
Louis-Antoine
3c43515cbd
Use sprites for snake and apple
2020-04-27 13:01:14 +02:00
MascaraSnake
40d0fb714d
Store tag instead of sourceline in raise thinker
2020-04-27 12:54:08 +02:00
