Commit graph

2439 commits

Author SHA1 Message Date
TehRealSalt d0fe935583 Fix joystick menu drawing
(also it was impossible to pick the 8th joystick, what's up with that?!)
2018-07-03 16:18:17 -04:00
toaster 37a336a4cf Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-03 21:16:57 +01:00
Sryder 6b3f35813a We use the PRNG far too much to not do consistancy checking on it in race 2018-07-03 21:01:46 +01:00
Sryder 0375ea4f0b Only do Mobj and RNG consistancy checking when actually in a level.
Mobjs are completely irrelevant outside of levels and the PRNG is not used in a synchronised way in anywhere except when in levels either
2018-07-03 20:53:37 +01:00
TehRealSalt 9a716a7cfe Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 15:35:39 -04:00
SeventhSentinel 9e44f6e705 I forgot about dood balloons, oops 2018-07-03 15:34:14 -04:00
TehRealSalt ec6f6cfa70 Fix splitscreen joystick 2018-07-03 15:32:26 -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
toaster 249bb594d8 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:29:21 +01:00
TehRealSalt 45ea6cad0a Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 18:25:39 -04:00
TehRealSalt e366233af9 SPB chances no longer lower if you mash 2018-07-02 18:25:15 -04:00
toaster cbb9206c54 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:23:51 +01:00
toaster 08a2a8f3d1 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:23:23 +01: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
toaster b0d9110e5f Intermissions...
* Do the gametype change stuff on the voting screen.
* Make all the picking sound and setting stuff one function, rather than in two seperate places that need to be kept identical.
* Have the timer at the bottom be the highlight colour.
* Map hell! LF2_HIDEINMENU is craftily reused...
* Less allocation and deallocation for the adjacent G_RandMaps.

Other stuff...
* Fix command_map_f not resetting players' score in battle.
* Shiny titlescreen!
* Fix a random bonus newline in one of the quit messages.
2018-07-02 23:23:04 +01: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
Sryder c8f61edea5 Screen for waiting during intermission after connecting 2018-07-02 22:11:03 +01: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 0b9b7c3371 Tweak player setup menu. 2018-07-02 14:43:52 +01: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 ce4136a901 Fix Ghost z not being set properly. Again. 2018-07-02 01:55:13 +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 d4556cfe25 Fix another whoopsie! 2018-07-01 20:03:01 +01:00
toaster e4ec7e1567 Correct outdated text. 2018-07-01 20:01:48 +01: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 2f8801902f Fix scale issues with karma hitbox if recently used Grow 2018-06-30 23:49:37 -04:00
TehRealSalt 72ed94bfcf Reset scores between Battle matches for now
I want to tackle the two intermission screens whenever I do the same for Race
2018-06-30 23:43:45 -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
Sryder 5c2110dafe Fix the issue with timing out when joining during intermission 2018-07-01 03:06:34 +01:00
TehRealSalt e4c96fcd7f Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-06-30 21:19:54 -04:00
TehRealSalt 389cd7ea7d Little things 2018-06-30 21:18: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 0ba127c435 Unused vars 2018-06-29 22:17:36 -04:00
TehRealSalt 754a7daa99 GO! interupts the start ambience 2018-06-29 20:15:42 -04:00
toaster 9a9e1ad81e * Rework min/max cvars to allow for "named" values! They probably won't work if they're inside the range, but...
* Combine the numlaps and usemapnumlaps functionality on the menu into basenumlaps, which numlaps is set to every race start, except when it's map default value (0) in which case it loads the map's lap count.
2018-06-29 17:49:02 +01:00
toaster d2a8414dee * Properly handle gametype changes when a different-gametype level pops up on the voting screen.
* Defer the change until you're actually modifying the map, in service of the following.
	* Reset score.
	* Call that gametype change function.
* Collary of the above: Don't reset score if you're `map mapxx`ing in the console, unless it's `force`'d.
* Fix the basic, obvious issues that'd prevent us shipping with the new level title system.
	* Correct the non-green resolution support, which was ALMOST there but which I accidentially fucked up one of the signs on.
	* Adjust the subttl position if it'd get overwritten.
	* Draw the gametype with the subttl.
* Adjust the gametype constants for easier gametype_cons_t array access.
2018-06-29 15:14:43 +01:00
SeventhSentinel 25cd3cc093 A minor tweak 2018-06-28 21:19:58 -04:00
SeventhSentinel 041e31efdc Splitscreen items
(also fixed Big Ring flags)
2018-06-28 20:54:06 -04:00
SeventhSentinel 495e9034ae Fun quit messages
Press the 'N' key to unlock the Golden Kart!
2018-06-28 19:35:52 -04:00
SeventhSentinel 024adee9da Merge branch 'sonicitems' of http://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-06-28 19:07:16 -04:00
SeventhSentinel 94cb3821f6 Chaotix big ring replacement
(Sev *actually* did this, not Sal! She's very proud :p)
2018-06-28 19:07:12 -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 c815e3b791 Fix player afterimages not using correct angle on bounce pads or spinout 2018-06-27 21:02:22 -04: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 18f74e880a ssplayer -> viewnumber 2018-06-27 13:14:22 -04:00
SeventhSentinel 06646252c1 Up ghost tics on ballhog 2018-06-27 10:37:19 -04:00
SeventhSentinel bd5c2d0720 Use patch.kart instead, almost finished Ballhog 2018-06-27 10:10:53 -04:00
SeventhSentinel 89abdb5fea Fix countdown in splits 2018-06-26 21:19:36 -04:00
SeventhSentinel fb2a6b53c2 Fixed a bit of redundancy, pointed out by Sryder 2018-06-26 18:04:07 -04:00
SeventhSentinel 88f8b4d852 Extend mobj->colorized to work on... well, mobjs
Previously would only work on players. Now karma items should be easier to spot as intended!
2018-06-26 16:46:47 -04:00
SeventhSentinel 10346f5ea9 First person fun 2018-06-26 16:12:42 -04:00
SeventhSentinel 0f36c6a96d Final lap sound 2018-06-26 12:11:43 -04:00
SeventhSentinel a4b45936d3 Autoload sonicitems.wad for convenience 2018-06-26 12:05:54 -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 6b222c4935 Fix wheels lingering after comeback 2018-06-25 07:41:49 -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 aa4398f7b9 Noclip camera
It doesn't FEEL like it noclips, but...
2018-06-25 01:20:22 -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 5ef58e30bd Fuck 2018-06-18 22:31:57 -04:00
TehRealSalt 969401d7a1 Spindash go sound for boosters 2018-06-18 22:29:52 -04:00
TehRealSalt 794274fe6e The S3K sounds missing in vanilla 2018-06-18 22:11:41 -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
wolfy852 8abeae7805 Chat Manager 2018-06-15 05:20:01 -05:00
TehRealSalt b71471d1ba More poof 2018-06-15 03:45:59 -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 10d09d3dd8 Tiny menu header tweaks
Screenshot Options has its own header, intermission "Result" header is automatically centered
2018-06-14 20:46:07 -04:00
TehRealSalt e1a8267563 More lenient bombs
They can now blow up after they first stick their spikes out in the deploy animation. They also make a spikey sound effect to indicate when they can blow up.
2018-06-14 20:23:04 -04:00
TehRealSalt 0543d8e0fa Better menus 2018-06-14 20:18:29 -04:00
TehRealSalt 118721ebc1 Random items poof instead of sparkle
Also added a poof when they respawn in Battle
2018-06-13 23:37:37 -04:00
TehRealSalt ff09a51915 Fix invincibility white flash
Calls P_TeleportMove instead of A_CapeChase, object was given a dispoffset
2018-06-13 22:24:31 -04:00
TehRealSalt 8f9595b72f Readd voting cheating, just in an entirely different way
Will need tested for desyncs, since it adds some RNG into the vote ticker. Which may or may not matter.
2018-06-13 21:58:21 -04:00
TehRealSalt 5f4c0bb052 Different, nicer way of doing fakeouts
Means it can no longer cheat, but I never saw it cheat in action anyway.
2018-06-13 21:47:27 -04:00
TehRealSalt c818689dc1 Fix player arrows in this branch again 2018-06-13 21:33:55 -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 d5f311681f Voting fakeouts
The voting cursor can land early, or go up a position, on vote end. Not only is this hilarious and makes it more unpredicatable, it also makes it easier for the game to pick a vote and move on to the next level .

(I bet people will mistake this for a bug on release :V)
2018-06-12 22:10:26 -04:00
TehRealSalt d1e206072a Minor vote screen fixes 2018-06-12 19:05:11 -04:00
TehRealSalt 510cf8b521 Fix a few minor player arrow bugs 2018-06-12 18: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 e415bae2e5 Forgot to uncomment after finished testing. 2018-06-11 01:56:41 -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 a417b57bc7 Fixed Battle arrows 2018-06-11 00:59:20 -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 fffa3db5a8 Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:Sryder/SRB2.git
# Conflicts:
#	src/hardware/hw_main.c
2018-06-09 23:43:25 +01:00
Sryder ea915e5778 Fix papersprites more for real this time
(Seperate AL and AR sprites were broken, I figured out I was a dunce, oh noey)
2018-06-09 22:58:03 +01:00
Sryder 82b92d1881 Fix the issue from the merge 2018-06-09 22:25:00 +01:00
Sryder 00ac4dd59b Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:STJr/SRB2.git
# Conflicts:
#	src/hardware/hw_main.c
2018-06-09 21:01:59 +01:00
Sryder 0f4e8c1eda Merge branch 'next' into public_flatsprite
I also fix papersprites in regards to flipping on one sprite fits all rotation stuff

# Conflicts:
#	src/hardware/hw_main.c
2018-06-09 18:47:42 +01:00
Sryder 0a85e75eb8 Accidentally made HitEm sounds always play, even when hitting your own items 2018-06-09 16:42:03 +01:00
Sryder 2adbcd6dfd Merge branch 'master' into dust-kart 2018-06-09 01:00:03 +01:00
Sryder 17245b2d6b Merge branch 'master' into voice-loss-jpg
# Conflicts:
#	src/k_kart.c
2018-06-09 00:56:39 +01:00
Sryder 10270d20dd HitEm voice line can always play
Still starts the timer to at least 3 seconds on other voices though
2018-06-09 00:18:49 +01:00
Sryder 3daf6fbfd7 Slightly longer delay between voices
Fix win/lose quotes to work based on actual win/lose criteria
Don't play overtake sound until at least 10 seconds into the race
2018-06-09 00:05:05 +01:00
Sryder f00e3dfd5a New Drift dust
Applies all the time as long as the object is turning tight enough
New Sound
Works on Red Shells too!
2018-06-08 21:13:52 +01:00
TehRealSalt 3dac0e21cc A better method of
Instead of returning at the very start of P_MoveChaseCamera, just set camstill to true, and add another exiting check to momentum. This lets the mirror mode post process effect to continue working.
2018-06-08 01:12:07 -04:00
TehRealSalt 4e2b30fcae Fixes 2018-06-08 00:02:28 -04:00
TehRealSalt 889d790ea0 Disable MT_QUESTIONBOX again
I refuse to give up the name "cv_invincibility" to another vanilla cvar that we will never use seriously.
2018-06-07 19:46:48 -04:00
TehRealSalt 9b3751b30c Merge branch 'master' into sonicitems 2018-06-07 19:39:45 -04:00
Sryder 97caf79f16 Whoops, accidental rename 2018-06-07 20:03:47 +01:00
Sryder 213749b115 Big voices change
When using a taunt voice (item usage) there's a 5 second delay on more taunts and a 2 second delay on other voices
When using other voices, there's at least a 2 second delay on all other voices
2018-06-07 19:56:26 +01:00
Sryder 6023f794ac Restore the removed voices 2018-06-07 19:34:13 +01:00
TehRealSalt 7f996c6dfd P_RestoreMusic fix 2018-06-07 02:51:18 -04:00
TehRealSalt 7611f2c610 1v1 battle no items fix 2018-06-06 20:52:13 -04:00
TehRealSalt 7100db62ca No bumping when respawning 2018-06-06 20:41:23 -04:00
TehRealSalt adc1fa38f5 This print doesn't work for some reason?!
It keeps replacing actnum with zonttl, but ONLY if zonttl is set. Weird as heck, can't figure out why, commenting out for now.
2018-06-06 20:25:28 -04:00
TehRealSalt babc8be5da Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support
(also more item changes from last night that I just forgot to commit earlier)
2018-06-06 18:36:39 -04:00
TehRealSalt eb8464744b Adjustin' BL based off the netgame, and mashing is back
Now it just cripples your chances for good items, mwaha
2018-06-05 23:46:25 -04:00
TehRealSalt 6301d0ee38 Lightning cooldown change
- Lightning cooldown reduced to 20 seconds
- You can no longer mash to get an item quicker
2018-06-05 21:45:54 -04:00
TehRealSalt 5f610982ea The Lightning Update
- 30 sec cooldown on all lightning types
- Delay before Blue Lightning hits, based off of distance
- Blue Lightning can swap targets if 1st place is passed
- Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-05 21:36:48 -04:00
TehRealSalt 8de3890f26 Dang it, I always forget these... 2018-06-05 18:47:15 -04:00
TehRealSalt e39de53fa2 Use strlen for all of the valid zone title/act num checks 2018-06-05 17:28:46 -04:00
TehRealSalt d3793cb19c Lots of cmd restructuring.
- cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster.
- Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now.
- Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request.
- Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 17:12:42 -04:00
TehRealSalt 173d780ab7 P_RestoreMusic restores level exit music as well
Splitscreen fix
2018-06-05 02:41:55 -04:00
TehRealSalt ce14c13699 Multiplayer cursors in voting 2018-06-05 02:11:47 -04:00
TehRealSalt 0fc113e6dd actnum is now a 2 character long string
For Cloud Cradle Zone, Act K
2018-06-05 01:34:05 -04:00
TehRealSalt 14caf66567 MFE_JUSTBOUNCEDWALL
Hopefully, this should prevent instances where shells/Oni get caught on walls.
2018-06-04 23:23:52 -04:00
TehRealSalt d5a2fb9317 Disable weather in netgames
Some people like to lag up the whole server by enabling precip, so y'know what, just turn it off in netgames. Weather can just stay a Record Attack/splitscreen only feature now I guess
2018-06-04 22:56:58 -04:00
TehRealSalt b4757779cd We did it, we finally fixed... The Shell Boost Bug
Instead of adding to your speed, it relatively multiplies it if you're above your top speed. This is applied to ALL of Kart projectiles as well, not just shells. May we never run into our own shell that we threw on a boost pad ever again.
2018-06-04 22:53:45 -04:00
TehRealSalt dd05edfcc0 Merge remote-tracking branch 'srb2public/next' 2018-06-04 16:58:35 -04:00
TehRealSalt ae66a8f769 Minimap offset support 2018-06-04 16:19:36 -04:00
TehRealSalt 09311bf061 WHOOPS 2018-06-04 00:29:31 -04:00
TehRealSalt 518676c2a4 P, not K 2018-06-03 21:07:36 -04:00
TehRealSalt fa125bc18d Leave the camera behind while exiting, for dramatic effect! 2018-06-03 21:01:59 -04:00
TehRealSalt 6d57d39e12 SUPER CHARGED KARMA ITEMS
They give equal chance on a lot of good shit, instead of the normal boring pool of items, mwahaha

(also calls P_CheckRacers when someone spectates)
2018-06-03 20:58:52 -04:00
TehRealSalt e3008407d1 Adjustin' to Oni's requests
Only 1st place finish sound is global, use signpost instead of starpost
2018-06-03 20:19:03 -04:00
TehRealSalt 8408b1fef4 Some Battle fixes and additions
- mapgotboxes is synched
- Karma bombs/items flash while spinning out
- Karma bombs have a sound + explosion when hitting someone
- Karma bombs can no longer attempt to attack a player that is flashing and have to WAIT... again
- Fixed MT_GREENITEM's bounce sound, after breaking from last commit (WHY ARE YOU ABUSING MARIO MODE SOUNDS, STOP, AGHH)
2018-06-03 20:11:08 -04:00
TehRealSalt 0906978a2a Remove collide debug stuff 2018-06-03 18:58:50 -04:00
TehRealSalt b0099bd1cc Less timer reduce on gold shroom 2018-06-03 18:25:28 -04:00
TehRealSalt a223218155 Exit siren, disable constant forcing of Mario Mode sounds 2018-06-03 18:20:21 -04:00
TehRealSalt 483ac75238 Support ALL of the classic games' sounds
Sonic 1, 2, 3D Blast, & CD, on top of the existing S3K and Chaotix.
2018-06-03 16:13:26 -04:00
Monster Iestyn bf042ed86c Merge branch 'master' into next 2018-06-03 20:17:51 +01:00
Monster Iestyn 650e0eafce Merge branch 'fixedmul-c-fix' into 'master'
Correct C FixedMul() off-by-one errors

See merge request STJr/SRB2!245
2018-06-03 15:14:06 -04:00
Monster Iestyn 602d5e0aa0 Merge branch 'f12-fix' into 'master'
F12 fix

See merge request STJr/SRB2!250
2018-06-03 15:11:20 -04:00
Monster Iestyn 37b8be2103 Merge branch 'demototalplaytime' into 'next'
Don't increment totalplaytime if a demo is playing.

See merge request STJr/SRB2!241
2018-06-03 15:10:42 -04:00
Monster Iestyn ef174f7b43 Merge branch 'opengl-mappalette-fix' into 'master'
OpenGL: Map Specific Palette Fix

See merge request STJr/SRB2!247
2018-06-03 15:09:23 -04:00
Monster Iestyn 8e5dbb22f0 Merge branch 'opengl-bigmap-fix' into 'master'
OpenGL: Very large map rendering issue fixed

See merge request STJr/SRB2!249
2018-06-03 15:08:10 -04:00
Monster Iestyn f4152e2e5d Merge branch 'addfile-typo' into 'master'
Fix console typo

See merge request STJr/SRB2!246
2018-06-03 15:06:13 -04:00
TehRealSalt dff33deb52 Fix Battle scoring, hopefully 2018-06-02 10:57:43 -04:00
TehRealSalt 73205c8229 Changed time requirements to accomedate lap changes 2018-06-02 10:29:43 -04:00
TehRealSalt bc5c279317 Messing with item distributions a tad 2018-06-01 02:19:40 -04:00
TehRealSalt bf3910cdca Incredibly rudimentary Jawz stuff 2018-05-31 20:51:05 -04:00
TehRealSalt 4c0f64ff4f Merge branch 'master' into sonicitems 2018-05-31 19:47:50 -04:00
TehRealSalt 7da0ff595e I continue to be a buffoon. 2018-05-31 19:21:26 -04:00
TehRealSalt 7d021ae1e6 Splitscreen-friendly voting screen 2018-05-31 18:49:19 -04:00
TehRealSalt c7692d6d7c Thaaaat was stupid of me 2018-05-31 15:39:00 -04:00
TehRealSalt 123415fb08 nice
nice
2018-05-31 01:06:48 -04:00
TehRealSalt 240f037b27 A couple of RA-related things
An unlockables/time emblems update, the stats screen shows all maps without needing to visit each one, and respawning is enabled in Record Attack now
2018-05-30 22:53:06 -04:00
TehRealSalt 75e77189d6 Fix Star/Mega music persisting after death for splitscreen players 2018-05-30 18:38:30 -04:00
TehRealSalt eadd7381eb Changing from Relaxed Standard Turbo to the typical Easy Normal Hard
Reception to the naming convention has been either "don't care" or "too hard to remember"
2018-05-30 17:29:40 -04:00
TehRealSalt efc64e70ab Record Attack sets all of kart's gameplay variables now 2018-05-30 17:22:31 -04:00
TehRealSalt 762a8f6087 Merge remote-tracking branch 'srb2public/next' 2018-05-30 17:11:02 -04:00
TehRealSalt dcd8c87c6f But hey, what if I also made color & skin save to the config too!
Does this make up for it? :V
2018-05-30 16:59:53 -04:00
TehRealSalt 4e97fbf188 Merge branch 'master' into sal-misc 2018-05-30 16:55:59 -04:00
TehRealSalt 609258baa6 Restore gc_camrotate
Sorry if this breaks everyone's configs again :V
2018-05-30 16:54:59 -04:00
Monster Iestyn 41e9c20c04 Ignore mouse button events if the mouse's focus is not actually on the window at the moment.
This should hopefully kill the F12 getting stuck issue once and for all.
2018-05-28 21:29:46 +01:00
Sryder f4181f7eb6 Very large map rendering issue fixed
Move old fix for too large maps having rendering issues from R_CheckBBox to OpenGL's HWR_CheckBBox
From what I know, this effects at least Aerial Garden and Seraphic Skylands
2018-05-26 13:13:37 +01:00
Monster Iestyn f061ffa00e Stop Each Time trigger linedefs and object-carrying scrollers from doing anything with FOFs without FF_EXISTS 2018-05-21 20:02:30 +01:00