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

6359 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
3684095619 gcc7 compile fixes (Fall through; spr2 var comparison) 2019-08-03 23:00:21 -04:00
mazmazz
d83bee2bad Merge remote-tracking branch 'origin/master' into musicplus-feature-dying-fp 2019-08-03 22:49:20 -04:00
mazmazz
0abb038938 Fix titlemap music bug 2019-08-03 22:49:12 -04:00
mazmazz
eee3eaee57 Fix titlemap music bug 2019-08-03 22:48:40 -04:00
mazmazz
5fa27c57e0 Merge branch 'master' into musicplus-feature-dying-fp 2019-08-03 22:22:39 -04:00
toaster
dec517f224 Merge branch 'ending' into 'master' 
ENDINGS

See merge request STJr/SRB2Internal!264
 2019-08-03 16:23:51 -04:00
toaster
c841193acc Merge branch 'bossenable' into 'master' 
Boss enable linedef (type 449)

See merge request STJr/SRB2Internal!272
 2019-08-03 16:23:22 -04:00
toaster
618d0844e4 Merge branch 'snaptoground-fix' into 'master' 
Snap to ground fix

Closes #165

See merge request STJr/SRB2Internal!274
 2019-08-03 16:22:47 -04:00
toaster
9386a36fac Merge branch 'mpspec_cleanup' into 'master' 
MP/Old Special Stage ring stuff

See merge request STJr/SRB2Internal!276
 2019-08-03 16:22:23 -04:00
toaster
e7faa83e23 Merge branch 'linedef-award-rings' into 'master' 
New award rings linedef executor

See merge request STJr/SRB2Internal!263
 2019-08-03 16:21:58 -04:00
Monster Iestyn
eb477ee784 Remove commented out P_CheckSector calls and add extra comments explaining the situation 2019-08-03 19:06:45 +01:00
Monster Iestyn
2106263988 Merge branch 'master' into snaptoground-fix 2019-08-03 18:23:09 +01:00
Monster Iestyn
d7f00f95d9 Merge branch 'speciallosesound' into 'master' 
Fix old Special Stage failure sounds not always playing

See merge request STJr/SRB2Internal!275
 2019-08-03 13:18:40 -04:00
Monster Iestyn
dab52b522b Merge branch 'titlemaplua' into 'master' 
Titlemap Lua

See merge request STJr/SRB2Internal!270
 2019-08-03 13:14:46 -04:00
toaster
211fd5be56 Fix the minor issues since steel's busy 2019-08-03 08:04:02 -04:00
toaster
06a7d0d8d2 Add a condition to bail on the HUD's ring counting down calculation if nummaprings is 0 or -1. 2019-08-03 12:25:46 +01:00
toaster
3d0eece7fc MI made a good argument for bossdisabled not being conditional on fromnetsave. 2019-08-03 12:09:18 +01:00
toaster
cd4a16dd62 Have the ring bonus in MP Special Stages be based on the shared sum of all players'. 2019-08-02 23:56:25 +01:00
toaster
293c5dacf5 Add rings to old/MP special stage HUD + make both them and spheres (in old special stage only) count down rather than up, to match s3k 2019-08-02 23:51:22 +01:00
toaster
a5eccac199 Perfect bonus support for non-NiGHTS special stages 2019-08-02 22:52:53 +01:00
toaster
27f012740b Fix old Special Stage failure sounds not always playing. 2019-08-02 20:02:55 +01:00
Monster Iestyn
cbd408278f Merge branch 'bustables_misc' into 'master' 
Bustables and landing events

Closes #157 and #162

See merge request STJr/SRB2Internal!262
 2019-08-02 13:16:53 -04:00
Monster Iestyn
6456bda2d5 Merge branch 'anglestuff' into 'master' 
Spring angles and ring angles

See merge request STJr/SRB2Internal!266
 2019-08-02 13:10:23 -04:00
Monster Iestyn
7af04015a2 Merge branch 'emeraldfixes' into 'master' 
Special stage related fixes

See merge request STJr/SRB2Internal!269
 2019-08-02 13:08:20 -04:00
Monster Iestyn
937deec106 Merge branch 'maniaspheresfix' into 'master' 
MANIASPHERES de-hardcode

See merge request STJr/SRB2Internal!268
 2019-08-02 13:06:52 -04:00
