SeventhSentinel
70958f91e5
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems
2018-08-13 17:46:54 -04:00
SeventhSentinel
7e79afd6da
Use MF_NOCLIPTHING to avoid the 1 tic spawn discrepancy bug on held items
...
I haven't been able to replicate the original bug myself, so I can't tell if it's truly fixed, but this doesn't seem to cause any other issues either.
2018-08-13 17:46:51 -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
a177ac38f4
Merge branch 'nights-dronebox' into nights-ideyaspawn-dronebox
2018-08-13 09:51:14 -04:00
mazmazz
539c323838
Make Drone visual elements react to height change
2018-08-13 09:50:50 -04:00
toaster
797d03e8e4
Merge branch 'sonicitems' into encore
2018-08-13 14:22:52 +01:00
toaster
7b82345948
Fixed battle item respawning (caused by a stupid accidential assignment typo that was my fault).
2018-08-13 14:22:13 +01:00
mazmazz
3170d31708
Correct hitboxradius value; proper sparkle->z when moving x/y
2018-08-13 04:49:32 -04:00
mazmazz
f445d9d934
MT_IDEYAANCHOR: Use type 1714 instead of 1717
2018-08-13 03:18:23 -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
d3a6688601
Merge branch 'nights-dronebox' into nights-ideyaspawn-dronebox
2018-08-13 02:09:52 -04:00
mazmazz
32e922f552
A_OrbitNights: Move donotrescale to bit 19
...
* For compat with `nights-ideyaspawn`
2018-08-13 02:09:00 -04:00
mazmazz
1dab7b2f79
MT_IDEYAANCHOR info and spawn logic
2018-08-13 02:03:36 -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
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
