thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-05 23:52:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8959 commits 2 branches 14 tags 206 MiB
Commit graph

393 commits

Author SHA1 Message Date
Alam Ed Arias
17768854e0 P_SuperDamage() is too big for inlining 2019-03-25 15:30:25 -04:00
mazmazz
7f0b923107 Merge branch 'public-gl-next' into public-musicplus-jingle 2019-03-15 18:42:19 -04:00
mazmazz
5e06530829 Implement MIXNIGHTSCOUNTDOWN 
An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
 2019-03-14 23:10:14 -04:00
mazmazz
81352aece1 WIP 20190101 merge 
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
 2019-01-02 01:09:15 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
Digiku
7e48af8afd Merge branch 'nights-ideyaspawn-dronebox' into 'master' 
NiGHTS: Ideya Anchor Points

See merge request STJr/SRB2Internal!160
 2018-11-21 21:03:29 -05:00
Digiku
aed64a7c73 Merge branch 'nights-dronebox' into 'master' 
NiGHTS: Drone hitbox improvements and player position correction on Nightserize

See merge request STJr/SRB2Internal!158
 2018-11-21 20:19:39 -05:00
Digiku
5101d6ef36 Merge branch 'nights-fastercapsule' into 'master' 
NiGHTS: Faster Egg Capsule destruct sequence

See merge request STJr/SRB2Internal!164
 2018-11-21 16:30:01 -05:00
Digiku
180a6b3dc2 Merge branch 'nights-onfootcapsulefix' into 'master' 
NiGHTS: Allow player to destroy capsule on-foot before transforming into NiGHTS

See merge request STJr/SRB2Internal!185
 2018-11-21 16:29:37 -05:00
mazmazz
7c48360c2b MP Jingle: A brace (Underwater restore, p_inter.c) 2018-09-21 15:53:03 -04:00
mazmazz
b4ba440c1b MP Jingle: Fix underwater music not restoring on air bubble or shield 2018-09-21 15:44:52 -04:00
mazmazz
77381cd984 musicplus-jingle 2.2 -> 2.1 backport 2018-09-18 15:10:00 -04:00
mazmazz
56d9522a62 Merge branch 'master' into nights-dronebox 2018-09-07 09:06:32 -04:00
mazmazz
2a26f456d4 Stray nights-onfootfix line 2018-09-07 09:01:38 -04:00
mazmazz
520ee1e189 Revert "Ideya fixes when a player has more than one Ideya" 
This reverts commit fe37d1e3e0.
 2018-09-07 08:56:53 -04:00
mazmazz
6b97930889 Merge branch 'master' into nights-fastercapsule 2018-09-07 08:56:02 -04:00
mazmazz
54084b8aa4 Merge branch 'master' into nights-keeppoints 2018-09-07 08:13:57 -04:00
mazmazz
dcca56bc04 Dummy out NiGHTS item faster attract 2018-08-30 10:50:03 -04:00
mazmazz
631a053e92 Merge remote-tracking branch 'origin/master' into nights-inufixes 2018-08-30 08:13:34 -04:00
Monster Iestyn
3c65251bb6 Merge branch 'master' into hud-cleaning 
# Conflicts:
#	src/y_inter.c
 2018-08-29 16:39:02 +01:00
mazmazz
2ee3228ee4 Merge remote-tracking branch 'origin/master' into nightsplus-laplogic 2018-08-29 10:16:49 -04:00
Monster Iestyn
dc6b52a449 Add INFLIVES macro, to make it easier to find infinite lives-related code 2018-08-23 20:09:39 +01:00
mazmazz
1381ffc3e6 Fix NiGHTS Bumper player positioning 2018-08-15 18:42:20 -04:00
mazmazz
9129f17ab0 Look for two anchorpoints if player has two Ideyas 
* Undid "optimization" of checking player->exiting first because the last Ideya's orbit won't be adjusted
 2018-08-14 17:48:14 -04:00
mazmazz
0838a81dd9 Ideya fixes when a player has more than one Ideya 
# Conflicts:
#	src/p_inter.c

# Conflicts:
#	src/p_inter.c
 2018-08-14 17:28:51 -04:00
mazmazz
0a110d9ef4 Ideya fixes when a player has more than one Ideya 
# Conflicts:
#	src/p_inter.c
 2018-08-14 17:21:49 -04:00
mazmazz
fe37d1e3e0 Ideya fixes when a player has more than one Ideya 2018-08-14 17:13:23 -04:00
mazmazz
d321ec83e1 Fix issue where player cannot destroy the NiGHTS Capsule if they have not transformed to NiGHTS 2018-08-14 14:18:18 -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
87fc89d110 Make anchoring non-specific to Ideya states (now anchor anything!) 
# Conflicts:
#	src/p_inter.c
 2018-08-13 02:19:53 -04:00
mazmazz
d3d837392f Ideya anchoring optimization 2018-08-13 02:17:29 -04:00
mazmazz
ef9a03b021 Anchor Ideya logic 
# Conflicts:
#	src/p_enemy.c
#	src/p_inter.c
 2018-08-13 02:17:07 -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
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
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
f6c39495a8 Fix orbiting Ideya bug, now player gets them back again on exit 2018-08-11 22:13:33 -04:00
mazmazz
d8cafeba7d Remove A_OrbitNights additional input offset on current target Z, don't need it 2018-08-11 12:06:50 -04:00
mazmazz
46f1463595 Scale player to Drone's scale on Nightserize, and reset scale on De-Nightserize 
* Also correct player's position to Z center of Drone hitbox on Nightserize
 2018-08-11 02:02:56 -04:00
mazmazz
6f1b9de436 Switch Ideya orbiting state to centered offset states when orbiting around Drone 2018-08-11 00:09:02 -04:00
mazmazz
60f6792ad0 Basic implementation for player position correction to Drone center 
* player->drone mobj variable
* P_MoveNiGHTSToDrone, will change later
 2018-08-10 19:25:49 -04: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
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
37b50ca5a4 Tag damage fix error 2018-08-10 02:34:21 -04:00
mazmazz
674b9e918f Correct player->spheres deduction upon losing spheres 
player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level.

Therefore, just deduct player->spheres.
 2018-08-10 02:18:34 -04:00
mazmazz
c2f81eaf8f MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation 2018-08-10 02:18:24 -04:00
mazmazz
4d4e52d981 Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option 2018-08-09 23:14:14 -04:00
mazmazz
9d8af5da01 Snappier NiGHTS pickup attraction 
* Old attraction is still used for non-NiGHTS players due to a momentum bug. The old way is good enough to sidestep the bug.
* Thanks Inuyasha (KS) for original code 🐶
 2018-08-09 21:24:01 -04:00
Monster Iestyn
1c30318bd3 fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype) 2018-07-02 21:03:04 +01:00
toaster
05afb28b57 Fix the starposts not being cleared properly. 2018-06-12 02:26:42 +01:00