thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3477 commits 1 branch 12 tags 205 MiB
Commit graph

3477 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
toaster
7250501ed7 Merge branch 'sonicitems' into encore 2018-08-11 22:52:24 +01:00
toaster
5f21a8c925 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-08-11 22:52:09 +01:00
toaster
9bea5525ff Merge branch 'sonicitems' into encore 
# Conflicts:
#	src/d_main.c
 2018-08-11 22:37:17 +01:00
toaster
95da13071d * 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
e8c436ab76 * 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
6cdbb7c896 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
cd790eca91 Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
toaster
81eb742f00 Merge branch 'sonicitems' into encore 2018-08-10 23:22:28 +01:00
toaster
ba573eb9d2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 2018-08-10 23:21:57 +01:00
Alam Ed Arias
e04d13f647 TravisCI: remove gcc-5 test, gcc-5 package is gone 2018-08-10 17:16:26 -04:00
Alam Ed Arias
8f6d20d53c SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
toaster
132dd5828a * 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
toaster
eac0af999d 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
Monster Iestyn
877ac62895 Merge branch 'master' into next 2018-08-10 19:31:15 +01:00
Monster Iestyn
0001260b3a 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
b64c587786 Merge branch 'sonicitems' into encore 2018-08-10 15:39:08 +01:00
toaster
bc3fcc8ed0 Fix issue where random boxes would become invisible after respawning in race. 2018-08-10 15:38:32 +01:00
toaster
670ad8cbd1 Merge branch 'sonicitems' into encore 
# Conflicts:
#	src/st_stuff.c
 2018-08-10 15:35:00 +01:00
toaster
435784d6c0 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