Commit graph

3214 commits

Author SHA1 Message Date
toaster
973b3c3f5e Continuing my recent streak of making random lighting/colormap-related fixes to long-standing bugs:
* Fix that thing where ALL transparent FOF planes were continuously fullbright unless encased in a fog which disables sprite fullbrightness, which was long-hated by many people in the community!
	* For backwards compatibility, setting flag 1 in that fog field (which is probably the most common "in-the-wild" usage of this feature) will continue to make objects un-fullbright.
	* For situations where you desperately want the behaviour to be enabled, you can apply fog flag 2.
* Change the fadestart and fadeend range in which colormaps are generated.
	* The problem HERE was that the darkest light level reached by generated colormaps was actually slightly brighter than the darkest level reached by normal colormaps.
	* The typo I fixed does have SOME basis in fact - standard colormap lumps are 34 (33 in 0-indexing) long rather than 32 (31), but whoever wrote this didn't realise that the code for generating them didn't do it DooM style, just bright-to-dark with no extras on the end...
2018-08-25 16:46:45 +01:00
toaster
a6813ae08e No longer are orbiting/trailing objects in charge of removing themselves.
* They're clearly not quick enough at the job, since it causes a bunch of silly race conditions.
	* Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed.
	* Also, tweak a few places so that trailers AND orbiters can use the same system.
Also, some minor thingies.
	* Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit.
	* Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 15:14:18 +01:00
toaster
e5566df4c2 Fix up the bugs from last night's hell netgame.
* The tab and intermissions rankings...
	* ...now have parity in behaviour!
	* ...now properly handle player counts over 8, and no longer supports player counts over 16!
* The Item Arrow in Battle...
	* No longer develops any extremely stupid bugs due to Orbinaut sprites that makes all objects in state S_INVISIBLE develop <!>'s! (Ask me about this if you're curious as to how it affected everything else too.)
2018-08-24 13:36:03 +01:00
TehRealSalt
b9d55765e9 Spring jump changes for Grow & Shrink
All spring jump issues on the sheet are fixed now.
2018-08-23 12:53:29 -04:00
Monster Iestyn
9d3aad9036 Merge branch 'XPMupdate' into 'master'
update XPM icon

See merge request STJr/SRB2!267
2018-08-21 10:31:25 -04:00
Monster Iestyn
dcf843e485 Merge branch 'defaultsoundvol' into 'master'
Change default sound volume

See merge request STJr/SRB2!238
2018-08-20 09:41:04 -04:00
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
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