thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-07-09 07:51:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
25568 commits 2 branches 14 tags 207 MiB
Commit graph

25568 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
b17f3e7e40 Set Drone hitbox radius by upmost 4 bits of Angle 2018-08-12 13:34:27 -04:00
mazmazz
123eb4bc3e MT_FLICKY_CENTER flag adjustments 2018-08-12 12:49:23 -04:00
toaster
c6c367b668 Merge branch 'sonicitems' into encore 2018-08-12 16:18:29 +01:00
SeventhSentinel
a3e6d42815 revert this for the future 2018-08-12 11:17:30 -04:00
toaster
de4468f0e6 Merge branch 'sonicitems' into encore 
# Conflicts:
#	src/info.c
 2018-08-12 16:16:21 +01:00
SeventhSentinel
4f213c9b43 added return 2018-08-12 11:12:18 -04:00
SeventhSentinel
5f2e419db3 fakes use MF_SPECIAL, no longer destroyable 2018-08-12 11:04:36 -04:00
SeventhSentinel
8e05aeb825 New pickup conditions for fakes 
Instead of checking for item slot, it checks for invincibility or if you already have a fake
 2018-08-12 10:22:28 -04:00
SeventhSentinel
79a848252e hud stuff 
eggman nums & rocket sneaker bar
 2018-08-12 10:15:55 -04:00
toaster
66092d76e7 Bugfix for "Blue Mountain 0", "Green Hills K". 
Also, minor tweak.
 2018-08-12 15:10:47 +01:00
Monster Iestyn
f31dcb6357 Added "Tutorialmap" MainCfg option for SOC 2018-08-12 14:30:49 +01:00
mazmazz
01436d2a65 For safety, clear MF_SLIDEME and MF_GRENADEBOUNCE flags before using 2018-08-12 09:28:04 -04:00
mazmazz
200a5fccd0 Make Flicky color, move direction, and flags configurable by A_FlickyCenter var1 2018-08-12 09:23:50 -04:00
toaster
880587a740 Merge branch 'sonicitems' into encore 2018-08-12 11:46:21 +01:00
toaster
a8826146b3 Fix two very likely suspects for last night's battle-hoopla. 
* Correct a typo on Sal's part that meant flashingtics would continually grow larger and larger, slowly drifting between different clients.
* A more robust eggmanblame system.
 2018-08-12 11:45:48 +01:00
toaster
0b65b7a009 Fixed Encore remappings not being loaded when joining mid-netgame. 2018-08-12 11:20:53 +01: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
mazmazz
89cf2b8793 A_OrbitNights make actor scale to target 
* Added `donotrescale` input to disable this behavior
* Reverted previous commit changes for scaling Ideya because unneeded
 2018-08-12 01:07:26 -04:00
mazmazz
b534e01e28 Scale Ideyas when moving to/from NIGHTSDRONE and scaling changes to NIGHTSDRONE 2018-08-11 23:53:07 -04:00
mazmazz
e50f7fa412 NIGHTSDRONE sync visual elements when changing mobj flags 2018-08-11 23:32:12 -04:00
mazmazz
154cfa1171 When NIGHTSDRONE z changes, change DRONEMAN z as well 2018-08-11 23:15:28 -04:00
mazmazz
60025e396b NIGHTSDRONE visual element positioning now works with scaling 2018-08-11 22:41:58 -04:00
mazmazz
f6c39495a8 Fix orbiting Ideya bug, now player gets them back again on exit 2018-08-11 22:13:33 -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
mazmazz
8c63bf9fe8 NIGHTSDRONE visual element position syncing: XYZ and OBJECTFLIP 2018-08-11 21:38:44 -04:00
toaster
c07f3be684 Merge branch 'sonicitems' into encore 2018-08-12 01:55:07 +01:00
SeventhSentinel
3b71aa9be3 fixed n blame 2018-08-11 20:54:08 -04:00
mazmazz
006f33d72f Line fixes for visual element positioning 
# Conflicts:
#	src/p_mobj.c
 2018-08-11 20:50:53 -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
SeventhSentinel
ef81b2d498 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-08-11 20:19:12 -04:00
SeventhSentinel
8dcee904a5 eggman 
broken
 2018-08-11 20:19:09 -04:00
toaster
a6f8b021b0 Encore mapload linedef executor (number 328), as requested by Oni. 2018-08-11 23:20:05 +01:00
toaster
7250501ed7 Merge branch 'sonicitems' into encore 2018-08-11 22:52:24 +01:00
toaster
5f21a8c925 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-08-11 22:52:09 +01:00
toaster
9bea5525ff Merge branch 'sonicitems' into encore 
# Conflicts:
#	src/d_main.c
 2018-08-11 22:37:17 +01:00
toaster
95da13071d * Fix issue with palette not getting reset when heading to intermission. 
* Make map hell maps MUCH less common by ignoring all but the three most recent maps in the buffer for the random option.
 2018-08-11 22:36:14 +01:00