6813 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
MascaraSnake	ce5d0691ac	Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode	2019-10-07 19:12:03 +02:00
MascaraSnake	8062422f13	Fixed wrong sound being played by Pyreflies with Ambush	2019-10-07 19:11:36 +02:00
lachwright	3412eb655a	Colorize non-buoyant rollout rocks (MF2_AMBUSH distinguishability)	2019-10-07 22:51:13 +08:00
lachwright	77dd5260ab	Allow rock to disappear if unridden for 12 seconds	2019-10-07 22:22:51 +08:00
lachwright	c64997bfe5	Add Ambush and Flip flag behaviors	2019-10-07 20:55:58 +08:00
lachwright	95f6e2008f	Better rollout behavior in lava	2019-10-07 15:25:32 +08:00
lachwright	bfb9bac5bd	Collision polish	2019-10-07 14:51:32 +08:00
lachwright	bed9dff077	Readability changes	2019-10-07 13:36:36 +08:00
lachwright	306779fac0	Readability changes	2019-10-07 13:35:10 +08:00
lachwright	7850d43725	Let ridden rollout rocks collide with other players	2019-10-07 13:14:23 +08:00
lachwright	2d33950590	Merge branch 'rvz-hardcode' of https://git.magicalgirl.moe/STJr/SRB2Internal into rvz-hardcode	2019-10-06 22:12:47 +08:00
MascaraSnake	defffd667e	Fixed and simplified the big fern leaf spawning code	2019-10-06 14:18:27 +02:00
MascaraSnake	17a2d1071c	Spawn big fern leaves relative to angle	2019-10-06 10:30:22 +02:00
MascaraSnake	357baeaa60	Added gravflip support to lavafall, Pyre Fly and Pterabyte	2019-10-05 22:20:48 +02:00
MascaraSnake	a7d6ebd5bd	Lavafall lava also kills rings	2019-10-05 20:37:48 +02:00
MascaraSnake	2f4edc0cb9	Players carried by Pterabyte cannot adjust their angle and are in their falling state	2019-10-05 20:29:47 +02:00
MascaraSnake	b9c3f72112	Grouped MFE_TOUCHLAVA together with the other liquid-related flags	2019-10-05 20:10:07 +02:00
MascaraSnake	16d077fde3	Coins don't melt in lava and lavafalls have displayoffset 1	2019-10-05 20:00:54 +02:00
MascaraSnake	99220ae48b	Fixed a typo	2019-10-05 10:45:24 +02:00
MascaraSnake	cabc4e0294	Implemented lava splish. Feel free to suggest a different "splish" sound.	2019-10-05 10:00:59 +02:00
lachwright	27c9fe5047	Fix false comment	2019-10-03 02:31:32 +08:00
MascaraSnake	5c1fabfaae	Lava is now either completely solid or completely intangible. No more half-assing	2019-10-01 21:58:18 +02:00
MascaraSnake	24e80c9b23	Made solid lava walls damaging	2019-10-01 21:17:33 +02:00
MascaraSnake	d301d2bba4	Fixed a bug with the ring lava melting	2019-09-29 23:22:38 +02:00
MascaraSnake	4375ea8089	Lava now melts rings!	2019-09-29 23:11:21 +02:00
MascaraSnake	3d985c1b9e	Pterabytes can now swoop you off a rollout rock	2019-09-29 22:13:10 +02:00
lachwright	6c0e4a154d	Resolve merge conflicts	2019-09-30 03:07:03 +08:00
lachwright	e57b0f7126	(Hopefully) cover all cases for resetting rock usability	2019-09-30 03:05:08 +08:00
MascaraSnake	cd45bca848	Pterabyte: Don't drop off player in the first ten tics after grabbing	2019-09-29 19:51:27 +02:00
MascaraSnake	c00144a4f8	Pterabyte: Don't target players who are invincible after being hurt	2019-09-29 19:29:34 +02:00
MascaraSnake	9431497f7d	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	26ecab14d7	Implemented the Pterabyte grabbing mechanic	2019-09-29 18:42:17 +02:00
lachwright	60cbc2e6b4	Remove unused locals	2019-09-29 21:29:37 +08:00
lachwright	71603006dc	Resolve merge conflicts	2019-09-29 20:29:49 +08:00
lachwright	8abb6129c1	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	22e3c37e5d	Don't make the Pterabyte radius adjustable (doesn't work correctly right now)	2019-09-29 11:58:33 +02:00
MascaraSnake	598047ae8b	Hardcoded the Pterabyte (without the grabbing mechanic)	2019-09-29 10:39:09 +02:00
MascaraSnake	a5ae8abdb2	Pyre Fly: Use MF2_BOSSNOTRAP instead of MF2_AMBUSH	2019-08-31 12:53:55 +02:00
MascaraSnake	8ddcced6f0	Pyre Fly: Don't spawn smoke and flames if no player is in range	2019-08-30 09:05:49 +02:00
MascaraSnake	4cece9fe36	Pyre Fly: Don't run the fuse code when dead	2019-08-30 08:55:29 +02:00
MascaraSnake	806b106905	Hardcoded the Pyre Fly	2019-08-30 08:17:25 +02:00
MascaraSnake	2933ec3e9c	Simplified the lavafall rock states with FF_RANDOMANIM, fixed Var1 for the FF_ANIMATE states	2019-08-27 19:33:54 +02:00
MascaraSnake	671da01607	Only spawn lavafall rocks if a player is nearby	2019-08-25 23:43:07 +02:00
MascaraSnake	7ca67a8688	Added reverse gravity support to lavafalls	2019-08-25 23:31:12 +02:00
MascaraSnake	50e51c137e	Hardcoded the lavafall	2019-08-25 23:05:38 +02:00
MascaraSnake	57d28c7814	Rejig the thing type numbers	2019-08-25 20:01:08 +02:00
MascaraSnake	2a5c576c1c	Hardcoded the RVZ scenery	2019-08-25 12:40:32 +02:00
Monster Iestyn	9d2e7b66ba	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	eacc589ae1	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	7f5034bb75	Merge branch 'mi-cleanup-returns' into 'master' ... MI cleanup returns See merge request STJr/SRB2Internal!292	2019-08-20 09:35:36 -04:00