Monster Iestyn
a0846b2a95 Merge branch 'spring-things' into 'master' 
Additional spring flags

See merge request STJr/SRB2Internal!256
 2019-08-02 13:06:38 -04:00
Monster Iestyn
5b2a47b869 Merge branch 'followmobj_scale' into 'master' 
Smiles tail scale

See merge request STJr/SRB2Internal!273
 2019-08-02 13:05:50 -04:00
Monster Iestyn
a44faf42da Merge branch 'diagonalrings' into 'master' 
Diagonal spring ring fixes

See merge request STJr/SRB2Internal!267
 2019-08-02 13:03:11 -04:00
Monster Iestyn
c88f02675e Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code. 
This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
 2019-08-02 16:51:44 +01:00
sphere
5a1b539cd9 Merge remote-tracking branch 'origin/master' into spring-things 2019-08-02 15:11:13 +02:00
toaster
d0d43650f2 fixed sphere's CA2_MELEE stasis issue 2019-08-02 13:18:57 +01:00
Monster Iestyn
925735bfaa Whoops the second 2019-08-01 20:48:24 +01:00
Monster Iestyn
55a738d2be Whoops, forgot this part 2019-08-01 20:17:15 +01:00
Monster Iestyn
2cfe575c20 Add openfloorrover and openceilingrover vars so that PIT_CheckLine can update tmfloorrover and tmceilingrover properly via P_LineOpening 
...which should hopefully stop that issue where you just teleport back to the ground. Assuming this works as expected.

Also this is untested lol.
 2019-08-01 18:56:00 +01:00
toaster
5e6a3f0297 Instead of checking whether mobj->spawnpoint->extrainfo is in the correct range every tic, have a lua error for trying to set it outside (since there'll no doubt be other consequences to being outside the range too) 2019-08-01 18:12:26 +01:00
toaster
1afad6f093 Was reviewing old merge requests as a procrastination technique, and discovered that the followmobj's scale was being inaccurately handled for Smiles' tails! Fixed that... 2019-08-01 08:01:29 -04:00
toaster
25cabbfb37 Ok, now the MobjThinker Lua hook is neutralised properly as well. 2019-08-01 11:35:04 +01: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
toaster
e97acc9775 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into bustables_misc 
# Conflicts:
#	src/p_user.c
 2019-07-30 18:14:52 +01:00
toaster
3b99335605 * Strip the word "function" from INLEVEL error messages, since they're now shared between access and function cases. 
* Move it into lua_script.h, so it's available to everything that needs it.
 2019-07-30 17:57:57 +01:00
toaster
c659e3f26b Fix lua scripts erroring on the title screen because they're run there but it's not counted as GS_LEVEL (aka #168). 2019-07-30 17:48:13 +01:00
toaster
ac91f122ce * Fix something I neglected earlier when fixing Ghosts and Replays for 2.2 - the fact that the player's skin will change if they don't have NiGHTS sprites like Sonic does not being accomodated. 2019-07-30 17:24:21 +01:00
toaster
28e7269cc6 * Fix "exitlevel" being counted as a special stage success despite not giving you an emerald by inverting stagefailed's default value, since there's only a limited number of ways you can WIN at a special stage. 
* Correct a potential source of desync in P_GiveEmerald.
 2019-07-30 16:44:40 +01:00
Alam Ed Arias
5286938853 Fix building with MSVC 2019-07-29 19:02:45 -04:00
Alam Ed Arias
644aba78d5 Merge branch 'public_next' into private 2019-07-29 18:31:01 -04:00
Alam Ed Arias
82c4cdfaca Merge branch 'master' into next 2019-07-29 18:05:33 -04:00
Alam Ed Arias
62e45e5f5b SDL2: fixed compiling mixer interface with MSVC 2019-07-29 17:56:35 -04:00
toaster
5971c03feb Added escape pod. Okay, now I'm truly done with this branch. https://cdn.discordapp.com/attachments/249925765423038464/605506507345362964/srb20033.gif 2019-07-29 22:13:24 +01:00
toaster
be14e062e8 Make MANIASPHERES' #define'd away stuff also recreatable with SOC, since I want to release it publically if the team don't want it. 2019-07-29 21:06:17 +01:00
toaster
ac133e4d2f * Fix diagonal spring ring assortments being forced up/down with slopes. 2019-07-29 21:03:28 +01:00