TehRealSalt
db8f23561d
Minor (but important!) polishing
...
- Thunder Shield now attracts rings
- Colorize the ring counter at max yellow
- Rings in the collecting animation are considered for determining if you can't pick up rings anymore, preventing a LOT of rings being deleted from the map over time.
- Flung rings don't lose speed over time anymore
- Flund rings last way longer
- Using rings is much less touchy (holding the button from before an item roulette will let you continue using them until you let go, using certain items won't make you use a couple rings afterwards)
- 0 rings is now counted as debt when getting hit, making debt easier to get out of (getting hit by a spike now would put you at -2 instead of -5)
- Move Super Ring toward the end of the item (so I don't have to modify gfx.kart to fix dropped items)
2019-03-09 04:33:46 -05:00
TehRealSalt
129268121d
Added rings.
2019-03-07 17:11:31 -05:00
wolfy852
096cd50bae
Merge branch 'upsidedown-brain' into next
...
# Conflicts:
# src/k_kart.c
# src/k_kart.h
2019-02-17 20:45:12 -06:00
fickleheart
0bbff7f6d4
[WIP, CRASHES] Save ghost data in netreplays
2019-02-16 12:42:24 -06:00
Sally Cochenour
b2d2d64323
Merge branch 'master' into fortnite
2019-02-04 20:01:20 -05:00
Sally Cochenour
50b23b7512
Add delay to Jawz target switching, set Jawz target when fired
2019-01-30 15:39:29 -05:00
Latapostrophe
4a35b95fbf
Start of a fix for antigrav
2019-01-30 00:30:48 +01:00
TehRealSalt
32030fae57
Reduce easing time, revert changing air speed
2019-01-14 21:37:53 -05:00
TehRealSalt
ff1d433d1e
Tiny SPB fixes
...
- Fix typo that could potentially invalidate the wait phase
- Prevent dying during target phase causing it to redirect to someone else
- Ease speed back up to default whenever slowed down
- SPB intensity now biases against high drift sparks + acceleration, instead of only acceleration.
- Slow speed is scaled w/ SPB intensity too
2019-01-14 02:01:00 -05:00
TehRealSalt
f8a1cf849f
Merge branch 'master' into fortnite
2019-01-08 18:17:09 -05:00
mazmazz
c91ac23ecb
Merge branch 'musicplus-core' into musicplus-feature-postboss
2019-01-07 01:17:07 -05:00
mazmazz
403565e92f
Merge remote-tracking branch 'origin/musicplus-core' into musicplus-feature-postboss
2019-01-07 01:10:54 -05:00
SeventhSentinel
d6255ddbb2
Merge branch 'master' into fortnite
2019-01-02 14:08:10 -05: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
SeventhSentinel
68525de00a
Merge branch 'master' into mobj-scale-global
2018-12-27 13:58:42 -05:00
SeventhSentinel
f3e158320b
Make SPB follow the same rules too
2018-12-13 09:34:27 -05:00
SeventhSentinel
d9a3b37e30
Add a mapobjectscale global
...
Should be no different than it was before, now it's just less tedious to type :V
2018-12-12 21:55:59 -05:00
SeventhSentinel
f35e5d816a
Stupid Orbinaut bullshit
...
- Fix Orbinaut/Jawz not accepting top speed changes (This means back-spam being slower now for real works, and the speed buff on boosters for real works.)
- Make the top-speed buffs for boosters not work for back-spam
2018-12-12 21:25:18 -05:00
TehRealSalt
dfa0522326
Battle Mode overtime
...
After the time limit is up, spawn a shrinking kill-field. This is one hefty initial commit!
2018-12-06 13:46:38 -05:00
TehRealSalt
9a96ca84f9
Un-nerf Mines on activation tic
2018-11-30 03:09:49 -05:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
TehRealSalt
48be0e5246
Nerf activation range of Mines, keep explosion radius
2018-11-28 02:31:16 -05:00
Alam Ed Arias
dac1285e87
Merge remote-tracking branch 'private/master' into EOL
2018-11-27 23:36:09 -05:00
Alam Ed Arias
8dbde3dcd7
fix EOL on src/p_enemy.c
2018-11-27 21:32:15 -05:00
TehRealSalt
55a5d55022
Find bestrank for 7 sec limit enforcement
2018-11-26 07:18:21 -05:00
TehRealSalt
2f79e65144
Make sure spbplace is set better during SEEKING
2018-11-25 20:24:47 -05:00
TehRealSalt
49d653adea
Make the WAIT phase work better with SPB rush
2018-11-25 20:23:09 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
TehRealSalt
0a303dfde9
Make absolute sure spbplace is set in the right places
2018-11-24 20:48:21 -05:00
TehRealSalt
d3fb778a52
Keep track of the place SPB is following
...
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
2018-11-24 20:41:17 -05:00
TehRealSalt
4c003cabe1
More SPB tweaks
...
- SPB can switch off if its target if that person lost the lead for 7 seconds
- Make sure lastlook gets reset when going back to SEEKING
2018-11-24 03:42:25 -05:00
TehRealSalt
a3d8b2af2d
Make SPB slightly fairer on conveyors
...
It is possible to outrun SPB on gramet now
2018-11-21 22:26:33 -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
TehRealSalt
96c7f4511d
SPB retargets the same person after death
2018-11-21 19:22:28 -05:00
TehRealSalt
339a2a6ee6
Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
...
- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
2018-11-11 17:30:30 -05:00
mazmazz
20f1eb6e8e
Add exec to GoldMonitorPop; transfer Angle tag to mobj->lastlook for Lua compat
2018-11-05 07:41:02 -05:00
mazmazz
565879c5e2
Add MTF_EXTRA flag to monitors, to run linedef exec by Angle (Tag + 16384) upon pop
2018-11-04 20:16:33 -05:00
Sryder
f6ff9c603e
Literally a single compiler warning.
2018-11-04 17:37:18 +00:00
TehRealSalt
3d90abf538
Mixed up validity check...
2018-11-03 22:53:12 -04:00
TehRealSalt
9c2767649b
Check for valid source in A_JawzChase, change 1 target rule
2018-11-02 23:51:06 -04:00
TehRealSalt
ab02ea1e1a
Merge branch 'master' into all_hardcode
2018-11-02 01:42:34 -04:00
TehRealSalt
dd28bda75f
Brake drfit effect
2018-10-31 21:35:17 -04:00
toaster
a7940d068b
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_hardcode
...
# Conflicts:
# src/dehacked.c
# src/info.c
# src/info.h
# src/p_enemy.c
# src/p_mobj.c
2018-10-25 10:46:18 +01:00
TehRealSalt
6f76b2b827
Fix merges
...
(Don't bother me hastily to merge something in again, please)
2018-10-24 21:51:43 -04:00
TehRealSalt
a57c6af1f0
Merge branch 'master' into fz-time-over
2018-10-24 21:39:02 -04:00
TehRealSalt
b6f10baa00
Merge branch 'master' into fz-time-over
2018-10-24 21:20:51 -04:00
Latapostrophe
a16864f79e
Resolved conflict
2018-10-25 01:35:55 +02:00
Latapostrophe
ff79a954aa
I'm an idiot and keep forgetting to hit trim trailing space.
2018-10-25 00:59:43 +02:00
Latapostrophe
e654e32b25
Midnight Channel: warning sign hardcode
2018-10-25 00:58:59 +02:00