thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-17 13:32:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4834 commits 2 branches 14 tags 206 MiB
Commit graph

4155 commits

Author SHA1 Message Date
Monster Iestyn
6797976531 Merge branch 'sdl_mixer_fixes' into 'master' 
SDL Mixer fixes

Closes #31

See merge request STJr/SRB2!260
 2018-08-16 16:57:14 -04:00
mazmazz
5fdece424a Adjust vertical angle and forwards/backwards of NiGHTS bumper in objectplace 2018-08-16 16:51:48 -04:00
mazmazz
4aade072ef Checkpoint (unfinished): player->totalsphere 2018-08-16 13:11:32 -04:00
mazmazz
32939a11f1 Change SETRINGS to support player->spheres in NiGHTS 2018-08-16 12:13:57 -04:00
mazmazz
ed9e74c15a Line from revert 2018-08-16 11:35:35 -04:00
mazmazz
4b8fd01bc0 Revert "SETSPHERES console command for debugging/cheating" 
This reverts commit 9e8784a376.
 2018-08-16 11:34:57 -04:00
mazmazz
675ed7ecf0 Don't apply autobrake on NiGHTS bumpers 2018-08-15 23:40:42 -04:00
mazmazz
baa4c30e99 Also center non-NiGHTS players on NiGHTS bumpers 2018-08-15 19:09:54 -04:00
mazmazz
6010822c84 Use more efficient position setting. For Z, also adjust for bumper mobj scale. 2018-08-15 18:50:28 -04:00
mazmazz
1381ffc3e6 Fix NiGHTS Bumper player positioning 2018-08-15 18:42:20 -04:00
mazmazz
a49aa9babe Fix bonus time quirk where lines are run if player->marebonuslap is 0 
* Bonus laps start at 1, so if a line is looking for bonus laps, they should only be run at >= 1.
 2018-08-14 16:08:21 -04:00
mazmazz
6ba6454056 Comments 2018-08-14 14:57:58 -04:00
mazmazz
9452c02ca1 Fix Capsule Entrance exec firing repeatedly 2018-08-14 12:48:00 -04:00
mazmazz
b1368078c6 Make Bonus Time Start executor into a general Egg Capsule Touch executor 
* Entrance/exit flags
* Enough/not-enough-rings flags (with "doesn't matter" line option)
 2018-08-14 12:00:37 -04:00
mazmazz
35bcf200be Alternate take on pre-blowup: Do it on first touching tic, instead of first ring pop 
* Use MT_EGGCAPSULE extravalue2 for tic timer
 2018-08-14 11:41:10 -04:00
mazmazz
3a3976bd71 Make LE Ring triggers accept spheres for NiGHTS levels 2018-08-14 11:10:10 -04:00
mazmazz
e399d08d76 Add ML_BOUNCY flag to Bonus Time executor to execute BEFORE the capsule is destroyed and player has enough spheres 2018-08-14 10:48:50 -04:00
mazmazz
a2883009ed Preproc comment out Y_SetLinkBonus because unused 2018-08-14 10:20:56 -04:00
mazmazz
4f5ca26ce5 Attach fade_t thinker to proper control sector upon savegame load 2018-08-13 22:17:58 -04:00
mazmazz
b658598a96 Whitespace 2018-08-13 22:10:16 -04:00
mazmazz
3255fcf26c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof 2018-08-13 14:47:57 -04:00
mazmazz
53303174c1 MaxBonusLives level header option for # of lives in score tally 2018-08-13 14:17:38 -04:00
mazmazz
2a2569155a Deduct marescore when player hits ground 
* ~~For speedrunning~~: Land on the Drone, keep your points!
 2018-08-13 11:12:53 -04:00
mazmazz
c89e48e23c Fix attraction bug on non-NiGHTS and Nightopian Helper 
* Switch from mo->movecount to mo->movefactor for type compat
* Adjust timings for regular and paraloop attraction
 2018-08-12 23:03:12 -04:00
