Commit graph

14498 commits

Author SHA1 Message Date
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
Sryder
e14da85868 Merge branch 'opengl_match_software_wallclip' into 'master'
OpenGL: Try and Match Software Wallclipping Better

See merge request KartKrew/Kart-Public!150
2019-07-02 14:08:10 -04:00
Latapostrophe
0c3fbdd7f4 Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart-Public 2019-07-02 18:24:14 +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
Sryder
19a2962413 Just remembered there's supposed to be a flag to determine if a waypoint can be spawned at 2019-06-30 22:14:20 +01:00
Sryder
658e852a0c Merge branch 'revert-mserv' into 'master'
Revert mserv

See merge request KartKrew/Kart-Public!144
2019-06-30 15:56:17 -04:00
Monster Iestyn
0c49a33b2e comment out unused variable 2019-06-30 19:33:41 +01:00
James R
3d81d09fe0 Send the old GT_MATCH only for specific versions
These version numbers were gathered from the Master Server's PHP code.
2019-06-30 10:47:08 -07: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
Sryder
d579a40221 Merge branch 'replay-code-sucks' into 'master'
Fix SIGSEGV when saving replays and invalid extrainfo offset

See merge request KartKrew/Kart-Public!149
2019-06-30 05:51:21 -04:00
Steel Titanium
2b3118b288 Better loading code for modules 2019-06-29 20:35:31 -04:00
mazmazz
887a73a98d Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx 2019-06-29 19:41:06 -04:00
mazmazz
f7936876be Merge branch 'master' into musicplus-sdlmixerx 2019-06-29 19:31:01 -04:00
mazmazz
7f7de25af5 2.2 jingle name fixes 2019-06-29 18:44:45 -04:00
mazmazz
7bbd05e85d Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle 2019-06-29 18:33:45 -04:00
mazmazz
53fe455a8f Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle 2019-06-29 18:10:44 -04:00
mazmazz
14df513db6 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla 2019-06-29 17:51:30 -04:00
mazmazz
cc22795871 Merge branch 'public_next' into internal-md3-vanilla 2019-06-29 16:23:19 -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
mazmazz
3a4b26a61c Merge branch 'md3-vanilla' into internal-md3-vanilla 2019-06-29 15:02:50 -04:00
mazmazz
11955ba838 Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-06-29 15:02:07 -04:00
Sryder
20f8037351 Respawn at waypoints once first crossing the finish line. 2019-06-29 11:05:35 +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
Jaime Passos
59d5ad193c something something memory leaks 2019-06-28 19:43:37 -03: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
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
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
Sryder
10adecb4a6 Improvements to player finish distances
Figure out the circuit length on map load
player->distancetofinish is now a total distance on circuit maps
some hacky alterations around circuit finish lines to correctly calculate distancetofinish
2019-06-28 21:11:26 +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
Sryder
04966f5613 Add missing function header comments to k_waypoint.c 2019-06-28 09:59:19 +01:00
Sryder
269050ecc7 Merge branch 'lemme-outa-room-menu' into 'master'
Don't get stuck in room menu in a modified game

See merge request KartKrew/Kart-Public!145
2019-06-27 14:16:37 -04:00
Steel Titanium
8d1db45599 Fix console back color not being correct.
This also adds support for using such colors in a text prompt
2019-06-26 22:08:17 -04: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
Sryder
6a53837d2c Update Skywall handling
I've tried to make this so it almost never under-compensates, and over-compensates very little where possible.
I don't think it's 1:1 to software's current behaviour, and probably never will be due to software being very strange.
2019-06-26 23:17:45 +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