Commit graph

3589 commits

Author SHA1 Message Date
Monster Iestyn 1b7b1f3f79 Fix order of operations messups by adding brackets 2018-09-16 20:25:07 +01:00
Latapostrophe 09287df890 Radius is now a define 2018-09-16 11:16:30 +02:00
Latapostrophe 0bb24a392e Fixed crash when replacing first character. 2018-09-16 11:01:00 +02:00
Latapostrophe ce5abdc6e3 Thunder Shield effect hardcode. 2018-09-16 10:31:24 +02:00
TehRealSalt 7edb99b87a Revert this now that we have ESC functionality
(I mean. I still think this feels nicer than pressing the menu button, but...)
2018-09-15 20:13:29 -04:00
TehRealSalt 649d547209 Buff rainbow sparks 2018-09-15 19:59:39 -04:00
Monster Iestyn 22ee740fa8 Merge branch 'mario-block-sync' into 'next'
Fix for Mario block FOF texture synchronisation in netgames

See merge request STJr/SRB2!279
2018-09-15 10:15:47 -04:00
TehRealSalt 5ec79afad6 Grow/Shrink fixed min speed 2018-09-15 01:29:38 -04:00
TehRealSalt cf7198f765 Updated speed lines 2018-09-15 01:24:29 -04:00
Monster Iestyn 546fa383c1 Make sure that T_MarioBlockChecker is synced in netgames, so that the textures of Mario Blocks can change when there are no more items 2018-09-14 21:01:07 +01:00
TehRealSalt 6532c9ccf7 Add to DeHackEd! 2018-09-14 00:29:39 -04:00
TehRealSalt 6c6ca1a110 Bug fix 2018-09-13 23:49:24 -04:00
TehRealSalt a76e341711 Rainbow sparks 2018-09-13 23:39:41 -04:00
TehRealSalt 981cf69afe Ketchup, faster drift sparks 2018-09-13 23:29:14 -04:00
TehRealSalt 7d4d181715 Speed lines 2018-09-13 20:26:43 -04:00
toaster fadef55b1e angel island drift strat plus ketchup 2018-09-14 00:19:23 +01:00
TehRealSalt ce85c2b7bd Delay falling, longer exit timer 2018-09-13 19:13:43 -04:00
TehRealSalt 250c61dd00 This is a sign
Signpost with the face of the person in 1st falls down at a pre-determined location on race finish (or at the finishing player if none is found)
2018-09-13 17:42:34 -04:00
toaster 32d64a8282 Make these sparks fullbright (thanks, Ancient Tomb!) 2018-09-13 20:51:30 +01:00
toaster ccc615e9b1 Fix a potential crash vector in the shadows code. (It DEFINITELY crashed when I was testing the thunder shield, for example.) 2018-09-13 20:41:37 +01:00
Monster Iestyn 6fbc014ea3 Merge branch 'thwomp-fixes' into 'next'
Thwomp fixes: Don't trigger on spectator; don't trigger on ~FF_EXISTS

See merge request STJr/SRB2!277
2018-09-13 14:47:40 -04:00
toaster 57d333b6b5 Thunder shield stuff!
* Slightly bigger visual size!
	* Light-shadow!
	* Makes player fullbright if you have it!
	* Visuals finally removed instantly on shield drop!
	* Uses dark background for item icons!
	* Goes behind the player on some frames, faking layering!
