Commit graph

447 commits

Author SHA1 Message Date
toaster 2b7298e959 *A biggie: two-tier intermission screen!
* Have the entire thing slide the fuck away a short while into the intermission.
	* The tab screen is modified to work off similar behaviour and presentation.
* To go with it, a revamp of how Battle's scoring is handled.
	* It's now considered "hits", and is stored in a reuse in one of the vanilla NiGHTS variables, allowing it to use exactly the same ranking mechanisms as race.
	* No more resetting of score between battle rounds.
* Minor, unrelated general code cleanup in places.
* Disable the YEEEAH in splitscreen, otherwise you'll hear it *all the time*.
2018-07-18 20:23:46 +01:00
TehRealSalt 69cefa4450 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-17 20:24:23 -04:00
TehRealSalt 13b16d4a8a Better first person
turning and drifting is now taken into account in the x offsetting
2018-07-17 20:23:22 -04:00
toaster 69b6845029 * A bunch of intermission related stuff!
* Time overs now supported, see below.
	* Ties now supported!
	* Code cleaned up.
	* Play more sonicy tally sounds when counting your points.
* A bunch of time over related stuff!
	* Exitlevel time overs everyone, which means no points for you.
	* F-Zero-sorta-maybe style death if you're the last person on the course (and not the ONLY one) when someone crosses the finish line! (Or switches to spectator.)
* A bunch of music related stuff!
	* Functionally reverted many of my changes to splitscreen and ending music, although the major changes to simplify music code are still kept.
	* P_EndingMusic is genericised across gametypes, and only switches a single letter (and looping-ness) now!
	* Fix exitlevel in race causing whatever you're listening to to keep playing.
	* Make powerups call P_RestoreMusic.
	* Put a call to P_EndingMusic into P_RestoreMusic.
* Unrelated crap.
	* Make all palette swaps happen at the black point of fades, so they don't stick around awkwardly.
	* Huh, I thought I did more than that. Oh well!
2018-07-18 01:21:36 +01:00
TehRealSalt e2a6d5ceb3 Water skipping
No way to disable it yet, let's see if we even need it
2018-07-16 22:51:31 -04:00
TehRealSalt f6e5571948 Chao's requests 2018-07-16 21:27:50 -04:00
toaster 66b59f3dfd Per Sal's request, only show the time/play the failure sound for the current time attack challenge - and if there is none, only show the emblems in a row. 2018-07-16 21:36:27 +01:00
toaster 1d88cdf40d Mammoth commit!
* Deaths in record attack no longer put you into a glitchy singleplayer game-over state that we somehow both kept around and also broke since we branched Kart off of Vanilla..
* Fix non-standard mapscales making the Death Egg respawn octagons dissasemble themselves.
* Allow for MULTIPLE TIME EMBLEMS PER MAP, at least in the emblem UI on the timer. It shows all completed emblems plus the uncompleted emblem up to a total of three.
* Major tweaks to the First Person HUD.
	* I know this was your baby, Sal, and some of the changes may prove controversial - so I've put the ones that are likely to cause the most fuss inside an ifndef block, so that you can toggle it as you please with minimal code changes.
	* Dontdraw-ness, transparency, and colorization match the player's object!
	* Moves around on the screen with respect to the direction of the player object's motion, to make drifting look nicer!
	* Flashes the colour of your drift sparks.
* Did a WHOLE bunch of things with respect to music. I'm not sure how to describe this, so I'll go through step-by-step.
	* Countdowns now play the drowning music again.
	* Removed/disabled extraenous P_RestoreMusics.
	* Made map-ending music called by its own function, P_EndingMusic(player_t *player).
	* Made the ending music play on the LAST player crossing the finishing line in splitscreen, rather than first.
