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

6300 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
dcbe0f7f46 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
d9048f2c39 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
11bf294a74 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
MascaraSnake
193b86efab Merge branch 'remove-character-flags' into 'master' 
Remove character flags

Closes #27

See merge request STJr/SRB2Internal!246
 2019-07-09 14:18:27 -04:00
Steel Titanium
ccecb4c6cd Some few comments 2019-07-09 00:56:22 -04:00
Steel Titanium
86c8a0a5d9 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into libopenmpt-fixes 2019-07-09 00:17:27 -04:00
Steel Titanium
f4275cf4ce Merge branch 'master' into libopenmpt-fixes 2019-07-08 23:37:56 -04:00
Monster Iestyn
a10514b5ef Merge branch 'sound-menu-fix' into 'master' 
Sound options menu fixes

Closes #160

See merge request STJr/SRB2Internal!250
 2019-07-08 19:42:47 -04:00
Monster Iestyn
ba0455ab47 Merge branch 'cezbricks' into 'master' 
Hardcode CEZ brick debris

See merge request STJr/SRB2Internal!247
 2019-07-08 17:03:31 -04:00
MascaraSnake
2a700e12d0 Removed the "disable" linedef effect, since it's useless now that the character flags are gone 2019-07-08 22:58:31 +02:00
MascaraSnake
d066fdc82f Simplified checks for ML_NETONLY and ML_NONET 2019-07-08 22:56:00 +02:00
Monster Iestyn
59b346b6d1 Use M_SetupNextMenu to actually set up the Sound Options menu "properly" instead of the old hacks. 
If you wanted the game to reset the item selected to the top option like before though, I left a line commented out that would do that for you. Unlike the old item = 0 way, it would automatically be corrected for headers and other spaces (thus kind of future-proofing this code)
 2019-07-08 21:17:40 +01:00
toaster
9282e8cd7e Merge branch 'toast_cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup 2019-07-08 13:54:11 +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
83ca8e065d 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
bc53be177e Before I forget... 2019-07-08 13:36:02 +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
Steel Titanium
5dc55712e1 Update info.h 
Also add a case for MT_BRICKDEBRIS to P_MobjThinker
 2019-07-06 18:11:49 -04:00
Steel Titanium
c7527ad58b Change this, not that it really matters but 2019-07-06 00:39:36 -04:00
Steel Titanium
0374101ca1 Hardcode brick debris 2019-07-06 00:36:02 -04:00
toaster
63889422a6 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
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
2b70287b01 Implemented a skin-based linedef executor trigger 2019-07-03 09:19:29 +02:00
toaster
168a7f4768 Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'"" 
This reverts commit c17ec4a77e.
 2019-07-03 00:58:02 +01:00
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
MascaraSnake
37af28da15 Remove character-specific flags, replace them with net-only/no-net flags 2019-07-03 00:10:22 +02:00
MascaraSnake
a7f1efafce Merge branch 'thinkerlists' into 'master' 
Separate thinkers into different lists

See merge request STJr/SRB2Internal!219
 2019-07-02 17:30:31 -04:00
MascaraSnake
a3d00e546e Merge branch 'thinkerlists' of git.magicalgirl.moe:STJr/SRB2Internal into thinkerlists 2019-07-02 23:09:17 +02: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
Jonas Sauer
2102f80431 Merge branch 'master' into thinkerlists 
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
 2019-07-02 23:03:06 +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
Monster Iestyn
0c49a33b2e comment out unused variable 2019-06-30 19:33:41 +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
Steel Titanium
2b3118b288 Better loading code for modules 2019-06-29 20:35:31 -04:00
Monster Iestyn
0fb5a82215 Merge branch 'public_next' 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
#	src/p_user.c
#	src/r_data.c
 2019-06-29 20:55:58 +01:00
MascaraSnake
b9ab01d4f2 Merge branch 'wooddebris-fix' into 'master' 
Wood debris fix

See merge request STJr/SRB2Internal!240
 2019-06-29 03:21:15 -04:00
Monster Iestyn
9933f98dc2 Merge branch 'master' into next 
# Conflicts:
#	src/r_data.c
 2019-06-28 23:24:36 +01:00
Steel Titanium
1a4d1b670d Merge branch 'jimita-unfuck-awayview' into 'next' 
unfuck awayview

See merge request STJr/SRB2!493
 2019-06-28 18:21:52 -04:00
Steel Titanium
8a80426408 Merge branch 'public-musicplus-feature-endoflevel' into 'next' 
Fade out music at end of level, before intermission

See merge request STJr/SRB2!472
 2019-06-28 18:21:07 -04:00
MascaraSnake
851b32bf34 Fixed Canarivore gas going through the floor 2019-06-29 00:19:46 +02:00
Steel Titanium
55d09de2ee Merge branch 'pk3-folders-are-not-textures-backport' into 'next' 
Pk3 folders are not textures!

See merge request STJr/SRB2!502
 2019-06-28 18:18:53 -04:00
Steel Titanium
5cbf0692d6 Merge branch 'morememoryshenanigans' into 'master' 
More Memory Shenanigans

See merge request STJr/SRB2!501
 2019-06-28 18:18:14 -04:00
Monster Iestyn
66b7cac849 Merge branch 'console-colors-touchup' into 'master' 
Console color shenanigans

Closes #156

See merge request STJr/SRB2Internal!238
 2019-06-28 18:16:12 -04:00
Monster Iestyn
c4fd565db5 Merge branch 'titlemap-fix' into 'master' 
Fix Titlemap with mazmazz's fancy menu stuff

See merge request STJr/SRB2Internal!228
 2019-06-28 18:15:46 -04:00
Monster Iestyn
f5b0d4b94e Give MT_WOODDEBRIS the MF_SCENERY flag, so it can be made to join its MT_ROCKCRUMBLEn friends in dying after hitting the ground. 
(Untested)
 2019-06-28 21:40:20 +01: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