2018-09-13 19:01:36 +01:00
Digiku 89a6694d67 Don't trigger thwomp on spectators 2018-09-13 11:32:40 -04:00
mazmazz c32c72c401 Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS 2018-09-13 11:32:38 -04:00
toaster fd721d3761 Bugfix sad chao jumping in their sad state 2018-09-13 14:40:50 +01:00
toaster 395a83a56c Dark SPB background 2018-09-13 14:36:48 +01:00
toaster 591ef1e394 Make the chao quieter (if it's still too loud, I can tone it down further, but not by much) 2018-09-13 14:35:20 +01:00
toaster de611874ce Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-13 14:23:36 +01:00
TehRealSalt ec2b4e0dfc Tweak these blues
Try to make all the blues using this range look a little different, you know?
- Cyan is brighter, and has more contrast.
- Teal has 1 more shade of blue for slightly better anti-aliasing.
2018-09-13 03:04:01 -04:00
TehRealSalt eca535d369 Instead of doing productive things, I changed around skincolors again
- Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey.
- Improved Pink & Ruby.
- Added Ketchup, replaced Canary with Mustard.
- Removed Army.
2018-09-13 02:07:00 -04:00
toaster b1db70b38a * Chao audience!
* Replaces the CZ64-era hopping Mario guys.
	* ~50% randomised colours!
	* 1/9 are FANS!
		* On mapload, some Chao select a random player in the server (even spectators) as their idol.
		* The fans cheer for their idol when they cross the finish line in a winning position!
		* They also sob when their idol loses.
	* The remaining percentage are the canon Aqua.
* Minor on-field spikeball/fake radius alterations requested by Oni.
2018-09-12 19:03:45 +01:00
toaster 6f6fcc9615 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/info.c
#	src/sounds.c
#	src/sounds.h
2018-09-12 15:04:53 +01:00
TehRealSalt a794386d8e New drift sparks 2018-09-11 19:52:00 -04:00
Monster Iestyn 3218ab17e0 Merge branch 'master' into next 2018-09-11 16:34:16 +01:00
Monster Iestyn 1199a5f9b4 Merge branch 'colormap-code-cleanup' into 'master'
Colormap code cleanup

See merge request STJr/SRB2!275
2018-09-11 11:31:56 -04:00
toaster fd7bc1c1ac Do a bunch of major modifications to the voting system's rule change system!
* Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency.
	* "Never" - does what it says on the tin.
	* "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full
	* "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps
	* "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change
	* There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense.
* Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps.
* Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
2018-09-11 15:42:53 +01:00
TehRealSalt 2defaa4b74 .PNG error shows lump name 2018-09-10 15:15:14 -04:00
PrisimaTheFox 4ada0b0a9e Update m_anigif.c
Remember gif_frames starts at 0
2018-09-10 17:12:10 +01:00
PrisimaTheFox d26ba2ee54 Update m_anigif.c
More accurate GIF delay.
2018-09-10 17:12:04 +01:00
Monster Iestyn 40ff436829 Remove commented out stuff, now I've confirmed everything works fine without them 2018-09-10 15:49:21 +01:00
toaster 67d57d82bc I was getting annoyed by these arrows and their inconsistency, so I made them use the graphics. 2018-09-10 12:41:53 +01:00
toaster 5b27e597d7 More manual pages, plus renaming the option to Tricks & Secrets (F1) - PLUS, the magic of a little animated how-to for leafing through the pages. Requires new patch.kart, as I wanted the leading zeroes and Jeck wanted to add more pages without more commits later... 2018-09-10 12:39:59 +01:00
toaster 0e6bcee463 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs 2018-09-10 11:43:45 +01:00
TehRealSalt d603d48a61 Don't allow joining 20 sec into the match 2018-09-10 04:29:37 -04:00
TehRealSalt 2c8bf584e4 Quick fix
No other keys bound to this, it should be 0
2018-09-10 03:35:10 -04:00
TehRealSalt 4be1e8b6c2 System menu default 2018-09-10 03:27:05 -04:00
TehRealSalt f4c45877b2 Merge branch 'sonicitems' into sal-misc 2018-09-10 03:22:11 -04:00
TehRealSalt 538abbba99 Make Battle arrows consistent w/ the flashing item change earlier
Should make Hyudoro even more amazing in Battle, since you can tell which held items are off-limits~
2018-09-10 03:17:15 -04:00
TehRealSalt ee94da90b2 Don't let players carry them between levels..........
(In return for not letting anyone experience this silly bug, I made spectators joining before the match starts in Battle spawn with bumpers)
2018-09-10 03:15:46 -04:00
TehRealSalt 6f867274ed Item stuff
- Keep items on death, as long as you haven't used them yet.
- Restart the item roulette on spawn if you die during it.
- Held items that take up your item box now flash, to be consistent with Rocket Sneaker and Grow.
2018-09-10 02:48:10 -04:00