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

4250 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
53303174c1 MaxBonusLives level header option for # of lives in score tally 2018-08-13 14:17:38 -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
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
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
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
Alam Ed Arias
e7eaba0118 Merge branch 'master' into XPMupdate 2018-08-11 21:59:39 -04:00
Alam Ed Arias
ca8de769a8 TravisCI: also remove gcc-6 2018-08-11 21:59:08 -04:00
Alam Ed Arias
5b5013c9b1 TravisCI: gcc-4.9 is also gone 2018-08-11 21:44:07 -04:00
Alam Ed Arias
e4317066a6 Merge branch 'master' into XPMupdate 2018-08-11 20:37:34 -04:00
Alam Ed Arias
e7ec2e3830 Merge branch 'xpm_fix' into 'XPMupdate' 
Fix white being treated as transparent.

See merge request STJr/SRB2!266
 2018-08-11 20:36:57 -04: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
Alam Ed Arias
e04d13f647 TravisCI: remove gcc-5 test, gcc-5 package is gone 2018-08-10 17:16:26 -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
Alam Ed Arias
8f6d20d53c SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
mazmazz
2f5186d014 Add lastmarelap and lastmarebonuslap player variables 2018-08-10 16:30:49 -04:00
mazmazz
e10cfa1300 Set player->finishedrings upon new mare 
(Forgot this line from the player->spheres merge, so let's straggle here)
 2018-08-10 16:17:28 -04:00
mazmazz
b7f3f12dd6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le 
# Conflicts:
#	src/p_map.c
#	src/p_setup.c
 2018-08-10 15:51:20 -04:00
Monster Iestyn
20ea372306 Merge branch 'polyobj-sky-plane-crash-fix' into 'master' 
Polyobject sky plane crash fix

See merge request STJr/SRB2Internal!146
 2018-08-10 15:40:43 -04:00
Monster Iestyn
593c41f34f Merge branch 'leveltitle-tinkering' into 'master' 
Leveltitle tinkering

See merge request STJr/SRB2Internal!134
 2018-08-10 15:30:26 -04:00
mazmazz
79d5c553c3 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic 
# Conflicts:
#	src/p_map.c
#	src/p_setup.c
 2018-08-10 15:10:26 -04:00
Monster Iestyn
827da4098d Merge branch 'master' into polyobj-sky-plane-crash-fix 2018-08-10 20:06:12 +01:00
Monster Iestyn
c670b20c25 Merge branch 'master' into change-colormap-ldef 2018-08-10 20:05:04 +01:00
Monster Iestyn
710d940a9b Merge branch 'master' into horizon-line-hom-fix 2018-08-10 20:04:39 +01:00
mazmazz
ef49700a49 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into op-nightshoop 2018-08-10 15:04:14 -04:00
Monster Iestyn
3e80f4a59b Merge branch 'master' into leveltitle-tinkering 
# Conflicts:
#	src/hu_stuff.h
 2018-08-10 20:03:59 +01:00
mazmazz
9f41426008 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nights-inufixes 2018-08-10 15:00:41 -04:00
mazmazz
b680dafdb4 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into flicky-things 2018-08-10 14:58:27 -04:00
Monster Iestyn
1952653f5b Merge branch 'public_next' 2018-08-10 19:36:51 +01:00
Monster Iestyn
877ac62895 Merge branch 'master' into next 2018-08-10 19:31:15 +01:00
Monster Iestyn
0001260b3a Merge branch 'woops!_all_trans' into 'master' 
Woops! All trans

See merge request STJr/SRB2!265
 2018-08-10 14:27:45 -04:00
Digiku
2f7cfcc7b8 Merge branch 'hardcoding-nights-spheredamage' into 'master' 
NiGHTS: Handle sphere damage correctly upon timeout
* Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP
* Handle player->spheres and player->rings consistently

See merge request STJr/SRB2Internal!157
 2018-08-10 13:50:57 -04:00
Digiku
e1e00ecb88 Merge branch 'nights-invertloopfix' into 'master' 
NiGHTS fix lap detection on inverted axis

See merge request STJr/SRB2Internal!138
 2018-08-10 13:49:42 -04:00
mazmazz
b3de1a5f6c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le 
# Conflicts:
#	src/p_setup.c
#	src/p_user.c
 2018-08-10 13:44:47 -04:00
mazmazz
052bd347bb Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic 
# Conflicts:
#	src/p_setup.c
 2018-08-10 13:35:59 -04:00
mazmazz
9591ac92ec Pandora's Box support for player->spheres 
Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.
 2018-08-10 13:15:54 -04:00
MascaraSnake
72796d3d62 Merge branch 'hardcoding-time-again' into 'master' 
Hardcoding time again

See merge request STJr/SRB2Internal!130
 2018-08-10 13:14:53 -04:00
mazmazz
9e8784a376 SETSPHERES console command for debugging/cheating 
Fixed sphere spill bug where no spheres spill if player->rings is 0
 2018-08-10 13:06:53 -04:00
mazmazz
cf48944384 Make bigger default Flicky follow trigger from 128 radius to 320 radius 2018-08-10 04:24:14 -04:00
mazmazz
f8a3343500 Track player's previous mare rings with player->finishedrings. 
There may not be a point to this, other than to be consistent with how spheres are tracked. If non-special stage NiGHTS should tally a ring bonus, this may be useful.
 2018-08-10 04:05:20 -04:00