thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
17061 commits 1 branch 12 tags 205 MiB
Commit graph

784 commits

Author SHA1 Message Date
toaster
e5cdfe998b 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
823ea62e7c 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
0124e248ee 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
Sryder
d6382107d3 Hopefully better Jawz behaviour 
Moved the movement code for it out of the thinker and into A_JawzChase to have it all in a consistent place.
 2019-07-07 21:56:23 +01:00
James R
c5bd4d6ecd Apply P_MobjFlip to ring and ring sparkle animations 2019-07-05 20:11:38 -07:00
toaster
689a4545df Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum 2019-07-04 14:09:56 +01:00
toaster
c0f7cfaa8e 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
MascaraSnake
9f666e125e Merge branch 'master' into thinkerlists 
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
 2019-07-02 23:08:37 +02:00
toaster
ee3d767bd7 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks 
# Conflicts:
#	src/p_mobj.c
 2019-07-02 14:19:36 +01:00
Monster Iestyn
2277b28a5c correctly use P_UnsetThingPosition, P_SetThingPosition + P_DelSeclist around MF_NOBLOCKMAP addition in the TNT explosion code 2019-06-30 22:22:12 +01:00
toaster
6036b67f3d ha ha ha ha ha ha ha ha 
Sea Egg is majorly changed according to Mystic's ancient instructions (excepting the flying FOF rock, I cared not for fucking around with FOFs).

Specifically:
* Faster paced fight.
* Instantly travels horizontal distance.
* Fakes no longer hurt papa, and spin out like a deflating balloon when he dies.
* New attack: When surfacing, produces an electric shockwave. Replaces underwater shock. Designed for new, shallow arena.
* Support for multiple bosses in the same map distinguished by parameter.

Will upload map to fight the new battle in on the MR.
 2019-06-30 15:37:33 +01:00
mazmazz
7bbd05e85d Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle 2019-06-29 18:33:45 -04:00
Sryder
6eca35aae1 SPB Now follows the track. 
You better watch out, You better watch out, You better watch out!
 2019-06-28 22:43:34 +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
52bca4f417 Merge branch 'bossfixes' into 'master' 
Boss fixes

See merge request STJr/SRB2Internal!235
 2019-06-25 16:36:23 -04: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
a8a2a1ed4b Correct some more oversights of switching to revitem for CA2_MELEE's particles. 2019-06-21 12:51:55 +01:00
Monster Iestyn
d955cea37d Fix warnings/errors found during compiling, mostly of the mixed-declaration-and-code or shadowed variables variety 2019-06-20 20:05:07 +01:00
toaster
c9ed375af7 Correct some oversights where drawangle was incorrectly ignored. 2019-06-20 00:43:55 +01:00
toaster
0647230253 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-20 00:24:13 +01:00
toaster
88ffff4575 Tweak Boss5MakeItRain's bomb launch angles to properly smash the ceiling in the new arena. 2019-06-19 23:35:18 +01:00
MascaraSnake
64b63edfdd Added minecart support to A_MixUp 2019-06-16 16:49:18 +02:00
MascaraSnake
852ae2d07b Many more bugfixes 2019-06-15 20:21:18 +02:00
MascaraSnake
4d27dac35a Simplified the setup for the Snapper/minecart death animations 2019-06-15 17:33:07 +02:00
MascaraSnake
fd39f4ce1e Merge branch 'acz-hardcode' into new-acz-minecarts 2019-06-13 21:52:08 +02:00
MascaraSnake
cadcc642c0 Set tracers via P_SetTarget and not directly 2019-06-13 21:51:31 +02:00
MascaraSnake
720d84f87f More incomplete minecart hardcoding 2019-06-13 21:45:30 +02:00
MascaraSnake
af024f9f53 Merge branch 'acz-hardcode' into new-acz-minecarts 2019-06-12 21:28:39 +02:00
MascaraSnake
1b491f2496 Forgot to hardcode the mobj.valid checks 2019-06-12 21:28:09 +02:00
MascaraSnake
01adbfc495 Hardcoded the saloon door 2019-06-12 21:20:14 +02:00
MascaraSnake
ff6c8063af Fixed some angle business in the BASH code 2019-06-10 20:40:12 +02:00
MascaraSnake
67c3d87190 Hardcoded the new Snapper behavior 2019-06-10 20:32:50 +02:00
MascaraSnake
db6b94e7a7 Hardcoded the new Minus behavior 2019-06-10 17:42:37 +02:00
MascaraSnake
dc113269e9 Fixed the bug 2019-06-10 16:19:58 +02:00
MascaraSnake
a2c61983e5 Hardcoded the new BASH behavior (there's still a bug lurking somewhere) 2019-06-10 16:09:15 +02:00
MascaraSnake
b8aac236f2 Hardcoded the Canarivore 2019-06-10 13:58:16 +02:00
MascaraSnake
6f7b77f650 Hardcoded train cameo 2019-06-09 13:48:07 +02:00
MascaraSnake
4910c213b2 Hardcoded wood debris 2019-06-09 12:27:09 +02:00
MascaraSnake
3653d5b46e Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch) 2019-06-09 10:51:33 +02:00
MascaraSnake
50a9a6c0bb Fixed dust scaling, changed sound captions 2019-06-08 14:12:39 +02:00
MascaraSnake
80f09c35bb Hardcoded dust devil 2019-06-08 09:51:46 +02:00
TehRealSalt
6f66ef20bf Merge branch 'master' into new-items 2019-06-03 19:09:46 -04:00
TehRealSalt
3967a5d409 Reduce angle offset back down again 2019-05-30 01:46:25 -04:00
TehRealSalt
ccdcb1dbd4 Minor change 2019-05-29 23:31:33 -04:00
TehRealSalt
dfe197b380 Double ring rotate speed, base it off current angle, slightly offset it 2019-05-29 23:21:58 -04:00
TehRealSalt
cba86ee6ea Unused i 2019-05-29 22:55:59 -04:00
TehRealSalt
189c2d06fd Merge branch 'rings' into new-items 2019-05-29 22:17:51 -04:00