James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
TehRealSalt
c6566ec31a
Merge branch 'master' into versus-record
2019-10-03 01:32:59 -04:00
Sal
8338d3e71c
Merge branch 'fortnite' into 'master'
...
Battle sudden death
See merge request KartKrew/Kart!166
2019-10-03 01:27:09 -04:00
TehRealSalt
9a9a1c1374
This shouldn't be merged
2019-09-27 15:31:57 -04:00
James R
1d59d8305d
Remove trailing whitespace
2019-09-26 14:39:23 -07:00
TehRealSalt
7cfcb2f61a
Don't select items in the air or with the Ambush flag for overtime
2019-09-24 02:00:27 -04:00
TehRealSalt
38bb44e732
Separate into k_pwrlv.c, add defines to reduce amount of magic numbers
2019-09-23 08:26:42 -04:00
TehRealSalt
77aeb4663b
Merge branch 'master' into versus-record
2019-09-23 07:03:56 -04:00
TehRealSalt
b8a752e40a
Merge master
2019-09-18 21:47:11 -04:00
TehRealSalt
31534fe96b
Merge branch 'master' into versus-record
2019-05-29 22:23:17 -04:00
TehRealSalt
5c3cac52e6
Merge branch 'master' into rings
2019-05-12 15:28:15 -04:00
TehRealSalt
933ca5c3a4
Add an array for unsynced, HUD animation variables
...
Reduces the size of kartstuff_t, and makes it easy to add even more HUD animations. Fixes viewpoints being wonky for rings.
2019-05-12 14:33:18 -04:00
wolfy852
9ac41cca73
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
Alam Arias
d44a5d1013
fix the array-bounds warning by setting a upper limit
2019-05-09 23:10:23 -04:00
TehRealSalt
7913938427
replace a bunch of local stuff with display stuff
...
Means that changing viewpoints is more reliable
2019-05-07 12:48:16 -04:00
TehRealSalt
3d129ad4ca
Merge branch 'v1' into rings
2019-05-06 23:54:20 -04:00
TehRealSalt
ea2bcb3b99
Update from master
2019-04-19 20:14:06 -04:00
TehRealSalt
089be795a2
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
TehRealSalt
3b352bceea
Better SPB ring locking
...
Now triggers when locked on instead of when out, and has a temporary HUD colorize animation when ring pickup is locked.
also:
- SPB spawns rings more frequently
- There's only a chance for Super Ring while in debt if you mashed at all
- Added Battle fallback items when alone, for the future Break the Capsules
2019-04-09 13:11:55 -04:00
TehRealSalt
583b3bb4a7
2 more tweaks
...
- Ring pickup is disabled while SPB is locked onto you (HUD animation to signify this is not implemented yet)
- Ring afterimages only spawn while in the air, to reduce lag
2019-04-09 12:25:11 -04:00
fickleheart
f60e92aa70
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
fickleheart
be458c1d05
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/doomdef.h
# src/g_game.c
# src/p_user.c
2019-03-19 22:17:25 -05:00
TehRealSalt
40093a9213
Merge branch 'master' into rings
2019-03-12 01:27:11 -04:00
fickleheart
e536252a8a
Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD
...
# Conflicts:
# src/k_kart.c
# src/p_mobj.c
2019-03-11 21:59:45 -05:00
wolfs
f4947820e4
Merge branch 'maxskins-bump' into 'next'
...
Bump MAXSKINS to 128 + Clean up skin struct
See merge request KartKrew/Kart-Public!82
2019-03-11 19:28:16 -04:00
TehRealSalt
12e41dfb00
I *can't stand* waiting an entire minute minimum every time I need to test the tiniest thing -- time limit is now in seconds
2019-03-11 14:05:53 -04:00
TehRealSalt
6aa55bdbe2
Merge remote-tracking branch 'kartpublic/next' into fortnite
2019-03-11 13:49:12 -04:00
wolfy852
19e515d439
Kill all skin flags but SF_HIRES
2019-03-09 23:18:55 -06:00
fickleheart
00e5b59fe2
bah
2019-03-09 20:23:49 -06:00
fickleheart
1743d35fc2
Disable stacking thunder shields
2019-03-09 17:28:05 -06:00
TehRealSalt
8c79e57f89
Don't lose rings with a shield on hit
2019-03-09 16:39:43 -05:00
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
74a757ad69
Merge remote-tracking branch 'kartpublic/next' into rings
2019-03-07 21:31:45 -05:00
TehRealSalt
6803e68420
Fix up item order of operations, spilled rings carry some momentum, don't pick up rings in spinout/wipeout
2019-03-07 21:23:28 -05:00
TehRealSalt
129268121d
Added rings.
2019-03-07 17:11:31 -05:00
Sally Cochenour
354a90330f
Put eggbox sniping behind an #if
...
On second thought, the old method is "sneakier"
2019-03-05 22:06:47 -05:00
Sally Cochenour
75a2ed7534
Add banana snipe sound effect to eggboxes & sinks
2019-03-05 22:02:41 -05:00
Latapostrophe
2b47818d66
Fix respawning in reverse gravity
2019-02-18 14:00:36 +01: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
TehRealSalt
3246ca6b33
More finished power level
...
broken, can't finish
2019-01-16 14:49:42 -05:00
TehRealSalt
553f3a9295
Fix really dumb flags on MT_SPBEXPLOSION
2019-01-14 21:55:10 -05:00
TehRealSalt
1a10499779
Attempt to fix the stupid bug where SPB decides to not hurt
2019-01-14 21:38:38 -05:00
Marco Z
74c57ad447
Kart Public Next merge
2019-01-08 18:43:49 -05:00
TehRealSalt
c6c13bda64
Use mapobjectscale
2019-01-08 18:36:02 -05:00
TehRealSalt
f8a1cf849f
Merge branch 'master' into fortnite
2019-01-08 18:17:09 -05:00
mazmazz
72ff758b07
Dummy out unused functions (OSX xcode errors)
2019-01-02 20:10:53 -05:00
SeventhSentinel
ea9fc3c5a1
Comment these out again
2019-01-02 19:37:01 -05:00
SeventhSentinel
8391dd520a
Add item spinning, turn into papersprites, spawn more orbs
...
Also tried to fix a memory issue I only get from Sev's compiles by removing the need to free memory for this... but didn't fix anything :/
2019-01-02 14:08:00 -05:00
TehRealSalt
b27c709879
a bunch of stuff I left uncommited
2018-12-15 19:14:30 -05:00
