lachwright
d9f4772fbc
Fix false comment
2019-10-03 02:31:32 +08:00
MascaraSnake
b38bd1a078
Lava is now either completely solid or completely intangible. No more half-assing
2019-10-01 21:58:18 +02:00
MascaraSnake
002e45ee53
Made solid lava walls damaging
2019-10-01 21:17:33 +02:00
MascaraSnake
4c0628b6bb
Fixed a bug with the ring lava melting
2019-09-29 23:22:38 +02:00
MascaraSnake
83b32eacbe
Lava now melts rings!
2019-09-29 23:11:21 +02:00
MascaraSnake
c1d06a1b49
Pterabytes can now swoop you off a rollout rock
2019-09-29 22:13:10 +02:00
lachwright
41cc52ce25
Resolve merge conflicts
2019-09-30 03:07:03 +08:00
lachwright
4a47b66990
(Hopefully) cover all cases for resetting rock usability
2019-09-30 03:05:08 +08:00
MascaraSnake
4c6a4b76cc
Pterabyte: Don't drop off player in the first ten tics after grabbing
2019-09-29 19:51:27 +02:00
MascaraSnake
b169ff93d4
Pterabyte: Don't target players who are invincible after being hurt
2019-09-29 19:29:34 +02:00
MascaraSnake
ca9fdd4f0e
Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
# src/p_map.c
# src/p_user.c
2019-09-29 18:49:53 +02:00
MascaraSnake
309d26069f
Implemented the Pterabyte grabbing mechanic
2019-09-29 18:42:17 +02:00
lachwright
7cf2328e62
Remove unused locals
2019-09-29 21:29:37 +08:00
lachwright
949ef287b7
Resolve merge conflicts
2019-09-29 20:29:49 +08:00
lachwright
f67ef441b3
Hardcode pumice ball
...
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 20:18:40 +08:00
MascaraSnake
017d29ff76
Don't make the Pterabyte radius adjustable (doesn't work correctly right now)
2019-09-29 11:58:33 +02:00
MascaraSnake
c4f1085f02
Hardcoded the Pterabyte (without the grabbing mechanic)
2019-09-29 10:39:09 +02:00
MascaraSnake
04a470a117
Pyre Fly: Use MF2_BOSSNOTRAP instead of MF2_AMBUSH
2019-08-31 12:53:55 +02:00
MascaraSnake
3eb5324a88
Pyre Fly: Don't spawn smoke and flames if no player is in range
2019-08-30 09:05:49 +02:00
MascaraSnake
751a050d6f
Pyre Fly: Don't run the fuse code when dead
2019-08-30 08:55:29 +02:00
MascaraSnake
0ed20a2a39
Hardcoded the Pyre Fly
2019-08-30 08:17:25 +02:00
MascaraSnake
9e132e0fc1
Simplified the lavafall rock states with FF_RANDOMANIM, fixed Var1 for the FF_ANIMATE states
2019-08-27 19:33:54 +02:00
MascaraSnake
6e575b2c1c
Only spawn lavafall rocks if a player is nearby
2019-08-25 23:43:07 +02:00
MascaraSnake
5c1189ef4d
Added reverse gravity support to lavafalls
2019-08-25 23:31:12 +02:00
MascaraSnake
b50da9e3e6
Hardcoded the lavafall
2019-08-25 23:05:38 +02:00
MascaraSnake
696911e63e
Rejig the thing type numbers
2019-08-25 20:01:08 +02:00
MascaraSnake
b78ef0f666
Hardcoded the RVZ scenery
2019-08-25 12:40:32 +02:00
Monster Iestyn
5035443dc8
Merge branch 'gfz_boss_rework' into 'master'
...
GFZ boss rework + boss explosion fun
See merge request STJr/SRB2Internal!290
2019-08-22 11:27:24 -04:00
Monster Iestyn
7be7d86ff5
Added quick validity checks for three linedef executor specials that require a player mobj to be the triggerer (432, 434 and 437)
2019-08-20 20:31:28 +01:00
Monster Iestyn
ebfa40c004
Merge branch 'mi-cleanup-returns' into 'master'
...
MI cleanup returns
See merge request STJr/SRB2Internal!292
2019-08-20 09:35:36 -04:00
Monster Iestyn
6f9fbd0ddf
Merge branch 'landingbetter' into 'master'
...
Fix all our landing woes. (For now.)
See merge request STJr/SRB2Internal!289
2019-08-20 09:28:40 -04:00
Monster Iestyn
31c5917347
Remove references to old console ports that slipped in from the 2.1 source code a while back
2019-08-20 14:13:38 +01:00
Monster Iestyn
0b6a463cff
Merge branch 'public_next'
...
# Conflicts:
# src/config.h.in
# src/d_clisrv.c
# src/d_netcmd.c
# src/doomdef.h
# src/p_map.c
# src/p_maputl.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-08-20 13:54:48 +01:00
Monster Iestyn
4f12b4dfed
Merge branch '2.1.25-prep' into 'next'
...
Update version to 2.1.25
See merge request STJr/SRB2!507
2019-08-17 14:07:04 -04:00
Monster Iestyn
42eaa1ed39
Merge branch 'netcode-exploits' into 'next'
...
Fix an exploit where players could steal the final hash of a login
See merge request STJr/SRB2!508
2019-08-17 14:05:20 -04:00
James R
abf06098da
Include md5.h
2019-08-17 10:34:19 -07:00
James R
f335519007
Remove a printf
2019-08-17 10:33:33 -07:00
James R
f69983c010
Kart discrepancies
2019-08-17 10:33:14 -07:00
Monster Iestyn
361332b888
Update MD5 for patch.dta
2019-08-17 18:15:23 +01:00
Monster Iestyn
fcc2a8014c
Disable the level end music fade code for now, because we discovered it causes freezes sometimes.
2019-08-16 23:19:43 +01:00
Monster Iestyn
a20079e410
Update version to 2.1.25
2019-08-16 20:14:01 +01:00
Monster Iestyn
8106370fe7
Merge branch 'polyobj-crush-fix-mi' into 'next'
...
PolyObject crush hotfix
See merge request STJr/SRB2!506
2019-08-16 12:04:56 -04:00
Monster Iestyn
f993d74e63
Use P_MobjInsidePolyobj instead of P_MobjTouchingPolyobj, so that you can be crushed by the polyobject's middle rather than just its edges
2019-08-16 14:54:01 +01:00
Monster Iestyn
41dec6e220
Merge branch 'polyobj-fixes-backport' into 'next'
...
PolyObject fixes backport
See merge request STJr/SRB2!505
2019-08-15 13:51:46 -04:00
Monster Iestyn
bd0bd153a7
Make the various carry types' handling code into a switch case
2019-08-15 18:02:30 +01:00
Monster Iestyn
ace2e890c0
split MT_TAILSOVERLAY handling code into a function of its own, since there's so much of it
...
# Conflicts:
# src/p_user.c
2019-08-15 18:02:22 +01:00
Monster Iestyn
9d19883646
After looking at the FOF part of P_LineOpening for a while I now realise many of these variables aren't even necessary, so I removed them all.
...
(Naturally I did the same to the camera equivalent)
# Conflicts:
# src/p_maputl.c
2019-08-15 14:30:10 +01:00
Monster Iestyn
c1ff9f8c64
Edit a lot of the rest of the polyobject-related code in P_LineOpening to make more sense and be more optimised.
...
* If you collide with a line belonging to a polyobject, you should NEVER have to care about any FOFs that might be present in either sector of the linedef. This could lead to colliding with ghostly FOFs that aren't actually there or something dumb, if someone decided to give either of the polyobject's control sectors FOFs for some reason. We don't want that, obviously.
* Polyobjects without POF_CLIPPLANE apparently are supposed to have a top and bottom "physical" height of value INT32_MAX and _MIN respectively, according to P_CheckPosition ...let's be consistent with this.
* Finally, there is no more need for that back = front nonsense hack anymore with my changes made.
# Conflicts:
# src/p_maputl.c
2019-08-15 14:28:06 +01:00
Monster Iestyn
4d3057ff7a
P_LineOpening: set int32 max/min as defaults for opentop, openbottom etc if a linedef you touched belongs to a polyobjetc. the only thing that really matters in this scenario is the polyobject itself after all!
...
# Conflicts:
# src/p_maputl.c
2019-08-15 14:25:02 +01:00
Monster Iestyn
845b657ac1
Remove commented out P_CheckSector calls and add extra comments explaining the situation
2019-08-15 14:21:19 +01:00
