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

3388 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn 364339e1ce Merge branch 'sdl_mixer_fixes' into 'master' 
SDL Mixer fixes

Closes #31

See merge request STJr/SRB2!260
 2018-08-16 16:57:14 -04:00
toaster acba635c90 Realised I'd forgotten to stop the item explosion from being encoremapped. 2018-08-16 15:29:34 +01:00
toaster 77ba3e3c2d Additional oversight corrected. 2018-08-15 16:59:28 +01:00
toaster 1d894f36c3 Correct minor issue with random map name selection. 2018-08-15 16:56:26 +01:00
toaster be1e43fc0b Merge branch 'sonicitems' into encore 2018-08-15 16:12:42 +01:00
toaster 485cb3f308 Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do. 2018-08-15 16:12:36 +01:00
toaster c895f45d96 Make some minor tweaks to the two server setup menus (splitscreen and not-splitscreen). 
I wouldn't have done this, but I was already in the code to fix the bugs, so I hit something that was bugging me[/sonic adventure voice] as well
 2018-08-15 15:22:50 +01:00
toaster 7f066fbf60 Add some more safety checks to the item system. 
While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
 2018-08-15 14:40:06 +01:00
toaster 8c5d4dd270 Fix alignment of rocket sneaker bar. 2018-08-15 14:05:13 +01:00
toaster 1156da88c2 Merge branch 'sonicitems' into encore 2018-08-14 22:17:11 +01:00
toaster 746c48af60 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-08-14 22:16:55 +01:00
toaster 9f96be6375 Hide non-splitscreen number for natural quantities of orbinaut spikeball. 
Also, minor code tweaks.
 2018-08-14 22:16:33 +01:00
SeventhSentinel 949417e94b Flashing diff change 2018-08-14 13:15:33 -04:00
toaster 19b2c20bda * Disable inverting on encore level select pictures at unanimous request of last night's netgame. 
* Also, correct their alignment in y_inter.c.
 2018-08-14 15:32:17 +01:00
toaster 2d92aefc29 Merge branch 'sonicitems' into encore 2018-08-14 15:25:38 +01:00
toaster c19a779851 Odds and ends of bugfixing and polish. 
* Flashing Eggman-hit players.
* Fix typo with Rocket Shoe item bar, and make it extensible for potential future purposes since I was fiddling with it anyways.
* More complete playerarrow visuals for various items.
* Eggman fake (and debug) item get sounds.
 2018-08-14 15:23:38 +01:00
toaster 6c7bc63587 Merge branch 'sonicitems' into encore 2018-08-13 22:59:38 +01:00
SeventhSentinel e58d07abd8 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-08-13 17:46:54 -04:00
SeventhSentinel e42acf5371 Use MF_NOCLIPTHING to avoid the 1 tic spawn discrepancy bug on held items 
I haven't been able to replicate the original bug myself, so I can't tell if it's truly fixed, but this doesn't seem to cause any other issues either.
 2018-08-13 17:46:51 -04:00
toaster 2d53f13a88 Merge branch 'sonicitems' into encore 2018-08-13 14:22:52 +01:00
toaster 6c66de5423 Fixed battle item respawning (caused by a stupid accidential assignment typo that was my fault). 2018-08-13 14:22:13 +01:00
toaster 5a6b34c4ca Merge branch 'sonicitems' into encore 2018-08-12 16:18:29 +01:00
SeventhSentinel 9655dcf350 revert this for the future 2018-08-12 11:17:30 -04:00
toaster 57740bcc9b Merge branch 'sonicitems' into encore 
# Conflicts:
#	src/info.c
 2018-08-12 16:16:21 +01:00
SeventhSentinel 995f2a9d06 added return 2018-08-12 11:12:18 -04:00
SeventhSentinel 6fa4c27bf6 fakes use MF_SPECIAL, no longer destroyable 2018-08-12 11:04:36 -04:00
SeventhSentinel 4ea7c26c11 New pickup conditions for fakes 
Instead of checking for item slot, it checks for invincibility or if you already have a fake
 2018-08-12 10:22:28 -04:00
SeventhSentinel ff893f8f63 hud stuff 
eggman nums & rocket sneaker bar
 2018-08-12 10:15:55 -04:00
toaster b7f7da4f6c Bugfix for "Blue Mountain 0", "Green Hills K". 
Also, minor tweak.
 2018-08-12 15:10:47 +01:00
toaster 9f107166f3 Merge branch 'sonicitems' into encore 2018-08-12 11:46:21 +01:00
toaster 832d86e580 Fix two very likely suspects for last night's battle-hoopla. 
* Correct a typo on Sal's part that meant flashingtics would continually grow larger and larger, slowly drifting between different clients.
* A more robust eggmanblame system.
 2018-08-12 11:45:48 +01:00
toaster 806353c86a Fixed Encore remappings not being loaded when joining mid-netgame. 2018-08-12 11:20:53 +01:00
Alam Ed Arias 01a023206f Merge branch 'master' into XPMupdate 2018-08-11 21:59:39 -04:00
Alam Ed Arias 7d3e4f729f TravisCI: also remove gcc-6 2018-08-11 21:59:08 -04:00
Alam Ed Arias b5cc11f7d8 TravisCI: gcc-4.9 is also gone 2018-08-11 21:44:07 -04:00
toaster 8256739052 Merge branch 'sonicitems' into encore 2018-08-12 01:55:07 +01:00
SeventhSentinel 82343719e2 fixed n blame 2018-08-11 20:54:08 -04:00
Alam Ed Arias bb94d9fa3a Merge branch 'master' into XPMupdate 2018-08-11 20:37:34 -04:00
Alam Ed Arias 6603f26772 Merge branch 'xpm_fix' into 'XPMupdate' 
Fix white being treated as transparent.

See merge request STJr/SRB2!266
 2018-08-11 20:36:57 -04:00
SeventhSentinel 4ac97eb77b Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-08-11 20:19:12 -04:00
SeventhSentinel cde54211c2 eggman 
broken
 2018-08-11 20:19:09 -04:00
toaster dd6259c44f Encore mapload linedef executor (number 328), as requested by Oni. 2018-08-11 23:20:05 +01:00
toaster 000fbe8b52 Merge branch 'sonicitems' into encore 2018-08-11 22:52:24 +01:00
toaster 53dd391ac8 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-08-11 22:52:09 +01:00
toaster 6fa0605416 Merge branch 'sonicitems' into encore 
# Conflicts:
#	src/d_main.c
 2018-08-11 22:37:17 +01:00
toaster 35fd7e6a08 * Fix issue with palette not getting reset when heading to intermission. 
* Make map hell maps MUCH less common by ignoring all but the three most recent maps in the buffer for the random option.
 2018-08-11 22:36:14 +01:00
toaster a6d1e799f9 * Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes). 
* A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby!
* Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value.
* Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
 2018-08-11 22:23:40 +01:00
TehRealSalt cc009aca4f Flashing tics length depends on speed stat 
Change to speed-weight when the bump buff gets added
 2018-08-11 00:12:41 -04:00
Steel Titanium d9c7334dea Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
toaster c1a2c2fba4 Merge branch 'sonicitems' into encore 2018-08-10 23:22:28 +01:00