stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-16 01:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity
3257 commits 59 branches 11 tags 93 MiB
Commit graph

3257 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
6c66de5423 Fixed battle item respawning (caused by a stupid accidential assignment typo that was my fault). 2018-08-13 14:22:13 +01:00
SeventhSentinel
9655dcf350 revert this for the future 2018-08-12 11:17:30 -04: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
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
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
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
53dd391ac8 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-08-11 22:52:09 +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
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
d4eabcf3ad Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 2018-08-10 23:21:57 +01:00
Alam Ed Arias
0575d2f1f9 TravisCI: remove gcc-5 test, gcc-5 package is gone 2018-08-10 17:16:26 -04:00
Alam Ed Arias
3479310546 SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
Monster Iestyn
7ee9c5b0f4 Merge branch 'master' into next 2018-08-10 19:31:15 +01:00
Monster Iestyn
653fd3038d Merge branch 'woops!_all_trans' into 'master' 
Woops! All trans

See merge request STJr/SRB2!265
 2018-08-10 14:27:45 -04:00
toaster
a10c0f1bcf Fix issue where random boxes would become invisible after respawning in race. 2018-08-10 15:38:32 +01:00
toaster
1d42a97e08 Wolfs flagged up midi variable stuff in his review so far, so this is a correction in that vein. 2018-08-10 14:25:24 +01:00
TehRealSalt
01093f4ca2 Orbinaut x4 2018-08-09 22:52:22 -04:00
TehRealSalt
a49983a6d1 Lap start animation 2018-08-09 21:52:02 -04:00
toaster
a6ca459164 Fix all actionable comments in my review of sonicitems. 2018-08-09 22:59:52 +01:00
toaster
145c050e14 ...and R_DrawTranslucentSplat_8, even though it isn't used! 2018-08-09 17:08:20 +01:00
toaster
5daeaf529f Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well. 2018-08-09 16:56:43 +01:00
toaster
cd28a95908 Fix two bugs with how I disabled midi music for Kart. 
* Correct the thing where it would print "music not found" when digital music is disabled.
* Make the MIDI music rejection text print if MIDI music is found (and digital music is on).
 2018-08-07 21:51:03 +01:00
toaster
c52a4de933 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_md2.c
 2018-08-07 21:20:27 +01:00
Monster Iestyn
10a2ba8d39 Merge branch 'master' into next 2018-08-07 20:54:19 +01:00
Monster Iestyn
c8ea5cfcaa Merge branch 'transparency_i_hardly_knew_er' into 'master' 
Transparency? I hardly knew 'er!

See merge request STJr/SRB2!264
 2018-08-07 15:29:35 -04:00
toaster
ecc9ebe8c1 Change the order of operations when applying transparency and colormap such that colormap isn't applied to the screen pixel twice (or, in the case of R_DrawTranslatedTranslucentColumn_8, thrice). 
Please note I haven't touched the ASM equivalent, given as it's not actually used.
 2018-08-07 19:12:10 +01:00
toaster
c256f2ae29 * Tweak battle odds in a few ways, as authorised by Sal. 
* Steal a point from Ballhog and give to Orbinaut.
	* Make it based on the maximum number of bumpers someone has, not the average for everyone.
	* Improve the odds a tad if you're Wanted.
	* Tweak the score multiplication to give three points for Wanted and two for removing the last bumper (both disabled if you get the hit with a fake item).
* Allow Karma players to drop their Random box.
	* These boxes flicker out of existence after 15 seconds.
	* Causes a WAIT penalty, too.
* Remove some redundant PF_ATTACKDOWN stuff, given under the conditions the flag would be applied, it has definitely *already* been applied.
 2018-08-06 18:37:03 +01:00
toaster
2abf256531 * Fix various instances where bananadrag might not be reset. 
* Improve K_KillBananaChain to be tail recursive.
 2018-08-06 16:19:07 +01:00
Monster Iestyn
02d2b61866 Merge branch 'master' into next 2018-08-06 15:15:35 +01:00
Monster Iestyn
5943eb125e Merge branch 'lua-archive-long-string-fix' into 'next' 
Fixes for archiving/unarchiving Lua strings in netgames

See merge request STJr/SRB2!262
 2018-08-06 10:12:59 -04:00
Monster Iestyn
8d54d8adaa Merge branch 'password-fix-hotfix' into 'master' 
Password fix hotfix

See merge request STJr/SRB2!261
 2018-08-06 09:43:54 -04:00