stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
6831 commits 172 branches 41 tags 280 MiB
Commit graph

677 commits

Author SHA1 Message Date
toaster
2b0344a22f Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-09 15:25:48 +01:00
toaster
6815748a3e Merge branch 'flippost' into 'master' 
Flippost

Closes #206 and #191

See merge request STJr/SRB2Internal!320
 2019-09-08 16:24:58 -04:00
toaster
11e3f5ec96 Change flipped starpostz to define the top of the player object, for cases where scale on contact with starpost is different to spawn scale. 2019-09-08 21:21:36 +01:00
toaster
d26ff197dc * Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!) 
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
 2019-09-07 22:12:47 +01:00
toaster
0986195d21 Bunch of fixes for dying in MP special stages. 
* Don't allow the stage to be reloaded in G_DoReborn.
* If you do ANY spawn after the very beginning moment, you're forced to be a spectator.
* Have the "%d player%s remaining" Co-op exiting count visible at the same time as spectator controls.
 2019-09-04 15:51:14 +01:00
toaster
f07309707d Lots of death stuff. 
* Genesis-style love and attention to the death event.
	* Only visibly decrement lives/rings when you're respawning (or game over, see below).
	* Faster no-button-press respawn.
* Game Over specific love.
	* Animation of Level Title font coming in from the sides.
	* https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif
	* Change gameovertics to 10 seconds instead of 15.
	* Make the minimum time before you can force going to the Continue screen longer.
* Accomodate death in MP special stages as a form of exit.
	* Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits.
* Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn.

Also, two not-quite death things which nonetheless were relevant to change:

* Fix quitting a special stage having some of the shared spheres/rings disappear into the aether.
* Fix a warning during compilation for the Ring Penalty print.
 2019-09-01 15:55:23 +01:00
toaster
fe99c64511 Give the Spectator Eggrobos the ability to move left and right relative to their angle, with initial direction depending on MTF_OBJECTSPECIAL/MTF_AMBUSH flag presence. (May need more tweaking before putting in CEZ3) 2019-09-01 11:43:30 +01:00
toaster
6a9da63d7f Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it. 2019-08-30 19:19:54 +01:00
toaster
35f90e3322 Use the softer explosion sound from s3k to go with the increased quantity of explosions. 2019-08-13 20:24:46 +01:00
toaster
8605d77af6 Fix an issue with painstate-exiting detection in the boss1 thinker. 2019-08-12 18:49:58 +01:00
toaster
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
toaster
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
toaster
a87e1b8aa6 Fix inadvertent fallthrough and associated whitespace. 2019-08-04 10:27:36 +01:00
mazmazz
5b284c8170 gcc7 compile fixes (Fall through; spr2 var comparison) 2019-08-03 23:01:10 -04:00
toaster
8a0f1e7ed4 Merge branch 'ending' into 'master' 
ENDINGS

See merge request STJr/SRB2Internal!264
 2019-08-03 16:23:51 -04:00
toaster
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
Monster Iestyn
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
Monster Iestyn
ee64d98e39 Merge branch 'spring-things' into 'master' 
Additional spring flags

See merge request STJr/SRB2Internal!256
 2019-08-02 13:06:38 -04:00
sphere
d2c3b88020 Merge remote-tracking branch 'origin/master' into spring-things 2019-08-02 15:11:13 +02:00
toaster
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
toaster
f0fd9f7656 Ok, now the MobjThinker Lua hook is neutralised properly as well. 2019-08-01 11:35:04 +01:00
toaster
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
toaster
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
toaster
a6a3048c8f * Fix diagonal spring ring assortments being forced up/down with slopes. 2019-07-29 21:03:28 +01:00
toaster
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
Monster Iestyn
18e2c2461f Merge branch 'wavingflag' into 'master' 
New CEZ scenery

See merge request STJr/SRB2Internal!257
 2019-07-28 15:44:00 -04:00
toasterbabe
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
toaster
438c4d1d51 Fix spindash being broken in quicksand 
# Conflicts:
#	src/p_mobj.c
#	src/p_user.c
 2019-07-17 21:33:18 +01:00
sphere
79cf8eb08d Add a blue variant of the pole banner & change some doomednums. 2019-07-14 17:30:33 +02:00
sphere
ee937c4df0 Add a blue variant of the waving flags. 2019-07-14 16:50:45 +02:00
sphere
cfc56c9541 Don't upscale the waving flags, make them twice as large instead 2019-07-14 15:30:00 +02:00
sphere
911b0262ee Whoops, forgot to revert this. 2019-07-14 02:31:33 +02:00
sphere
9c73424b4b Add spring flags: float for horizontal & no gravity for diagonal. 2019-07-14 02:17:44 +02:00
Jonas Sauer
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
Monster Iestyn
35adf2ce4a fix leftshift of negative value MascaraSnake also gets 2019-07-09 21:48:18 +01:00
Monster Iestyn
63d337211e Merge branch 'eggcolosseum' into 'master' 
Egg Colosseum (CEZ3 remaster)

See merge request STJr/SRB2Internal!248
 2019-07-09 16:32:24 -04:00
Monster Iestyn
11a24b88ee Merge branch 'seaegg_tweaks' into 'master' 
Sea Egg

See merge request STJr/SRB2Internal!244
 2019-07-09 16:25:07 -04:00
Monster Iestyn
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
toaster
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
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
toaster
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
toaster
1f15209eb5 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks 
# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c
 2019-07-08 13:52:11 +01:00
toaster
a65925aeca Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed. 
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
 2019-07-08 13:39:21 +01:00
toaster
867f7ecfca ha ha ha how can i possibly describe this commit 
Just wait for the MR, it won't be far behind.
 2019-07-08 13:26:40 +01:00
Steel Titanium
d2adb5e829 Update info.h 
Also add a case for MT_BRICKDEBRIS to P_MobjThinker
 2019-07-06 18:11:49 -04:00
toaster
5baaba1d9e Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed. 
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
 2019-07-04 14:44:09 +01:00
toaster
b78fac66c4 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum 2019-07-04 14:09:56 +01:00
toaster
3efb49487e Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready. 
Just making this commit now so I can merge in master...
 2019-07-04 14:09:38 +01:00