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
MascaraSnake
25219b614e
Implement "Make FOF quicksand" linedef type
2020-05-02 22:07:42 +02:00
MascaraSnake
1693689305
Implement "make FOF bustable" linedef type
2020-05-02 21:50:49 +02:00
MascaraSnake
1f041496c7
Store bustable FOF data directly in ffloor_t instead of referring to master line
2020-05-02 21:19:55 +02:00
MascaraSnake
be92ed7091
UDB config fix
2020-05-02 20:24:17 +02:00
MascaraSnake
245d5be047
Merge branch 'movement-refactor' into udmf-fofs-mkii
...
# Conflicts:
# src/p_mobj.c
# src/p_user.c
2020-05-02 19:05:48 +02: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
21eccc15d8
Bustable blocks: Forgot to adapt linedef executor triggering for pushables
2020-05-02 14:51:03 +02:00
MascaraSnake
4dd25721f6
Merge branch 'movement-refactor' into udmf-fofs-mkii
2020-05-02 14:29:10 +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
538c81676b
Recognize ML_EFFECT1 and ML_EFFECT2 on crumbling FOFs
2020-05-02 10:40:35 +02:00
MascaraSnake
312a2def3d
Implement "add laser thinker to FOF" linedef type
2020-05-02 10:30:21 +02:00
MascaraSnake
1ae797359e
Merge branch 'fof-cleanup' into udmf-fofs-mkii
...
# Conflicts:
# src/p_spec.c
2020-05-02 10:24:40 +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
MascaraSnake
3b0fc857c8
UDB config fix
2020-05-01 19:43:44 +02:00
MascaraSnake
7000c203a2
Implement "add thwomp thinker to FOF" linedef type
2020-05-01 19:41:52 +02:00
MascaraSnake
cada0d2928
Implement "add airbob thinker to FOF" linedef type
2020-05-01 19:29:19 +02:00
MascaraSnake
d7363ff87a
Implement linedef type that adds a raise thinker to an FOF
2020-05-01 19:07:29 +02:00
MascaraSnake
f2011cc99b
More config fixes
2020-05-01 14:59:08 +02:00
MascaraSnake
3a05d7b333
Fix ZB config typo
2020-05-01 14:55:20 +02:00
Zipper
dd645d88ea
Update p_user.c
2020-05-01 08:25:37 -04:00
MascaraSnake
f3360bd373
Merge branch 'udmf-next' into udmf-fofs-mkii
...
# Conflicts:
# src/p_floor.c
# src/p_spec.c
2020-05-01 14:02:48 +02:00
MascaraSnake
5c8b50ca8b
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_saveg.c
# src/p_slopes.c
# src/p_spec.c
2020-05-01 12:44:39 +02: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
