Latapostrophe
3349b9b196
forgot to remove this print
2019-02-15 20:53:18 -06:00
wolfy852
6054901c62
Ping kick changes + other quality of life improvements [REDO]
2019-02-15 20:51:44 -06:00
wolfs
5179313c68
Merge branch 'items_off_by_one' into 'next'
...
Items off by one
See merge request KartKrew/Kart-Public!57
2019-02-15 02:18:05 -05:00
wolfy852
3a3dd42b89
Add pogospring to itemenabled
2019-02-13 05:37:13 -06:00
toaster
970a8ee89d
Fix off-by-one errors in item odds, and add a little assert to make an assumption in this function that was being violated more explicit.
2019-02-06 13:28:21 +00:00
Sally Cochenour
1c3fe3ce83
Kill me
2019-02-06 01:31:42 -05:00
Sally Cochenour
094ca5241a
Merge branch 'next'
2019-02-05 22:02:08 -05:00
Sally Cochenour
276e2d3335
Merge branch 'next'
2019-02-05 21:10:55 -05:00
Sal
8a5d740c85
Merge branch 'whitespace' into 'next'
...
Clean up Whitespace
See merge request KartKrew/Kart-Public!56
2019-02-05 19:03:02 -05:00
Sal
13f87088ab
Merge branch 'version-prep' into 'next'
...
Update version to v1.0.3
See merge request KartKrew/Kart-Public!55
2019-02-05 19:02:54 -05:00
Alam Arias
dc5024f94c
remove whitespaces
2019-02-05 15:42:37 -05:00
Alam Arias
cc363086f9
fixup EOL in kart files
2019-02-05 15:36:30 -05:00
Sally Cochenour
9a2e65c61c
Merge branch 'next' into version-prep
2019-02-04 22:22:24 -05:00
Sally Cochenour
8e41f09c59
why does this trigger ERRORMODE now?!
2019-02-04 22:22:12 -05:00
Sally Cochenour
75b0dd3c1b
Update patch.kart hash
2019-02-04 22:02:34 -05:00
Sally Cochenour
f46eab6b8a
Update version
2019-02-04 22:00:36 -05:00
Sal
6b3046ec18
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
3b61cba1a7
The string that got away from my memory
2019-02-04 22:02:40 +00:00
Sryder
76ea671763
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
caba5cb02e
P_NetKeepAlive should also be here because it potentially pauses mid-game!
2019-02-04 21:54:10 +00:00
Sal
b36f73ee46
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
Sal
258a426603
Merge branch 'insta-lookback' into 'master'
...
Lookback camera switches instantly
See merge request KartKrew/Kart-Public!51
2019-02-04 15:44:32 -05:00
Sally Cochenour
fd529f9363
fickle suggestions
2019-02-03 23:23:41 -05:00
Sally Cochenour
26accf087e
Instant lookback
...
Still weird snap but this is as good as it'll get short of throwing away all of the camera code
2019-02-03 23:13:42 -05:00
Sal
b0d9ea537f
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
55bb82eae8
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
503e4f977f
Show WANTED and minimap in battle splits even when p1 is nuked.
2019-02-03 23:37:19 +00:00
Sal
88de3546a5
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
068ee93422
gotta break a few eggboxes to fix a crash
2019-02-03 23:09:09 +00:00
Sally Cochenour
98af218d2c
Merge branch 'next' into ingame-player-cap
2019-02-03 17:23:50 -05:00
Sally Cochenour
a6ac6ecdc5
Missed this
2019-02-03 17:15:33 -05:00
Sally Cochenour
59730c5db6
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
dff5cb049f
rename PT_WIPETIME to PT_BASICKEEPALIVE to be more obvious what it does
2019-02-02 21:53:27 +00:00
Sryder
1bf584c079
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
06b3e265f5
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next
2019-02-02 21:12:49 +00:00
Sal
594c0838e7
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
3f283fd2a9
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
d9f16d2aaf
Offroad code cleanup
2019-02-02 01:43:32 -05:00
Sally Cochenour
6a14d79cf0
Offroad spark fix & sink
2019-02-02 00:58:51 -05:00
Sal
50018a3dab
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
b332a3e163
Tweak incorrect capitalisation.
2019-02-01 18:51:15 -05:00
wolfy852
85f3be5889
Comment out type
2019-02-01 15:45:53 -06:00
wolfy852
b5b4e1fcc8
Skip over type
...
CORRECTLY, this time.
2019-02-01 15:42:29 -06:00
wolfy852
7c18d130f2
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
9ddea94590
Potentially fix 64-bit builds crashing on certain replays
2019-01-31 19:15:28 -06:00
Sally Cochenour
34b027e8ba
Shift around flashing bump stuff
2019-01-30 15:57:46 -05:00
Sally Cochenour
9984f0e217
Reorganize these checks
2019-01-30 15:43:45 -05:00
Sally Cochenour
f3644505be
Increase target cone for Race
2019-01-30 15:41:15 -05:00
Sally Cochenour
3cb468aec8
Add delay to Jawz target switching, set Jawz target when fired
2019-01-30 15:39:29 -05:00
Sally Cochenour
a3cd131017
Don't bump while flashing
2019-01-30 15:02:24 -05:00
