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
23584 commits 1 branch 12 tags 205 MiB
Commit graph

927 commits

Author SHA1 Message Date
TehRealSalt
b8a752e40a Merge master 2019-09-18 21:47:11 -04:00
toaster
1e11fe650f 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
f523cb107e Merge branch 'newegg' into 'master' 
Newegg dot blag

See merge request STJr/SRB2Internal!305
 2019-09-08 16:11:50 -04:00
toaster
09f7dc1350 * 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
Monster Iestyn
86c72eb5e6 Merge branch 'musicfixes' into 'master' 
Minor musicplus-related fixes

See merge request STJr/SRB2Internal!310
 2019-09-07 11:45:15 -04:00
toaster
3eb4866a2d * Fix jingle captions dying immediately (caused by an S_StopMusic call in P_PlayJingle; resolved by modifying order of operations). 2019-09-07 11:48:58 +01:00
Jaime Passos
412e368ef4 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-02 23:36:30 -03:00
toaster
b2d57e6045 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
MascaraSnake
0ed20a2a39 Hardcoded the Pyre Fly 2019-08-30 08:17:25 +02:00
Steel Titanium
e86484a64a Ignore bots when looking for a player 2019-08-28 23:12:25 -04:00
MascaraSnake
9e132e0fc1 Simplified the lavafall rock states with FF_RANDOMANIM, fixed Var1 for the FF_ANIMATE states 2019-08-27 19:33:54 +02:00
MascaraSnake
6e575b2c1c Only spawn lavafall rocks if a player is nearby 2019-08-25 23:43:07 +02:00
MascaraSnake
5c1189ef4d Added reverse gravity support to lavafalls 2019-08-25 23:31:12 +02:00
MascaraSnake
b50da9e3e6 Hardcoded the lavafall 2019-08-25 23:05:38 +02:00
MascaraSnake
d0879a61e6 Green Snapper: Update Z position of legs during movement 2019-08-24 20:23:28 +02:00
MascaraSnake
1538ca7e86 Green Snapper: Use TryMove instead of TeleportMove for the head, so it doesn't snap up to higher floors. 2019-08-24 11:29:08 +02:00
Monster Iestyn
5035443dc8 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
Jaime Passos
402012e973 I 2019-08-18 14:16:48 -03:00
Monster Iestyn
aaa3467faa Turn Color_Opposite into a 2D array to simplify usage somewhat. Also fix ColorOpposite for Lua 2019-08-12 14:00:26 +01:00
toaster
69eb202110 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
Latapostrophe
e758439c02 Fix bombs exploding twice in the same frame 2019-08-12 00:14:01 +02:00
toaster
37ee6833d6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into gfz_boss_rework 2019-08-11 21:17:13 +01:00
Sryder
0006ceac88 Remove stray CONS_Printf 2019-08-11 18:37:18 +01:00
Sryder
0f7a704444 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints 
# Conflicts:
#	src/p_spec.c
 2019-08-10 11:41:49 +01:00
Alam Ed Arias
f546dced92 All C files should a newline at the end 2019-08-07 12:39:51 -04:00
toaster
9cdeee5b84 Merge branch 'revert_revert_musicplus' into 'master' 
Revert "Revert MusicPlus"

See merge request STJr/SRB2Internal!282
 2019-08-04 13:58:01 -04:00
toaster
534b98251b Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit a76668f55a.
 2019-08-04 12:03:57 +01:00
toaster
a76668f55a Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 0f89fb123f, reversing
changes made to 8fb211d8cf.
 2019-08-04 11:32:55 +01:00
mazmazz
8a637168f4 Merge branch 'musicplus-feature-postboss' into musicplus-aug2019-b 2019-08-04 03:22:36 -04:00
mazmazz
ae05d8c0dd Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle 2019-08-03 23:38:49 -04:00
Steel Titanium
37c50467f3 Ring sparkle mirroring 2019-08-03 18:28:53 -04:00
Steel Titanium
ea32155715 Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into ringsparkle 2019-08-03 17:33:28 -04:00
Steel Titanium
3ef2aa20be Changes 
Kill off the hack
 2019-07-31 20:51:55 -04:00
toaster
43ce434ebf * 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
Steel Titanium
5bfd3c8738 New ring sparkles 2019-07-31 00:47:42 -04:00
TehRealSalt
a6ef3c12b0 Seperate MF2_DONTDRAW and MF2_SHADOW into it's own varied set of flags -- drawflags. 
- Split MF2_DONTDRAW into MFD_DONTDRAWP[1-4], also replaces MFE_DRAWONLYFORP[1-4].
- Split MF2_SHADOW into MFD_FULLBRIGHT and MFD_TRANS80. I also added an entire spectrum of options for transparency & brightness overrides, since I've found myself wishing for stuff like that before.
- Tethering was updated for it's client-sided drawing to apply to splitscreens too.
- Removed cv_transparency.

The transparency overrides don't seem to work yet (obvious on things using MFD_SHADOW), just running out of time to look into it so I'm pushing what I have.
 2019-07-17 23:55:39 -04:00
Sryder
316c7fe7ee Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange 2019-07-17 20:23:30 +01:00
Jonas Sauer
b7c783223a 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
James R
7354ce200e Correct reverse gravity offsets 
Woah reverse gravity sucks.
 2019-07-12 13:28:25 -07:00
Monster Iestyn
8151360ca7 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
7a8843a295 Merge branch 'seaegg_tweaks' into 'master' 
Sea Egg

See merge request STJr/SRB2Internal!244
 2019-07-09 16:25:07 -04:00
Steel Titanium
d9ed4be606 Fix compiling on Linux 2019-07-09 15:42:14 -04:00
toaster
3c5cbd5980 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
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