Commit graph

6159 commits

Author SHA1 Message Date
MascaraSnake
c17ec4a77e Revert "Merge branch 'metalfixes' into 'toast_cleanup'"
This reverts merge request !239
2019-07-02 23:49:10 +00:00
MascaraSnake
009fd9b712 Merge branch 'metalfixes' into 'toast_cleanup'
Metal Sonic Boss fixes

See merge request STJr/SRB2Internal!239
2019-07-02 19:45:46 -04:00
toaster
dbec3c7e54 Metal Sonic fixes!
* Add more context clues to his fight, including an indicator for which laser attack is being used after chargeup.
* Make missiles able to vectorise him.
* Add another laser orb attack - vertical slice - and change the laser orb sequence to accurately reflect that horizontal is the hardest of the ones in 2.1.
* Optimise TC_BLINK, and fix an issue with TC_ALLWHITE that somehow avoided coming up in testing.
* Fix colorized bosses losing their colorization when flashing, by forcing TC_ALLWHITE.
2019-06-28 20:48:14 +01:00
toaster
c9c69d805a Now it's CA_TWINSPIN's turn to get the improvements!
* Remove PF_THOKKED every time a successful damage bounce occours.
* When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.)
* Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound.

Also, some other related tweaks:

* Optimisations to A_VultureBlast, which was used as a base for the particle creation.
* Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism.
* P_SpawnGhostMobj takes colorized into account.
* Fold Tails propeller damage into P_PlayerCanDamage.
* When performing an Attraction Blast, place the player in roll frames.
* Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well.
* Buff MT_LHRT travel distance at slow speeds.
2019-06-26 23:26:05 +01:00
toaster
e5918d629b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
# Conflicts:
#	src/p_mobj.c
2019-06-26 20:43:37 +01:00
Monster Iestyn
c146778c2e Merge branch 'levelselect-tweaks' into 'master'
Some small tweaks to level select

See merge request STJr/SRB2Internal!230
2019-06-25 16:50:44 -04:00
Monster Iestyn
0e81440ed0 Merge branch 'levelheader-startrings' into 'master'
Startrings level header option

Closes #155

See merge request STJr/SRB2Internal!237
2019-06-25 16:43:16 -04:00
Monster Iestyn
52bca4f417 Merge branch 'bossfixes' into 'master'
Boss fixes

See merge request STJr/SRB2Internal!235
2019-06-25 16:36:23 -04:00
Monster Iestyn
ebc02c4e0c Merge branch 'HUDfixes' into 'master'
HUD fixes

See merge request STJr/SRB2Internal!234
2019-06-24 17:47:44 -04:00
Steel Titanium
c314c4b208 Some few changes.
The amount of rings you start with also applies when you respawn from a starpost.

Startrings counts the ring total requirement for a perfect bonus.
2019-06-24 16:21:03 -04:00
Nev3r
c2badc927f Merge branch 'rainfixes' into 'master'
Rain fixes and associated

See merge request STJr/SRB2Internal!233
2019-06-24 15:07:35 -04:00
Steel Titanium
c2a8c82b6a Forgot to do this. 2019-06-23 18:51:42 -04:00
Steel Titanium
f2a98a32cf Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into levelheader-startrings 2019-06-23 18:24:15 -04:00
Steel Titanium
25e67ee061 Add startrings level header option 2019-06-23 18:15:40 -04:00
Monster Iestyn
050d9e1922 Merge branch 'drawanglefixes' into 'master'
Drawangle fixes

Closes #153

See merge request STJr/SRB2Internal!236
2019-06-23 17:33:40 -04:00
Monster Iestyn
0368689e27 Merge branch 'public_next' 2019-06-22 22:44:42 +01:00
Monster Iestyn
fe633a9f57 Merge branch 'master' into next 2019-06-22 22:42:13 +01:00
Monster Iestyn
1e29d627f0 Merge branch 'make-credits-great-again' into 'next'
Prevent just anyone from skipping credits but allow admins

See merge request STJr/SRB2!478
2019-06-22 16:13:04 -04:00
Monster Iestyn
4ed81519e8 Merge branch 'pk3_leak' into 'master'
Pk3 Leaks