* Make dead players spinout and clip through the floor, at least until we add the new death anims.
* Fix prior pogo spring usage making dead players fall faster.
* Make the time over countdown use the kart font when not splitscreen with 3 or 4 players.
* Removed a weird bonus HWR_DrawCroppedPatch function signature in the hardware header.
2018-07-16 20:19:30 +01:00
toaster e3a1bf2f83 * Lots of Record Attack love!
* Record Attack Input display!
	* Show Record Attack emblem and emblem time on the HUD! Changes colours with the player, just like vanilla internal's.
	* Remove the ugly dark blue box on the singleplayer (including pause screen) whose only purpose in Kart was to contain the Record Attack emblem info!
* Unrelated shit!
	* Improve loading Kart HUD graphics.
	* Fix mirrored HUD graphics being one screen pixel (not basevid pixel) offset.
2018-07-15 23:13:36 +01:00
TehRealSalt c44d4c78f1 Sping panel tweaks
- Spring panels have a higher minimum forward speed, and you can no longer drop below that speed.
- New, separate type of spring panel that has a maximum speed cap, for small jumps.
- Unrelated: The SMK Donut Plains bushes now have much less thinker overhead.
- Unrelated: Fixed my earlier attempt at getting momentum redirect to work when you just hit the ground.
2018-07-13 20:45:18 -04:00
TehRealSalt 4032a14581 Change how battle music/patch is decided 2018-07-12 19:04:37 -04:00
TehRealSalt 6574e1f0fc Shrink debug command, trailing items spawn directly on players, rainbow win 1 is more faithful, make springs more powerful for shrunk players, correct Grow/Shrink fullbright frame 2018-07-12 01:31:33 -04:00
TehRealSalt 81d7b21d43 Rearranged color order
Invincibility should look just a tad smoother now
2018-07-10 22:59:19 -04:00
TehRealSalt f3134830fa Use Periwinkle & Creamsicle instead 2018-07-10 20:27:18 -04:00
TehRealSalt d6c1d67662 Allow K_MomentumToFacing to work when you just hit the floor
(also prevent a crash when Ballhog balls die)
2018-07-10 19:34:45 -04:00
TehRealSalt ffa9143eff SPB distance required changes based on difficulty
You can catch up to 1st faster on Hard vs Normal
2018-07-10 18:37:46 -04:00
TehRealSalt 301d1ffec6 Sound & timer fixes
- Don't decrease spinout when boosting
- Don't increase banana dragging when in the air or if you're not moving (Not sure about this one, just thought that this would feel better than it always increasing once we add the visual effect)
- Play a sound for banana dragging
- Correct finish line sounds
2018-07-10 18:16:53 -04:00
TehRealSalt 0b01c3868f Grow/Shrink flashing 2018-07-10 17:40:47 -04:00
TehRealSalt ec0c358755 Merge branch 'master' into sonicitems 2018-07-08 17:51:44 -04:00
Sryder cd898707d7 Silly fixes to absurd compiler warnings
Thanks toaster
2018-07-07 23:49:34 +01:00
TehRealSalt ba43ed5d48 Squash a few more errors
Updated my compile setup to GCC 6.3, makes it as far as m_misc.c now with ERRORMODE and DEBUGMODE, stops at some gettext related stuff I don't know how to fix now
2018-07-06 21:53:37 -04:00
TehRealSalt 6627483e37 Misc tweaks (mostly color related)
- Smoothed out Ruby & Sepia
- Made Sapphire more distinct from Blue
- Made Navy more distinct from Jet
- MD2 colors weight a few colors even more heavily
- Revised ColorOpposite table
- Fix Wanted not updating on hit
- Very minor item odds adjustment for Battle
2018-07-06 14:22:48 -04:00
TehRealSalt f29fa5c41e Item odds, SPB fix 2018-07-05 00:38:23 -04:00
TehRealSalt 3169540a8e Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-04 19:07:46 -04:00
TehRealSalt 82734fcf94 Banana drag slowdown, diagonal springs scale to map scale instead of object's scale, OGL skincolors average all colors 2018-07-04 19:06:45 -04:00
Sryder 735ac85ed8 Why I should start using defines instead of magic numbers 2018-07-04 22:37:11 +01:00
Sryder da0c52330e Hopefully some medicine for the characters' sore throats from all that taunting
Also my editor ate some trailing whitespace.
2018-07-04 22:25:38 +01:00
TehRealSalt fbcf566874 WANTED recalculates on hit, tons of spectator changes 2018-07-03 21:12:25 -04:00
SeventhSentinel 80c2b56927 Changed all instances of "balloon" to "bumper"
Also changed "It's you!" to "Select character & color..."
2018-07-03 15:14:47 -04:00
TehRealSalt e366233af9 SPB chances no longer lower if you mash 2018-07-02 18:25:15 -04:00
TehRealSalt c6f4869700 Item odds adjustment
Battle no longer does item scaling if you're ahead, only if you're behind. This means less bananas. Also, SPB increased odds, Shrink is less often.
2018-07-02 18:23:18 -04:00
TehRealSalt 2f1601dffd Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 17:58:20 -04:00
TehRealSalt 6698bb5772 Battle finish music, fixed double-wanted bug 2018-07-02 17:57:22 -04:00
toaster fe8b98ec22 On a hunch, looked it up. Turns out it's a common typo, and that a nickle is actually a type of green woodpecker!! :V 2018-07-02 19:06:05 +01:00
TehRealSalt 3184d2a7b0 Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint 2018-07-02 13:54:01 -04:00
toaster e76c328129 Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists...
More menu/highlight things:
* Rename "Default" to "Game type", to make clearer what it's doing.
* Tweak race colouring slightly.
* Put a highlight around the level select icon, and make it consistent with voting.
* Allow setting the highlight colour to affect the intermissions.
* Fix bug with gametype colour getting for record attack.

