wolfy852
6feeb1e1f0
Merge remote-tracking branch 'remotes/pub/next' into followme
2019-02-26 17:12:51 -06:00
Sally Cochenour
12dd8e49c0
Merge branch 'next' into minor-item-tweaks
2019-02-22 19:30:52 -05:00
James R
f8928300ec
Rename splitscreen member to something more meaningful
2019-02-22 15:57:44 -08:00
Sally Cochenour
de6c99c9fb
Grow cancel
...
Needs item table changes to make it less OP
2019-02-21 17:04:58 -05:00
Latapostrophe
2b47818d66
Fix respawning in reverse gravity
2019-02-18 14:00:36 +01:00
james
76f2df2c40
Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t
2019-02-16 23:25:50 -08:00
Latapostrophe
92ab2845c8
Followers but they crash when you join netgames
2019-02-14 03:56:28 +01:00
Latapostrophe
4721243ae5
I needed to commit here so I could switch branches to fix magnet hand xd
2019-02-13 10:06:52 +01:00
Latapostrophe
5077ee3ff3
Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart-Public into followme
2019-02-12 18:23:26 +01:00
Latapostrophe
335a86377e
A start on followers
2019-02-12 18:22:58 +01:00
Sally Cochenour
b2d2d64323
Merge branch 'master' into fortnite
2019-02-04 20:01:20 -05:00
Sally Cochenour
3d64a98684
Merge branch 'next' into ingame-player-cap
2019-02-03 17:23:50 -05:00
Sally Cochenour
2c8c994324
In-game player cap & spectator queue
...
Force everyone beyond a certain point to spectate -- spectators get to queue up. In response to me doing a 1v1 match, tons of people wanting to join to watch, and just relying on honor system to prevent mid-joiners. Spectators are prioritized by how long they've been waiting. I'm thinking of hijacking base SRB2's team scramble for a scramble option later.
2019-02-03 16:43:11 -05:00
Sally Cochenour
50b23b7512
Add delay to Jawz target switching, set Jawz target when fired
2019-01-30 15:39:29 -05:00
fickleheart
606659dcff
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-15 19:55:42 -06:00
SeventhSentinel
9490d225de
Minimum speed to get drift sparks
2019-01-06 17:17:52 -05:00
fickleheart
b3432cef05
Don't turn players more than they're allowed to
...
This should account for latency properly.
2019-01-04 23:09:27 -06: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
TehRealSalt
399cc44b93
Group k_killfield with the rest of the v1.0.2 vars
2018-12-06 18:16:13 -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
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
TehRealSalt
668efe9105
Require 3/5ths of checkpoints instead of 1/2
...
This broke MKSC in a minor way if you skip a specific item set and then take the big cut... I'll let it go anyway since its an improvement everywhere else.
2018-11-27 14:28:11 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
TehRealSalt
c2941d6ea5
Item roulette fun-times
...
- Colorize items, Combi-Catcher style, while the roulette is still going. Nice Chaotix reference, and tells you when the game's just lagged.
- Items blink when you first get them! They blink white when you wait out the whole roulette, red when you mash, or rainbow for enhanced items! Blinking prevents items from being stolen too, so items can't be literally stolen before you even have a chance to see what it was.
- New item roulette sound for mashing
- Fix TC_ limits in Lua
2018-11-23 19:15:14 -05:00
TehRealSalt
9223b06ff4
Merge branch 'master' into brake-drift
2018-11-01 17:37:10 -04:00
TehRealSalt
11fa783ace
Merge branch 'master' into brake-drift
2018-11-01 17:35:45 -04:00
TehRealSalt
5b23270433
Merge branch 'master' into battle-visuals
2018-11-01 17:35:01 -04:00
TehRealSalt
0c0a53b2d6
Lap hands touch-up
2018-11-01 16:15:25 -04:00
TehRealSalt
ee033c1ac4
YOU GOT EM
...
Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
2018-10-31 23:34:13 -04:00
TehRealSalt
dd28bda75f
Brake drfit effect
2018-10-31 21:35:17 -04:00
TehRealSalt
b6f10baa00
Merge branch 'master' into fz-time-over
2018-10-24 21:20:51 -04:00
TehRealSalt
e11fe766ef
fzboom.wad hardcode
2018-10-23 17:48:09 -04:00
TehRealSalt
2ae44ab10e
New SPB
...
May not make it to R1, but oh well
2018-10-18 04:43:50 -04:00
TehRealSalt
cdef7f4e1d
New engine sounds
...
9 unique engine classes with 13 sounds each, which smoothly change. Each character sounds distinct now!
2018-10-08 21:31:55 -04:00
toaster
670b7d74fc
angel island drift strat plus ketchup
2018-09-14 00:19:23 +01:00
TehRealSalt
47dd9e2fc2
Drop Dash + alternate start boosts
...
New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker.
Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 01:47:23 -04:00
mazmazz
56d9522a62
Merge branch 'master' into nights-dronebox
2018-09-07 09:06:32 -04:00
TehRealSalt
84d4efe5f1
Boost tweaks
...
Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 13:02:08 -04:00
TehRealSalt
8f11dca314
Boost cam
2018-09-05 11:19:00 -04:00
TehRealSalt
2864c4b272
Camera outrunning
2018-09-04 15:11:14 -04:00
TehRealSalt
2e809548e4
separate var for dashpad cooldown
...
- no longer has weirdness with pw_flashing
- can now have an SA1-style effect for it
2018-08-30 22:27:18 -04:00
TehRealSalt
5fa2ffd26e
Jawz reticule
2018-08-30 19:24:22 -04:00
Monster Iestyn
3c65251bb6
Merge branch 'master' into hud-cleaning
...
# Conflicts:
# src/y_inter.c
2018-08-29 16:39:02 +01: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
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
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
SeventhSentinel
3b71aa9be3
fixed n blame
2018-08-11 20:54:08 -04:00
SeventhSentinel
8dcee904a5
eggman
...
broken
2018-08-11 20:19:09 -04:00
mazmazz
c5d6dd55d5
player->oldscale var for pre-Nightserize scale
2018-08-11 00:49:28 -04:00