mazmazz
5b61de544c Merge nightsplus-laplogic 2018-08-12 21:20:14 -04:00
mazmazz
42da933c2c Merge from nights-score and use Lap Bonus instead of Link Bonus 
* One BONUSTYPE = NIGHTS option instead of several
* Use NiGHTS Bonus for special stages, not Link Bonus
 2018-08-12 20:56:57 -04:00
mazmazz
83d3099fe3 Change special stage bonus to NiGHTS in-level score, per MB 2018-08-12 20:36:53 -04:00
mazmazz
8ec0865170 Have just one NiGHTS bonus option: NIGHTS and LINK together 2018-08-12 20:25:35 -04:00
mazmazz
b9b2f7cfa7 Make lap bonus more valuable 2018-08-12 20:08:40 -04:00
mazmazz
598614dbb6 Merge branch 'nightsplus-laplogic' into nights-score-lap 2018-08-12 19:59:58 -04:00
mazmazz
921b50550a Totalmarescore typo 2018-08-12 19:59:41 -04:00
mazmazz
d24de8bc2f totalmarescore player variable for NiGHTS scoring 
# Conflicts:
#	src/p_setup.c
 2018-08-12 19:59:34 -04:00
mazmazz
9a9a2d94cc totalmarelap and totalmarebonuslap player variables 2018-08-12 19:57:33 -04:00
mazmazz
d83b96c126 NiGHTS lap score bonus 2018-08-12 19:48:45 -04:00
mazmazz
7d59e1fc70 Merge branch 'nightsplus-laplogic' into nights-score-lap 
# Conflicts:
#	src/p_setup.c
 2018-08-12 19:39:31 -04:00
mazmazz
8d40d8ea43 BONUSTYPE typo; bonus alignment 2018-08-12 19:32:11 -04:00
mazmazz
417d7d105e Totalmarescore typo 2018-08-12 19:26:18 -04:00
mazmazz
c51e84fdfe NiGHTS bonus implementation 2018-08-12 19:25:21 -04:00
mazmazz
baa5d41dca totalmarescore player variable for NiGHTS scoring 2018-08-12 19:21:55 -04:00
mazmazz
269c1a70ba Add lapbegunat and lapstartedtime player variables 
There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
 2018-08-12 14:21:26 -04:00
mazmazz
123eb4bc3e MT_FLICKY_CENTER flag adjustments 2018-08-12 12:49:23 -04:00
Monster Iestyn
f31dcb6357 Added "Tutorialmap" MainCfg option for SOC 2018-08-12 14:30:49 +01:00
mazmazz
200a5fccd0 Make Flicky color, move direction, and flags configurable by A_FlickyCenter var1 2018-08-12 09:23:50 -04:00
Nev3r
effd0ebe97 Merge branch 'horizon-line-hom-fix' into 'master' 
Horizon line HOM fix

See merge request STJr/SRB2Internal!152
 2018-08-12 03:48:20 -04:00
mazmazz
e203edb450 Decouple Flicky Thing logic from spawnpoint variables; use mobj variables 2018-08-12 02:34:37 -04:00
Monster Iestyn
4ab0742604 Make "Tutorial" warp directly to MAPZ0 (not configurable yet) 2018-08-11 21:17:52 +01:00
Monster Iestyn
5534c0519c Add "Tutorial" to the 1P menu, above "Start Game". It doesn't actually do anything yet, mind! 
Also, change said menu's def to start at "Start Game" when entering it for the first time.
 2018-08-11 18:01:54 +01:00
Steel Titanium
cd790eca91 Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
mazmazz
a3946ee154 Merge branch 'nightsplus-laplogic' into nightsplus-le 
# Conflicts:
#	src/p_map.c
#	src/p_setup.c
 2018-08-10 17:24:12 -04:00
mazmazz
70c99ed669 Add lapbegunat and lapstartedtime player variables 
There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.
 2018-08-10 17:12:26 -04:00