A handful of skincolour things:
* Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name.
* Fix incomplete Steel Blue -> Steel rename.
* Merge the very similar Blueberry and Sapphire...
* ... so Sapphire can be backported!
* And Ruby too.
2018-07-02 13:20:04 +01:00
TehRealSalt 4ffb80806b Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 03:36:43 -04:00
TehRealSalt b3cae5d633 Revamped colors
- The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more
- Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?!
- Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two.
- Caramel has been removed, Shiny Caramel takes its place.
- Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names.
- Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 03:30:33 -04:00
toaster 6f3febccf5 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 01:55:41 +01:00
toaster 89cce5c461 More menu stuff!
* Center level selection.
	* Re-work Record Attack screen.
	* Re-order MP Main menu, hide in NONET.
	* Combined yeeeah on vote screen.
	* Colour gametype on tab and tally.
	* (unrelated) Don't show "CHECK" if exiting.
2018-07-02 01:55:01 +01:00
TehRealSalt 70c1420a51 Move numingame count after the balloon check 2018-07-01 15:25:10 -04:00
TehRealSalt fb975e7ae7 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-01 15:17:59 -04:00
TehRealSalt f11ee9421e Quick fix 2018-07-01 15:15:45 -04:00
toaster 39b667b0e3 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-01 19:29:29 +01:00
toaster 776c66514d Menu stuff!
* Bar of levels.
* Colourisation!
* New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid!
* New single page statistics screen!
* V_DrawFixedPatch now works at the edge of the screen!

Ghost fixes!
* On minimaps!
* Free memory after use!
* Don't spawn in midair on slopes!
2018-07-01 19:29:13 +01:00
TehRealSalt c00736efac WANTED 2 2018-07-01 14:11:48 -04:00
TehRealSalt 5c7b66cc0f WANTED 2018-07-01 04:36:09 -04:00
TehRealSalt 4a9c3618c3 Reverted scoring back to what it was before, change order-of-operations to allow switcheroos from bombs. 2018-06-30 23:35:38 -04:00
toaster cf6f85a72a Don't look at this commit too closely until after netgame, I want to surprise yalls!!
* Lots of menu changes!
	* Little arrows next to changeable cvars!
	* Show default value for sliders!
	* Pretty pretty pretty.
	* I don't know how to describe some of these changes.
