toaster
9acd891394
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
75e8f19f71
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
00befcf281
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
36080cc49a
Merge branch 'master' into next
2018-08-21 15:36:36 +01:00
Monster Iestyn
eb5b5300ab
Merge branch 'XPMupdate' into 'master'
...
update XPM icon
See merge request STJr/SRB2!267
2018-08-21 10:31:25 -04:00
Monster Iestyn
9639c510a4
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
004fd77b41
Merge branch 'master' into next
2018-08-16 22:04:00 +01:00
Monster Iestyn
0792e78254
Merge branch 'lua-sector-names-fix' into 'next'
...
Lua sector names fix
See merge request STJr/SRB2!263
2018-08-16 16:57:41 -04:00
Monster Iestyn
6797976531
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
95c11ef732
Realised I'd forgotten to stop the item explosion from being encoremapped.
2018-08-16 15:29:34 +01:00
toaster
b637ae3d73
Additional oversight corrected.
2018-08-15 16:59:28 +01:00
toaster
2b9068378f
Correct minor issue with random map name selection.
2018-08-15 16:56:26 +01:00
toaster
0b772c2477
Merge branch 'sonicitems' into encore
2018-08-15 16:12:42 +01:00
toaster
42e63fc32e
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
3e63209d68
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
6596d18ada
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
d7f6016e93
Fix alignment of rocket sneaker bar.
2018-08-15 14:05:13 +01:00
toaster
c331432c46
Merge branch 'sonicitems' into encore
2018-08-14 22:17:11 +01:00
toaster
3e96e8417a
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems
2018-08-14 22:16:55 +01:00
toaster
2b56446cb9
Hide non-splitscreen number for natural quantities of orbinaut spikeball.
...
Also, minor code tweaks.
2018-08-14 22:16:33 +01:00
SeventhSentinel
e6021a1e8d
Flashing diff change
2018-08-14 13:15:33 -04:00
toaster
bb3bb48fe6
* 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
7b36e29cf9
Merge branch 'sonicitems' into encore
2018-08-14 15:25:38 +01:00
toaster
ef03450ef6
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
09c1003d03
Merge branch 'sonicitems' into encore
2018-08-13 22:59:38 +01:00
SeventhSentinel
70958f91e5
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems
2018-08-13 17:46:54 -04:00
SeventhSentinel
7e79afd6da
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
797d03e8e4
Merge branch 'sonicitems' into encore
2018-08-13 14:22:52 +01:00
toaster
7b82345948
Fixed battle item respawning (caused by a stupid accidential assignment typo that was my fault).
2018-08-13 14:22:13 +01:00
toaster
c6c367b668
Merge branch 'sonicitems' into encore
2018-08-12 16:18:29 +01:00
SeventhSentinel
a3e6d42815
revert this for the future
2018-08-12 11:17:30 -04:00
toaster
de4468f0e6
Merge branch 'sonicitems' into encore
...
# Conflicts:
# src/info.c
2018-08-12 16:16:21 +01:00
SeventhSentinel
4f213c9b43
added return
2018-08-12 11:12:18 -04:00
SeventhSentinel
5f2e419db3
fakes use MF_SPECIAL, no longer destroyable
2018-08-12 11:04:36 -04:00
SeventhSentinel
8e05aeb825
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
79a848252e
hud stuff
...
eggman nums & rocket sneaker bar
2018-08-12 10:15:55 -04:00
toaster
66092d76e7
Bugfix for "Blue Mountain 0", "Green Hills K".
...
Also, minor tweak.
2018-08-12 15:10:47 +01:00
toaster
880587a740
Merge branch 'sonicitems' into encore
2018-08-12 11:46:21 +01:00
toaster
a8826146b3
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
0b65b7a009
Fixed Encore remappings not being loaded when joining mid-netgame.
2018-08-12 11:20:53 +01:00
Alam Ed Arias
e7eaba0118
Merge branch 'master' into XPMupdate
2018-08-11 21:59:39 -04:00
Alam Ed Arias
ca8de769a8
TravisCI: also remove gcc-6
2018-08-11 21:59:08 -04:00
Alam Ed Arias
5b5013c9b1
TravisCI: gcc-4.9 is also gone
2018-08-11 21:44:07 -04:00
toaster
c07f3be684
Merge branch 'sonicitems' into encore
2018-08-12 01:55:07 +01:00
SeventhSentinel
3b71aa9be3
fixed n blame
2018-08-11 20:54:08 -04:00
Alam Ed Arias
e4317066a6
Merge branch 'master' into XPMupdate
2018-08-11 20:37:34 -04:00
Alam Ed Arias
e7ec2e3830
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
ef81b2d498
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems
2018-08-11 20:19:12 -04:00
SeventhSentinel
8dcee904a5
eggman
...
broken
2018-08-11 20:19:09 -04:00
toaster
a6f8b021b0
Encore mapload linedef executor (number 328), as requested by Oni.
2018-08-11 23:20:05 +01:00