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
1156da88c2
Merge branch 'sonicitems' into encore
2018-08-14 22:17:11 +01:00
746c48af60
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems
2018-08-14 22:16:55 +01:00
9f96be6375
Hide non-splitscreen number for natural quantities of orbinaut spikeball.
...
Also, minor code tweaks.
2018-08-14 22:16:33 +01:00
949417e94b
Flashing diff change
2018-08-14 13:15:33 -04:00
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
2d92aefc29
Merge branch 'sonicitems' into encore
2018-08-14 15:25:38 +01:00
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
6c7bc63587
Merge branch 'sonicitems' into encore
2018-08-13 22:59:38 +01:00
e58d07abd8
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems
2018-08-13 17:46:54 -04:00
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
2d53f13a88
Merge branch 'sonicitems' into encore
2018-08-13 14:22:52 +01:00
6c66de5423
Fixed battle item respawning (caused by a stupid accidential assignment typo that was my fault).
2018-08-13 14:22:13 +01:00
5a6b34c4ca
Merge branch 'sonicitems' into encore
2018-08-12 16:18:29 +01:00
9655dcf350
revert this for the future
2018-08-12 11:17:30 -04:00
57740bcc9b
Merge branch 'sonicitems' into encore
...
# Conflicts:
# src/info.c
2018-08-12 16:16:21 +01:00
995f2a9d06
added return
2018-08-12 11:12:18 -04:00
6fa4c27bf6
fakes use MF_SPECIAL, no longer destroyable
2018-08-12 11:04:36 -04:00
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
ff893f8f63
hud stuff
...
eggman nums & rocket sneaker bar
2018-08-12 10:15:55 -04:00
b7f7da4f6c
Bugfix for "Blue Mountain 0", "Green Hills K".
...
Also, minor tweak.
2018-08-12 15:10:47 +01:00
9f107166f3
Merge branch 'sonicitems' into encore
2018-08-12 11:46:21 +01:00
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
806353c86a
Fixed Encore remappings not being loaded when joining mid-netgame.
2018-08-12 11:20:53 +01:00
8256739052
Merge branch 'sonicitems' into encore
2018-08-12 01:55:07 +01:00
82343719e2
fixed n blame
2018-08-11 20:54:08 -04:00
4ac97eb77b
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems
2018-08-11 20:19:12 -04:00
cde54211c2
eggman
...
broken
2018-08-11 20:19:09 -04:00
dd6259c44f
Encore mapload linedef executor (number 328), as requested by Oni.
2018-08-11 23:20:05 +01:00
000fbe8b52
Merge branch 'sonicitems' into encore
2018-08-11 22:52:24 +01:00
53dd391ac8
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems
2018-08-11 22:52:09 +01:00
6fa0605416
Merge branch 'sonicitems' into encore
...
# Conflicts:
# src/d_main.c
2018-08-11 22:37:17 +01:00
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
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
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
c1a2c2fba4
Merge branch 'sonicitems' into encore
2018-08-10 23:22:28 +01:00
d4eabcf3ad
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
2018-08-10 23:21:57 +01:00
202e98957d
* For testing purposes, show Encoremaps on the level select icons.
...
* HOWEVER, we should seriously address this again later, because the antialiasing DOES result in some unfortunate bullshit...
* Encoremap maces per Oni's request and Sal's suggestion
2018-08-10 21:11:45 +01:00
500b71c0b3
More control over what stuff get Encore mapping applied to it, with sensible defaults so you don't have to do much to your map to get it to be supported!
...
* Objects!
* Gone is the arcane, difficult-to-remember list of random flags. Say hello to MF_DONTENCOREMAP!
* Alternatively, if the object has a skincolour applied to it, it isn't encoremapped either. (Useful for ghosts, for example.)
* Sectors!
* The autodetecting of sneaker and spring panels is now much more intelligent, and only avoids remapping the plane(s) the effect is availible upon.
* Sector special group 2 no. 15 is now "Invert Encore Remap". It inverts the above detection.
* Linedefs!
* The "Transfer Line" linedef flag can now also be used to deny Encore remappings on linedef textures.
* Right now it applies to every pixel drawn specifically belonging to that linedef, but if people decide it needs changing, we CAN make it apply to midtextures only (like linedef types 900-910).
2018-08-10 19:31:30 +01:00
7ee9c5b0f4
Merge branch 'master' into next
2018-08-10 19:31:15 +01:00
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
542b758206
Merge branch 'sonicitems' into encore
2018-08-10 15:39:08 +01:00
a10c0f1bcf
Fix issue where random boxes would become invisible after respawning in race.
2018-08-10 15:38:32 +01:00
c190db903c
Merge branch 'sonicitems' into encore
...
# Conflicts:
# src/st_stuff.c
2018-08-10 15:35:00 +01:00
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
01093f4ca2
Orbinaut x4
2018-08-09 22:52:22 -04:00
a49983a6d1
Lap start animation
2018-08-09 21:52:02 -04:00
a6ca459164
Fix all actionable comments in my review of sonicitems.
2018-08-09 22:59:52 +01:00
145c050e14
...and R_DrawTranslucentSplat_8, even though it isn't used!
2018-08-09 17:08:20 +01:00
5daeaf529f
Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well.
2018-08-09 16:56:43 +01:00
toaster