* Effectively nuke MIDI music support!
* Skiddown at the start of a race is more interesting!
* Spinning in waterslides!
* Tiny bugfix in voting, plus a little celebration...
2018-06-30 23:18:13 +01:00
toaster 3295d6302a Merge branch 'sonicitems' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 2018-06-30 16:01:08 +01:00
toaster ba779c6657 * Completely revamp a bunch of menu stuff!
* Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff.
	* Port over the improved MP main menu from internal, including flattening the IP connect onto its level.
	* Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices.
	* Improve the layout of all of the level/gametype select menus slightly.
* (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area.
* (unrelated) Tweak minimap ordering slightly.
2018-06-30 16:01:03 +01:00
TehRealSalt 754a7daa99 GO! interupts the start ambience 2018-06-29 20:15:42 -04:00
SeventhSentinel 041e31efdc Splitscreen items
(also fixed Big Ring flags)
2018-06-28 20:54:06 -04:00
toaster dcb0461a60 * Repair dehacked lists for compiling with DEBUGMODE=1.
* Fix that rat-ass nasty crash with respawning from spectator mode!
* Flying ghost kart for spectator mode! It's silly and fun...
* Allow for .bat files to be .gitignored in the Debug compilation folder too!
2018-06-28 23:58:26 +01:00
toaster a50a67b273 * Modified, maybe-improved title. May need to be selectively reverted, but...
* To go with this, have the HUD fade in as the title goes away.
* After complaints, only do dogear gametype indicators on the voting screen for levels which don't match the prevailing gametype, and use thin font to intrude on the level pic less.
* Make the voting screen background a different graphic in battle.
* Improve behaviour of DrawDiag in GL.
2018-06-28 19:07:04 +01:00
toaster dcec24605e * AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN!
* Super important to allow dedicated servers to continue forever without needing to add Terminal.
    * To facilitate understanding, add gametype dog-ears to the vote screen!
    * To do the above, add V_DrawDiag! Works in GL, too!!
* Unrelated shit!
    * Fix a buffer overrun in the randmapbuffer!
    * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn...
    * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 15:47:56 +01:00
SeventhSentinel a81eff0884 Don't play start countdown several times in splitscreen 2018-06-27 20:51:02 -04:00
toaster f942671607 First substantial commit!
* PRETTY SURE I fixed that bastardacious issue with multiple shield items disappearing at once. Done via introducing lastlook to store the updated count.
* Fix an issue with incorrect scale setting for shield items.
* Clean up a bunch of weird shit with regards to setting of hnext/hprev chains. (Why does the player go on the opposite end to the direction you enter the chain from...)
* Repair hnext chain on mobjremoval as well. May or may not remove the need for overlay/shadow thinkers; too tired/excited to dig into that atm.
2018-06-28 01:20:19 +01:00
SeventhSentinel dd04d68c09 Held item changes 2018-06-27 15:58:43 -04:00
SeventhSentinel 89abdb5fea Fix countdown in splits 2018-06-26 21:19:36 -04:00
SeventhSentinel 10346f5ea9 First person fun 2018-06-26 16:12:42 -04:00
SeventhSentinel 920ce3807f Some fun sound changes
- Peelout sound for sneaker boosts
- Flicky grab sound for stealing balloons
- Adaptive sounds for start boosts (drift boost for sub-optimal boosts, sneaker boost for good boosts, super transform sound for the frame perfect boost)
- Orbinaut rollling sound
2018-06-26 12:02:14 -04:00
SeventhSentinel 1305befcde Disable viewheight cvar and vanilla's irrelevant first person HUD stuff, move Viewpoint HUD to a nicer spot 2018-06-26 11:33:54 -04:00
SeventhSentinel c0aa630c63 Fade-in intro
Also made flashing not-local, again.
2018-06-26 10:14:59 -04:00
SeventhSentinel 5202629246 x1.5 SPB odds
Make normal items slightly more like frantic. If frantic sucks after this then we can just remove its multiplier in that
2018-06-25 21:51:01 -04:00
SeventhSentinel cfaff6d2a8 Ballhog stuff 2018-06-25 18:17:03 -04:00
SeventhSentinel 501bfae9ac Revert MT_FIREBALL to vanilla, remove MT_FIRETRAIL, MT_BALLHOG added, bigger Jawz explosions 2018-06-25 17:12:01 -04:00
SeventhSentinel 11aaad1837 Tweaked item odds in battle
Karma items can hand out x10 banana, and being ahead in Battle is way more focused on removing just your defensive options than making all of your options Orbinaut/Banana/Eggman (there'll still be a lot of those, but it doesn't lower the chance of the other items too badly).
2018-06-25 10:18:29 -04:00
SeventhSentinel 7fdc9c8035 Intro camera can noclip, fix several compile errors 2018-06-25 09:18:30 -04:00
SeventhSentinel d726f82000 Fix up the sink some 2018-06-25 07:28:27 -04:00
SeventhSentinel 18b3d2d14c Spinout type is now passed through K_SpinPlayer
This means we don't have to reset spinouttype's value immediately after using it, which means no more wipeout timer garbage.
2018-06-25 06:58:23 -04:00
SeventhSentinel ab64504213 Kitchen sink is back
Haven't tested yet
2018-06-25 01:36:21 -04:00
SeventhSentinel 16e1569af1 Lakitu murder & countdown improvements
(I'm not SevenethSentienel! I just don't feel like logging out!)
2018-06-24 22:15:22 -04:00
TehRealSalt a8aec0b9e1 Hundreds of tweaks
- SPB multiplier depending on 1st-2nd distance
- Removed the Battle-only k_poweritemtimer (hold over from when you could easily get invuln items all of the time), replaced it with a 2 invincibility item cap in ALL modes.
- Spinout is affected by boosters, *properly*
- Can no longer strafe while spinning out on speed bumps
- Messed with how other items interact with speed bumps, again.
- Old bounce code has been ported for non-players
- Fixed Karma players being able to do anything after the round has ended.
- Fixed sneaker and spinout timer weirdness
- Fixed Mines still being hold-use
- Fixed rubber-burn turn not working
- Removed redundant k_spinout and unused k_boosting variables
- Filled out the Color_Opposite table with Kart's new colors. Not really relevant right now (besides some extra Lua functionality) since nothing uses it, but will be nice for if we do the signpost from the sky idea.
2018-06-19 20:20:06 -04:00
TehRealSalt 8d6a2b7f4f Hyudoro HUD fix
Really minor gripe, but if you stole an item it wouldn't show up until you finished taking it.
2018-06-18 22:43:23 -04:00
TehRealSalt 969401d7a1 Spindash go sound for boosters 2018-06-18 22:29:52 -04:00
TehRealSalt 71e00b23fa Tiiiiny adjustment 2018-06-18 21:53:57 -04:00
TehRealSalt 35ec8a4f6d Finished Jawz, item odds changes, sound effect distance increases 2018-06-18 21:52:26 -04:00
TehRealSalt 612b2a151f Misc tweaks just about everywhere
- More Jawz states for later
- Jawz orbit their user in the right direction now.
- Banana trails made closer to each other
- wheels.lua hardcoded
- All held items take a double press, for consistency.
- Fixed Karma Items not being able to be collected by invincibility or hyudoro users
2018-06-18 00:42:53 -04:00
TehRealSalt e2f60d56d2 Fix 2018-06-17 20:26:13 -04:00
TehRealSalt 2497d9c96c Debug checkpoint, and prevent spinout/booster timers while in the air 2018-06-17 18:10:42 -04:00
TehRealSalt 3aed1df8eb Fix up fake and mine to use the trail code correctly 2018-06-16 20:42:47 -04:00
TehRealSalt ee96b8c735 Add tenfold banana, moved back SPB reach
Reuses triple banana's cvar for now
2018-06-16 20:01:25 -04:00
TehRealSalt d1929d3a37 Linked list bananas, hnext/hprev fixes 2018-06-16 19:57:08 -04:00
TehRealSalt da83809d44 Trailling items
Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 17:54:12 -04:00
TehRealSalt 98c6d0f6d9 Redid how karma bombs/items work. Again
The overlay object now has a hitbox which handles all of the item giving/bombing code, and no longer takes up the player's tracer. This is to give them a bigger hitbox without any bad side-effects of changing the player's hitbox directly (shadow size). Should make bombing more useful, and just sliiiightly less missed high-fives from items.
2018-06-16 00:00:46 -04:00
TehRealSalt bfb4c0fae5 Minor fixes 2018-06-15 03:02:05 -04:00
TehRealSalt 788c98144f Item tweakings
- Mines last twice as long
- Mines can appear in 1st with a measly 5% chance, for maximum ass-blasting
- Mine shiiiiink sound no longer plays globally
- Thrown Bananas and Eggman Monitors bounce off walls like Mines
- Hyudoro can steal from anyone
- Halved invincibility alarm/music distance
- Getting out Orbinaut/Jawz plays a shield sound
- Using Shrink plays a devastating Chaotix sound
- SPB plays a high-pitched wail when it's locked in
- Hyudoro plays a ghosty sound when used
- Fixed Battle arrow roulette
2018-06-15 02:18:43 -04:00
TehRealSalt 3b2d156e7f Mhm. Changing this back. 2018-06-14 20:57:21 -04:00
TehRealSalt 0543d8e0fa Better menus 2018-06-14 20:18:29 -04:00
TehRealSalt b0d6e2606d Fix karma items in this branch 2018-06-13 21:32:33 -04:00
TehRealSalt ed73984d3e Messing with the SPB item odds themselves
I'm pretty sure this is why it feels like we can't hit a decent balance.
2018-06-12 23:01:17 -04:00
TehRealSalt 1bfcb35eff More frequent SPB, and fixed CHECK
The new distance setting on SPB is directly inbetween the previous "way too rare" setting and the "way too frequent" setting before that. Hopefully they should come up in reasonable intervals now.
2018-06-12 17:14:32 -04:00
TehRealSalt 8bb6cc6c19 Shrink buffed HEAVILY
It now does its job properly: repairing races when there is one straggler far in the back.
- Wipeout instead of spinout, to prevent cheap deaths
- Lose all of your items when you get shrunk.
- You cannot pick up any items while shrunk.
- x2 duration.
- Appears in the very back, with 10% chance.
2018-06-12 16:27:51 -04:00
TehRealSalt 35eb978c69 MFE_DRAWONLYFORPx stuff ported to OpenGL, and MT_DRIFTDUST respects Boo powers 2018-06-11 02:15:27 -04:00
TehRealSalt e6b33ef65f SPB fixes
Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 01:51:50 -04:00
TehRealSalt ea3b82791f Whoops, no break here 2018-06-10 21:05:09 -04:00
TehRealSalt a554763128 Maintenence
- Fix merge issues
- Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking
- K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player.
- Comment out a few old MK/vanilla SRB2 effects for now
2018-06-10 16:10:24 -04:00
TehRealSalt 07a18e5185 Merge branch 'master' into sonicitems 2018-06-09 22:50:21 -04:00
Sryder 0a85e75eb8 Accidentally made HitEm sounds always play, even when hitting your own items 2018-06-09 16:42:03 +01:00