Sally Cochenour
c208147413
Merge branch 'next' into version-prep
2019-02-04 22:22:24 -05:00
Sally Cochenour
4b95aa3da7
why does this trigger ERRORMODE now?!
2019-02-04 22:22:12 -05:00
Sally Cochenour
695471bc67
Update patch.kart hash
2019-02-04 22:02:34 -05:00
Sally Cochenour
41e5b16920
Update version
2019-02-04 22:00:36 -05:00
Sal
9612c0d7c5
Merge branch 'fix-fade-timeout' into 'next'
...
Fix Encore Fade Timeout
See merge request KartKrew/Kart-Public!52
2019-02-04 21:39:33 -05:00
Sryder
8ba981a9cb
The string that got away from my memory
2019-02-04 22:02:40 +00:00
Sryder
d06071943c
Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into fix-fade-timeout
2019-02-04 21:55:19 +00:00
Sryder
10af9db31b
P_NetKeepAlive should also be here because it potentially pauses mid-game!
2019-02-04 21:54:10 +00:00
Sal
dfe3034560
Merge branch 'ingame-player-cap' into 'next'
...
"In-game player" cap
See merge request KartKrew/Kart-Public!48
2019-02-04 15:44:50 -05:00
Sally Cochenour
dad3677b9e
fickle suggestions
2019-02-03 23:23:41 -05:00
Sal
965eacd59e
Merge branch 'split_is_just_a_synonym_for_disappear' into 'next'
...
Split is just a synonym for disappear
See merge request KartKrew/Kart-Public!50
2019-02-03 21:46:59 -05:00
toaster
e36328b631
Change order of operations so that fullscreen stuff is done in front of minimap, to match other two/three players in 3/4p.
2019-02-03 23:50:02 +00:00
toaster
fb35fcb831
Show WANTED and minimap in battle splits even when p1 is nuked.
2019-02-03 23:37:19 +00:00
Sal
d9f3fde39a
Merge branch 'break_a_few_eggs' into 'next'
...
Break a few eggs
See merge request KartKrew/Kart-Public!49
2019-02-03 18:11:34 -05:00
toaster
0d81fb1141
gotta break a few eggboxes to fix a crash
2019-02-03 23:09:09 +00:00
Sally Cochenour
3d64a98684
Merge branch 'next' into ingame-player-cap
2019-02-03 17:23:50 -05:00
Sally Cochenour
f9a535b9b7
Missed this
2019-02-03 17:15:33 -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
Sryder
243240de64
rename PT_WIPETIME to PT_BASICKEEPALIVE to be more obvious what it does
2019-02-02 21:53:27 +00:00
Sryder
21e61fea90
Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into fix-fade-timeout
2019-02-02 21:51:49 +00:00
toaster
d3f739f64a
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next
2019-02-02 21:12:49 +00:00
Sal
5d2d4ccf18
Merge branch '64-crash-fix' into 'master'
...
Fix Record Attack ghosts crashing x64 builds
See merge request KartKrew/Kart-Public!45
2019-02-02 01:45:54 -05:00
Sal
a87185cfb3
Merge branch 'flying-sharks-suck' into 'next'
...
Flying sharks suck
See merge request KartKrew/Kart-Public!46
2019-02-02 01:45:42 -05:00
Sally Cochenour
4679e48a3d
Offroad code cleanup
2019-02-02 01:43:32 -05:00
Sally Cochenour
838c2aa68d
Offroad spark fix & sink
2019-02-02 00:58:51 -05:00
Sal
ef96e6bc3b
Merge branch 'nice_catch_TAG173' into 'next'
...
Tweak incorrect capitalisation
See merge request KartKrew/Kart-Public!47
2019-02-02 00:26:23 -05:00
toaster
b7ea18bb4e
Tweak incorrect capitalisation.
2019-02-01 18:51:15 -05:00
wolfy852
7d05d41cf3
Comment out type
2019-02-01 15:45:53 -06:00
wolfy852
6cdc1f4f24
Skip over type
...
CORRECTLY, this time.
2019-02-01 15:42:29 -06:00
wolfy852
e5885aad6f
Fix replay weirdness
...
Sryder's Pleasure Castle ghost tries to return to England with this line.
2019-01-31 23:21:00 -06:00
wolfy852
d2a286efd7
Potentially fix 64-bit builds crashing on certain replays
2019-01-31 19:15:28 -06:00
Sally Cochenour
8409a0f42c
Shift around flashing bump stuff
2019-01-30 15:57:46 -05:00
Sally Cochenour
f7516f0f00
Reorganize these checks
2019-01-30 15:43:45 -05:00
Sally Cochenour
7ff0245882
Increase target cone for Race
2019-01-30 15:41:15 -05:00
Sally Cochenour
50b23b7512
Add delay to Jawz target switching, set Jawz target when fired
2019-01-30 15:39:29 -05:00
Sally Cochenour
33ac694729
Don't bump while flashing
2019-01-30 15:02:24 -05:00
Sally Cochenour
dded2e7656
Play hit confirm sound for shields
2019-01-30 14:42:24 -05:00
Sally Cochenour
29cb923c36
Speed updates based on number of orbiting items
2019-01-30 14:24:04 -05:00
Sryder
bdee6c7fa0
Fix Connection Timeouts during Wipes
...
Keep the connection alive with a specific packet to say we haven't timed out
2019-01-30 19:18:51 +00:00
Sally Cochenour
9870378c37
Slower orbit, always have 1 orbit item deploy behind you, and higher gravity for Orbinaut/Jawz
2019-01-30 14:14:24 -05:00
Sal
addaf8b143
Merge branch 'thin-the-entire-thing' into 'master'
...
Thin the rest of the TAB/intermission stuff for 9+ players
See merge request KartKrew/Kart-Public!44
2019-01-30 01:58:45 -05:00
Sally Cochenour
e2117f29e2
Thin the rest of this screen's stuff too
2019-01-30 01:21:20 -05:00
Sal
ec1cb23d5c
Merge branch 'item-experiment' into 'next'
...
Item experiment
See merge request KartKrew/Kart-Public!39
2019-01-30 01:19:16 -05:00
Sal
73ce8f4e74
Merge branch 'majormods' into 'next'
...
Allow playing in Record Attack with minor add-ons
See merge request KartKrew/Kart-Public!31
2019-01-29 23:19:57 -05:00
Sal
79002422bf
Merge branch 'offroad-stuff' into 'next'
...
Offroad & wipeout stuff (AKA: piss off salty Metal mains even more)
See merge request KartKrew/Kart-Public!40
2019-01-29 23:17:00 -05:00
Sal
fd69f74007
Merge branch 'expose-serversort' into 'master'
...
Expose serversort to console
See merge request KartKrew/Kart-Public!43
2019-01-29 23:16:43 -05:00
Sally Cochenour
33cef80987
Merge branch 'master' into offroad-stuff
2019-01-29 20:22:15 -05:00
Sally Cochenour
bfeccaebc0
Merge branch 'next' into offroad-stuff
2019-01-29 20:22:11 -05:00
Sally Cochenour
4ea11d339f
Merge branch 'master' into item-experiment
2019-01-29 15:07:04 -05:00
Sally Cochenour
c3d2b63467
Merge branch 'next' into item-experiment
2019-01-29 15:06:58 -05:00
