16d077fde3
Coins don't melt in lava and lavafalls have displayoffset 1
2019-10-05 20:00:54 +02:00
99220ae48b
Fixed a typo
2019-10-05 10:45:24 +02:00
cabc4e0294
Implemented lava splish. Feel free to suggest a different "splish" sound.
2019-10-05 10:00:59 +02:00
5c1fabfaae
Lava is now either completely solid or completely intangible. No more half-assing
2019-10-01 21:58:18 +02:00
d301d2bba4
Fixed a bug with the ring lava melting
2019-09-29 23:22:38 +02:00
4375ea8089
Lava now melts rings!
2019-09-29 23:11:21 +02:00
c00144a4f8
Pterabyte: Don't target players who are invincible after being hurt
2019-09-29 19:29:34 +02:00
26ecab14d7
Implemented the Pterabyte grabbing mechanic
2019-09-29 18:42:17 +02:00
598047ae8b
Hardcoded the Pterabyte (without the grabbing mechanic)
2019-09-29 10:39:09 +02:00
a5ae8abdb2
Pyre Fly: Use MF2_BOSSNOTRAP instead of MF2_AMBUSH
2019-08-31 12:53:55 +02:00
8ddcced6f0
Pyre Fly: Don't spawn smoke and flames if no player is in range
2019-08-30 09:05:49 +02:00
4cece9fe36
Pyre Fly: Don't run the fuse code when dead
2019-08-30 08:55:29 +02:00
806b106905
Hardcoded the Pyre Fly
2019-08-30 08:17:25 +02:00
50e51c137e
Hardcoded the lavafall
2019-08-25 23:05:38 +02:00
2a5c576c1c
Hardcoded the RVZ scenery
2019-08-25 12:40:32 +02:00
35f90e3322
Use the softer explosion sound from s3k to go with the increased quantity of explosions.
2019-08-13 20:24:46 +01:00
8605d77af6
Fix an issue with painstate-exiting detection in the boss1 thinker.
2019-08-12 18:49:58 +01:00
9ae750d09c
Since I had to do a clean build to get this up to date (the state list was updated), I decided to redo all the boss explosion animations to be way more aesthetically pleasing.
...
Basically, think "Sonic 3". https://cdn.discordapp.com/attachments/371082353990303745/610233312765673493/srb20047.gif
2019-08-12 00:34:42 +01:00
1fbd3eff40
* Fix the thing where you "roll" in run/walk frames if you hold spin after jumping.
...
* Fix the thing where you don't go through super transformation frames when starting NiGHTS.
2019-08-04 15:25:13 +01:00
a87e1b8aa6
Fix inadvertent fallthrough and associated whitespace.
2019-08-04 10:27:36 +01:00
5b284c8170
gcc7 compile fixes (Fall through; spr2 var comparison)
2019-08-03 23:01:10 -04:00
8a0f1e7ed4
Merge branch 'ending' into 'master'
...
ENDINGS
See merge request STJr/SRB2Internal!264
2019-08-03 16:23:51 -04:00
9f34a7aa82
Merge branch 'bossenable' into 'master'
...
Boss enable linedef (type 449)
See merge request STJr/SRB2Internal!272
2019-08-03 16:23:22 -04:00
af38c0e227
Merge branch 'bustables_misc' into 'master'
...
Bustables and landing events
Closes #157 and #162
See merge request STJr/SRB2Internal!262
2019-08-02 13:16:53 -04:00
ee64d98e39
Merge branch 'spring-things' into 'master'
...
Additional spring flags
See merge request STJr/SRB2Internal!256
2019-08-02 13:06:38 -04:00
d2c3b88020
Merge remote-tracking branch 'origin/master' into spring-things
2019-08-02 15:11:13 +02:00
8fa0641e99
Instead of checking whether mobj->spawnpoint->extrainfo is in the correct range every tic, have a lua error for trying to set it outside (since there'll no doubt be other consequences to being outside the range too)
2019-08-01 18:12:26 +01:00
f0fd9f7656
Ok, now the MobjThinker Lua hook is neutralised properly as well.
2019-08-01 11:35:04 +01:00
7cb02985f4
* Added boss enable linedef (type 449).
...
- Frontside x offset = boss ID (determined via parameter for all bosses)
- Noclimb flag = disable mode
- Bosses don't do a fuckin' THING - no state updates, no player searches, no sounds, no lua, no nothin' - and it's all totally netsynced.
- The only thing they WILL do is flash infinitely if you hurt them, but this is designed for stuff where you're not meant to be in the same room as the boss til it's activated.
- All bosses of all IDs are automatically enabled on mapload, then if an enable mode version of this linedef is present in the map for a specific boss id, that boss id is automatically disabled.
* Add multi-boss support via parameter for:
- All bosses' MT_BOSSFLYPOINT search
- Boss 5's waypoint search
- Oldbrak's waypoint search (this one's for you, jood)
2019-07-31 23:17:17 +01:00
2ae07bdf3b
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into bustables_misc
...
# Conflicts:
# src/p_user.c
2019-07-30 18:14:52 +01:00
a6a3048c8f
* Fix diagonal spring ring assortments being forced up/down with slopes.
2019-07-29 21:03:28 +01:00
47554b57e4
* Made the evaluation screen even more attractive.
...
* Fixed an unused variable warning in lua_skinlib.c.
- fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic)
Also with apologies to MI:
- golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green
- fixed closed captions for replaced player sounds being incorrect
- fixed closed captions overlapping tutorial text
2019-07-29 14:55:36 +01:00
18e2c2461f
Merge branch 'wavingflag' into 'master'
...
New CEZ scenery
See merge request STJr/SRB2Internal!257
2019-07-28 15:44:00 -04:00
385d34e67e
* Make busting a FOF through any in-game means (or not providing a target sector to EV_CrumbleChain) bust all FOFs with the same control sector.
...
* Make CA2_GUNSLINGER not get overridden by being in quicksand.
2019-07-17 21:34:04 +01:00
438c4d1d51
Fix spindash being broken in quicksand
...
# Conflicts:
# src/p_mobj.c
# src/p_user.c
2019-07-17 21:33:18 +01:00
79cf8eb08d
Add a blue variant of the pole banner & change some doomednums.
2019-07-14 17:30:33 +02:00
ee937c4df0
Add a blue variant of the waving flags.
2019-07-14 16:50:45 +02:00
cfc56c9541
Don't upscale the waving flags, make them twice as large instead
2019-07-14 15:30:00 +02:00
911b0262ee
Whoops, forgot to revert this.
2019-07-14 02:31:33 +02:00
9c73424b4b
Add spring flags: float for horizontal & no gravity for diagonal.
2019-07-14 02:17:44 +02:00
166f1fac66
Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list.
...
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-13 01:42:03 +02:00
35adf2ce4a
fix leftshift of negative value MascaraSnake also gets
2019-07-09 21:48:18 +01:00
63d337211e
Merge branch 'eggcolosseum' into 'master'
...
Egg Colosseum (CEZ3 remaster)
See merge request STJr/SRB2Internal!248
2019-07-09 16:32:24 -04:00
11a24b88ee
Merge branch 'seaegg_tweaks' into 'master'
...
Sea Egg
See merge request STJr/SRB2Internal!244
2019-07-09 16:25:07 -04:00
dc71e297bb
Fixed mixed-code-and-declaration, shadowed variables, etc ...and the compiler doesn't like P_AddEachTimeThinker being inline anymore for some reason, oh well
2019-07-09 21:15:12 +01:00
2df90888bb
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum
...
# Conflicts:
# src/p_mobj.c
# src/sounds.c
# src/sounds.h
2019-07-09 19:52:52 +01:00
3e305c0993
Merge branch 'toast_cleanup' into 'master'
...
PITY IN PINK and everything associated (formerly toast_fixes)
See merge request STJr/SRB2Internal!232
2019-07-09 14:31:25 -04:00
ef984eb336
Merge branch 'metalfixes' into 'toast_cleanup'
...
Metal Sonic Boss fixes (again)
See merge request STJr/SRB2Internal!245
2019-07-09 14:29:42 -04:00
c1bea02f03
Merge branch 'rainfixesmkII' into 'master'
...
Accidentially broke rain in the rainfixes branch (oh, the irony!)
See merge request STJr/SRB2Internal!249
2019-07-09 14:24:14 -04:00
98b6280d03
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
...
# Conflicts:
# src/p_mobj.c
2019-07-08 13:53:31 +01:00
MascaraSnake
