vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3195 commits 50 branches 7 tags 75 MiB
Commit graph

3195 commits

This branch
This branch
All branches
Author SHA1 Message Date
GoldenTails 761a221840 Merge remote-tracking branch 'STJrSRB2/master' into patch-1 2018-07-05 16:44:34 -05:00
Monster Iestyn e5236c3137 Merge branch 'master' into next 2018-07-05 21:09:39 +01:00
Monster Iestyn 8c56e39c18 Merge branch 'lua-exploit-fix' into 'master' 
Lua exploit fix

See merge request STJr/SRB2!259
 2018-07-05 16:08:08 -04:00
MonsterIestyn d77ba1dab6
Merge pull request #264 from LJSonik/password-security-fix 
Disable admin password by default
 2018-07-05 20:16:19 +01:00
LJSonik 3b39b3b7c8
Merge branch 'master' into password-security-fix 2018-07-05 20:58:00 +02:00
MonsterIestyn 51c6e8d84c
Merge pull request #232 from LJSonik/minor-net-command-fixes 
Minor net command fixes
 2018-07-05 19:56:17 +01:00
LJSonik bd6373bc86
Merge branch 'master' into minor-net-command-fixes 2018-07-05 20:00:38 +02:00
LJSonik 8e3c3a6f65
Merge branch 'master' into password-security-fix 2018-07-05 19:46:36 +02:00
Steel Titanium c8d0eb04f4 Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation 2018-07-05 01:23:56 -04:00
Steel Titanium 44144e379e Merge remote-tracking branch 'upstream/master' into defaultsoundvol 2018-07-05 01:22:39 -04:00
Steel Titanium c61035571b Merge remote-tracking branch 'upstream/master' into md2-fopen-error 2018-07-05 01:21:09 -04:00
Steel Titanium 46aa4c3503 Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix 2018-07-05 01:20:32 -04:00
Steel Titanium 8aee862ff8 Merge remote-tracking branch 'upstream/master' into gme-pause 2018-07-05 01:16:43 -04:00
TehRealSalt 01f1229477 Weight certain shades of MD2 blends 2018-07-05 01:13:21 -04:00
TehRealSalt f29fa5c41e Item odds, SPB fix 2018-07-05 00:38:23 -04:00
TehRealSalt 3169540a8e Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-04 19:07:46 -04:00
TehRealSalt 82734fcf94 Banana drag slowdown, diagonal springs scale to map scale instead of object's scale, OGL skincolors average all colors 2018-07-04 19:06:45 -04:00
toaster 91941830fa Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-04 22:58:18 +01:00
toaster f49b12a705 * Fix the fades mess, and have the title screen always have a smooth, non-checkered fade from blapck! 
* Fix all the bugs with skin not being set properly or kept synchronised with the multiplayer setup in record attack.
* Reduce the amount of flashing on the voting screen.
 2018-07-04 22:57:50 +01:00
Sryder 735ac85ed8 Why I should start using defines instead of magic numbers 2018-07-04 22:37:11 +01:00
Sryder da0c52330e Hopefully some medicine for the characters' sore throats from all that taunting 
Also my editor ate some trailing whitespace.
 2018-07-04 22:25:38 +01:00
SeventhSentinel d25f0b0d7e Killed another file I accidentally made 2018-07-04 16:12:05 -04:00
Monster Iestyn 82d953bbc2 Fixed the Lua crash exploit. 2018-07-04 20:15:36 +01:00
TehRealSalt 327446e367 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-04 13:51:59 -04:00
TehRealSalt fbcf566874 WANTED recalculates on hit, tons of spectator changes 2018-07-03 21:12:25 -04:00
toaster fa2aa98e04 * ACTUALLY fix waiting for players chat. 
* Correct minor bug with blink cursor on IP in multiplayer menu.
 2018-07-04 00:58:32 +01:00
toaster 81f9657f31 Chat messages in the waiting for players screen! 2018-07-03 22:30:22 +01:00
TehRealSalt cbfa6bbe83 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 16:18:39 -04:00
TehRealSalt d0fe935583 Fix joystick menu drawing 
(also it was impossible to pick the 8th joystick, what's up with that?!)
 2018-07-03 16:18:17 -04:00
toaster 37a336a4cf Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-03 21:16:57 +01:00
Sryder 6b3f35813a We use the PRNG far too much to not do consistancy checking on it in race 2018-07-03 21:01:46 +01:00
Sryder 0375ea4f0b Only do Mobj and RNG consistancy checking when actually in a level. 
Mobjs are completely irrelevant outside of levels and the PRNG is not used in a synchronised way in anywhere except when in levels either
 2018-07-03 20:53:37 +01:00
TehRealSalt a6c0a470c6 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 15:38:15 -04:00
SeventhSentinel 9e23e0a8f8 (also killed some extra files I accidentally added, oops) 2018-07-03 15:36:37 -04:00
TehRealSalt 9a716a7cfe Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 15:35:39 -04:00
SeventhSentinel 9e44f6e705 I forgot about dood balloons, oops 2018-07-03 15:34:14 -04:00
TehRealSalt ec6f6cfa70 Fix splitscreen joystick 2018-07-03 15:32:26 -04:00
SeventhSentinel 80c2b56927 Changed all instances of "balloon" to "bumper" 
Also changed "It's you!" to "Select character & color..."
 2018-07-03 15:14:47 -04:00
toaster 249bb594d8 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:29:21 +01:00
TehRealSalt 45ea6cad0a Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 18:25:39 -04:00
TehRealSalt e366233af9 SPB chances no longer lower if you mash 2018-07-02 18:25:15 -04:00
toaster cbb9206c54 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:23:51 +01:00
toaster 08a2a8f3d1 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:23:23 +01:00
TehRealSalt c6f4869700 Item odds adjustment 
Battle no longer does item scaling if you're ahead, only if you're behind. This means less bananas. Also, SPB increased odds, Shrink is less often.
 2018-07-02 18:23:18 -04:00
toaster b0d9110e5f Intermissions... 
* Do the gametype change stuff on the voting screen.
* Make all the picking sound and setting stuff one function, rather than in two seperate places that need to be kept identical.
* Have the timer at the bottom be the highlight colour.
* Map hell! LF2_HIDEINMENU is craftily reused...
* Less allocation and deallocation for the adjacent G_RandMaps.

Other stuff...
* Fix command_map_f not resetting players' score in battle.
* Shiny titlescreen!
* Fix a random bonus newline in one of the quit messages.
 2018-07-02 23:23:04 +01:00
TehRealSalt 2f1601dffd Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 17:58:20 -04:00
TehRealSalt 6698bb5772 Battle finish music, fixed double-wanted bug 2018-07-02 17:57:22 -04:00
Sryder c8f61edea5 Screen for waiting during intermission after connecting 2018-07-02 22:11:03 +01:00
toaster fe8b98ec22 On a hunch, looked it up. Turns out it's a common typo, and that a nickle is actually a type of green woodpecker!! :V 2018-07-02 19:06:05 +01:00
TehRealSalt 3184d2a7b0 Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint 2018-07-02 13:54:01 -04:00