See merge request STJr/SRB2!500
2019-06-22 15:56:52 -04:00
toaster
b2488f11b7 Remove some more 2.1-related ringslinger offsets to the chat. 2019-06-22 20:17:09 +01:00
toaster
cda4ed73a6 Remove some more 2.1-related ringslinger offsets to the chat. 2019-06-22 20:15:57 +01:00
toaster
934709a910 Realised I forgot to do this. Without this commit, the drawangle update stuff is useless :V 2019-06-22 17:33:37 +01:00
toaster
cda5b386c4 Realised I forgot to do this. Without this commit, the drawangle update stuff is useless :V 2019-06-22 17:23:04 +01:00
toaster
462d359d47 Correct some oversights where drawangle was incorrectly ignored. 2019-06-22 17:07:18 +01:00
toaster
7d3e659f1f Some preliminary work to make multiple bosses in the same map work nicely together, by allowing parameter to alter the linedef executor tag to call in increments of 100.
Also: Making sure every single reserved tag is recorded as an LE_ constant.
2019-06-22 17:03:39 +01:00
toaster
e2fd835af4 Tweak Boss5MakeItRain's bomb launch angles to properly smash the ceiling in the new arena. 2019-06-22 17:03:28 +01:00
toaster
597119bd8a As I wanted MI to do but he was too exhausted at the time from hardcoding, make the Fang bullet knockback less hardcoded and instead give it MF2_SUPERFIRE.
# Conflicts:
#	src/p_mobj.c
2019-06-22 17:03:10 +01:00
toaster
892240bb77 HUD stuff.
* Re-fix chat HUD position, and make it not move in match (which it needed to do in 2.1).
* Fix HU_drawPing for the new palette.
* Change the condition for greying out players, since the current one was buggy.
* Allow for tokens on the coop MP HUD, and use the small emeralds so there's space for them.
* Fix the mapping between skincolours and name colours in new chat, specifically to take into account every possible text colour (as opposed to the port previously done, which only used the 2.1 text colours and looked like ass as a result).
2019-06-22 16:54:05 +01:00
toaster
982d97a267 Do some minor HUD fixes.
* Move HUD text's anchoring to underneath STR instead of above Lives.
* Adjust chat position slightly, to take advantage of SRB2's HUD layout having less content towards the bottom (unlike Kart, where it has roughly equal).
* Fix Match emeralds not displaying while in tab rankings with all-seven invuln/shoes bonus active.
2019-06-22 16:53:38 +01:00
toaster
032ef98209 Support backspace for resetting various menu values, just like Kart. 2019-06-22 16:50:46 +01:00
toaster
e27a43f976 Improve rain/weather.
* Like Kart, remove cv_precipdensity.
* Like Kart, replace "Infinite" draw distance value with "None".
* Better thinker with more return optimisation.
* Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.
2019-06-22 16:50:30 +01:00
toaster
7cf70cf89c Add HUD icon for Pink shield. (Don't worry, this is my last expected commit in this branch. Gonna cherry pick everything unrelated to the Pink shield into a bunch of other branches now.) 2019-06-22 16:44:32 +01:00
Sryder13
19f25e6a8e Free the zentries 2019-06-22 00:52:28 +01:00
Sryder13
bf2c82633c Merge branch 'master' into pk3_leak 2019-06-22 00:28:14 +01:00
Sryder13
b9a9108dc4 Remember to end inflating 2019-06-22 00:19:34 +01:00
MascaraSnake
5a0a971084 Merge branch 'new-acz-minecarts' into 'master'
ACZ hardcoding (including minecarts)

See merge request STJr/SRB2Internal!231
2019-06-21 17:45:03 -04:00
MascaraSnake
1076b59bd1 Forgot to copy something over from the CR_ROPEHANG case 2019-06-21 23:42:48 +02:00
MascaraSnake
68a065ca9e Always use the white sidemark sprite, since track switching is no longer "activated" 2019-06-21 23:40:28 +02:00
MascaraSnake
e0aff341e4 Also back by popular demand: Restricting the camera angle during a minecart ride 2019-06-21 23:34:49 +02:00
Monster Iestyn
e95696c94b Merge branch 'public_next' 2019-06-21 22:13:39 +01:00
Monster Iestyn
cfa13f3fe4 Merge branch 'master' into next 2019-06-21 22:10:32 +01:00
Monster Iestyn
f079942290 Merge branch 'stand(alone)-lump-comedy' into 'master'
Stand(alone) lump comedy

See merge request STJr/SRB2!499
2019-06-21 17:06:23 -04:00
Monster Iestyn
c5a993b9b5 Merge branch 'fof-slopes-level-load-fix' into 'next'
FOF slopes level load fix

See merge request STJr/SRB2!498
2019-06-21 17:05:54 -04:00
Steel Titanium
8839b4ce8c Merge branch 'public-notpublic-libopenmpt' into 'master'
libopenmpt support

See merge request STJr/SRB2Internal!229
2019-06-21 17:03:53 -04:00
MascaraSnake
3827a69415 By popular demand: Track switching only requires strafe instead of jump+strafe 2019-06-21 20:13:30 +02:00
toaster
a8a2a1ed4b Correct some more oversights of switching to revitem for CA2_MELEE's particles. 2019-06-21 12:51:55 +01:00
toaster
9de0c56cdc Don't give SH_PINK in Race/Competition. They're your opponents! 2019-06-21 12:35:37 +01:00
toaster
2960180e24 Make minor adjustments to the CA2_MELEE and CA_TWINSPIN stuff. 2019-06-21 00:43:03 +01:00
toaster
32b71324a8 Slight buff to MT_LHRT. 2019-06-20 23:43:05 +01:00
toaster
1b334debfe HUD stuff.
* Re-fix chat HUD position, and make it not move in match (which it needed to do in 2.1).
* Fix HU_drawPing for the new palette.
* Change the condition for greying out players, since the current one was buggy.
* Allow for tokens on the coop MP HUD, and use the small emeralds so there's space for them.
* Fix the mapping between skincolours and name colours in new chat, specifically to take into account every possible text colour (as opposed to the port previously done, which only used the 2.1 text colours and looked like ass as a result).
2019-06-20 22:57:47 +01:00