Commit graph

3185 commits

Author SHA1 Message Date
Steel Titanium
378495cb2b Add some stuff 2018-09-20 18:33:50 -04:00
Steel Titanium
a53f036149 Use MemAvailable instead 2018-09-20 18:30:46 -04:00
toaster
1a2f84a5ba Smaller XPM with no redundant pixels 2018-09-20 22:36:01 +01:00
TehRealSalt
e2a7146667 Reeling back on this again
Kinda want to save it for another branch
2018-09-20 17:11:59 -04:00
TehRealSalt
e441b2bce4 Address review
(for anything code I did, anyway)
2018-09-20 17:11:11 -04:00
toaster
e90139c5b3 :shitsfree: 2018-09-20 17:45:19 +01:00
Latapostrophe
73c66e3bc4 Spark radius now follows players 2018-09-20 18:31:38 +02:00
TehRealSalt
f425ba4423 Spindash boost dust, pogo spring sfx 2018-09-19 20:13:48 -04:00
TehRealSalt
f207140791 Merge remote-tracking branch 'origin/misc_plus_menustuffs' into sal-misc 2018-09-19 18:45:47 -04:00
TehRealSalt
b2099678d1 Enable noclip cam again.
It's just... TOO good, despite the couple of issues with it
2018-09-18 23:56:26 -04:00
TehRealSalt
8013a064ab Spark fix
(please don't spread these fixes out across different branches :boi:)
2018-09-18 15:51:27 -04:00
toaster
cb629303d6 Update a bunch of icons - SDL_icon.xpm and other targets' .icos. 2018-09-18 19:37:03 +01:00
toaster
a1045d232b :boi:
(fix driftsparks, and subsequently sliptides because i copypasted most of the code for them, disappearing underwater)
2018-09-18 17:40:39 +01:00
TehRealSalt
864f2466fe Booster+wipeout fix 2018-09-17 20:24:03 -04:00
mazmazz
20c4702986 Line exec trigger netsync: Save var2s in addition to vars 2018-09-17 14:13:31 -04:00
toaster
c00e054979 correct oversight in merge 2018-09-17 11:36:22 +01:00
toaster
123778766a Animated sky backport 2018-09-17 11:21:25 +01:00
toaster
8618d7bbec Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs
# Conflicts:
#	src/k_kart.c
2018-09-17 11:19:17 +01:00
TehRealSalt
69cbbde7fc Updated Dream 2018-09-17 02:48:10 -04:00
TehRealSalt
f2838f7ab3 More color tweaks
- Renamed Grey to Nickel, and Cloudy to Grey
- Updated Silver and Nickel to look a teeensy bit more inbetween White/Grey and Grey/Black, previously they both leaned more toward Grey
- Drastically changed Navy to be more distinct from Jet
- Replaced Indigo with Pomegranate
- Moved certain colors around to match (most notably, beiges and browns are in their own little sub-section after the greyscale colors, instead of being lumped in the middle of orange and yellow)
- Updated color opposite table to match
2018-09-17 02:09:22 -04:00
TehRealSalt
c9994c6ad8 Changed MD2 coloring again
Squares the colors to get nicer looking results (https://www.youtube.com/watch?v=LKnqECcg6Gw), as well as only blending a small chunk of the skincolor to prevent desaturation from the brightest/darkest values.
2018-09-16 23:39:18 -04:00
TehRealSalt
ac2f81e423 New color brightness formula
Gets more accurate looking results
2018-09-16 23:28:10 -04:00
TehRealSalt
78a4cdab9f Alternate TC_RAINBOW
Leaving behind a commented out define for now because I dunno if I like it yet
2018-09-16 18:10:29 -04:00
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
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
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
TehRealSalt
a8eb4af694 Camera fixes
- Fixed camera panning for higher distances.
- Because of this, re-enabled scaling the pan amount based on distance.
2018-09-10 02:24:21 -04:00
TehRealSalt
7a91398066 Drop Dash + alternate start boosts
New respawn boost behavior, where you just hold for long enough instead of timing it with hitting the ground. Also much weaker, just gives you enough boost to get going instead of being a free sneaker.

Start boosts have been severely changed. The perfect one has an extra tic on its timing window and gets Sneaker boosting special effects, but every other possible boost has been severely nerfed.
2018-09-10 01:47:23 -04:00
wolfy852
e5b947de0a Change ESC menu override string to "Open/Close Menu (ESC)", adjust menu accordingly 2018-09-09 21:24:19 -05:00
TehRealSalt
aca9d505cc New gamepad defaults
Based on input recieved from Jeck
2018-09-09 20:57:54 -04:00
wolfy852
9a82176f6f Merge commit '72d80a9aa890d93dfd86e95af75c0752e1ff7e56' into sonicitems 2018-09-09 17:57:23 -05:00
toaster
1e8ae8aa0c Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-09 23:25:19 +01:00
TehRealSalt
76033a51d7 // we're fucking sick of this
Why hasn't SRB2 already done this themselves YEARS ago...
2018-09-09 18:24:09 -04:00
TehRealSalt
03e1ed179e Comment ou remaining traces of cv_karthud
We've poured so much effort into our own HUD that it doesn't make much sense to have the option to replace it with another game's at this point
2018-09-09 18:10:11 -04:00
TehRealSalt
c1b9700e28 Revert pan speed
Old one was more exciting, and gave that feeling of "you're scraping against the walls" when you try to corner really hard
2018-09-09 18:04:35 -04:00
Monster Iestyn
c0bf79ad8e R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be!
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
2018-09-09 22:48:09 +01:00
toaster
c8639ed0e0 Disable the options you MEANT to disable. 2018-09-09 15:44:37 +01:00
toaster
3936a7ea7e Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs 2018-09-09 15:41:37 +01:00
toaster
1010950148 This isn't vanilla, don't be a shit about secrets and addfile (plus it helps that this fixes a crash) 2018-09-09 15:17:41 +01:00
toaster
dc0144540b // if this doesn't work i'm removing papersprites
(check both the left and right side overflow of the sprite column being drawn)
2018-09-09 13:47:49 +01:00
toaster
86d4eb9655 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-09 00:51:54 +01:00
TehRealSalt
54bde9462d Revert "Rebalanced odds table again"
This reverts commit fbe721e7d4.
2018-09-08 19:50:31 -04:00
toaster
380cfa241c Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-08 23:46:07 +01:00
TehRealSalt
a9f34ce8ba Camera adjustments
- reverted boostcam timing, different max dist
- zooms out based on camera momz
- drift panning is twice as slow
2018-09-08 18:45:57 -04:00
toaster
9eeefde0f4 Make bomb attacks HUD drop. (Karma may be changed later, but Oni said let's try all together first...) 2018-09-08 23:45:51 +01:00
TehRealSalt
1cdf5623db weaker 2018-09-08 16:32:39 -04:00
toaster
e0aee8353c Forgot a default case. 2018-09-08 17:53:41 +01:00
toaster
e1b645d103 Bugfix a Jawz crash Jeck got a few days ago.
Not menu-based, but I guess this branch is misc PLUS menu stuff, not just menu stuff based on sal-misc.
2018-09-08 17:50:53 +01:00
toaster
6c6bafd1d6 * User manual!
* Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
2018-09-08 17:02:03 +01:00
toaster
f887ae6628 Watertight fix I was avoiding because it's definitely slower to check ranges at runtime, but papersprites are used intermittently enough that I don't think it's a super big deal. 2018-09-08 12:12:28 +01:00
toaster
745b914483 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-08 11:49:42 +01:00
TehRealSalt
0bd4a29f0e Weight increases with speed
Might be a tad weak right now, but we'll see if people want it stronger
2018-09-08 04:04:10 -04:00
TehRealSalt
9096da926b Merge branch 'sonicitems' into sal-misc 2018-09-08 03:24:59 -04:00
TehRealSalt
60ccbb1cd9 Critical inconsistency fix 2018-09-08 03:24:32 -04:00
TehRealSalt
fbe721e7d4 Rebalanced odds table again 2018-09-07 22:17:38 -04:00
TehRealSalt
6317ae5996 Okay do this correctly by doing a reacharound to grab the actual sfx id 2018-09-07 16:56:34 -04:00
TehRealSalt
f907a3c215 Speed pads always play a boost voice clip
For the extra SA1 feel :P
2018-09-07 16:20:20 -04:00
Monster Iestyn
316c08bbbb Merge branch 'netcode-nitpicking' into 'next'
Netcode nitpicking

See merge request STJr/SRB2!274
2018-09-07 15:59:49 -04:00
TehRealSalt
2cc07df3d2 Minor tweakings
- Win/lose quotes are only played for your player
- Win, lose, and gloat lines are played from farther away
2018-09-07 15:50:24 -04:00
toaster
baf50a1dbf * Slightly more papersprite stability!
* Slightly more sane Minecraft item scaling!
2018-09-07 14:26:00 +01:00
toaster
d13e999c99 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/info.c
2018-09-07 13:34:01 +01:00
TehRealSalt
52034646da Placeholder boost effect 2018-09-06 23:49:51 -04:00
TehRealSalt
7760c7030e Tweaked boost cam, again 2018-09-06 21:58:23 -04:00
toaster
8e9580cd7c Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-07 00:31:54 +01:00
TehRealSalt
be3ed17e19 Restore the one good bit 2018-09-06 19:31:28 -04:00
toaster
10be7e1a52 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-07 00:31:02 +01:00
TehRealSalt
34d27b06e0 Revert "Wrote a new function for MT_SOLID object bumping"
This reverts commit b4aa01ed61.
2018-09-06 19:27:07 -04:00
toaster
6052573549 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 2018-09-06 22:18:54 +01:00
toaster
4de68f7fe2 Dropping items!
* Shield Drop...
	* Whatever you've got orbiting or trailing you, DROP THEM WHERE THEY STAND. (Except for the ghost sink. That one's OK.)
	* Pops your Thunder Shield.
	* Happens upon ANY hit, except for deathpits.
* HUD Drop...
	* Also does the above, except for the Thunder Shield thing.
	* If there's any item left in your item box, pop it out as a little hovering, rotating Minecraft item!
	* You can pick up the Minecraft item by driving over it if your item box is sufficiently empty, or the item which is contained within it is of the same type.
	* Happens upon Size Down and battle elimination.
	* Can also be forced on with `cv_kartdebughuddrop on`!
* Some other random stuff.
	* Fix a bunch of `a->scale = b`'s into `P_SetScale(a, b)` form, for maximum validity.
	* Make K_CleanHnextList and K_UpdateHnextList one function, since they only differed by one continue clause (and the type of their input parameter).
	* Allow shrunken players to pick up item boxes again.
	* Fix MF_NOCLIPTHING. (Gonna pass this fix to vanilla when I get the chance, too.)
	* Break NiGHTS a little through my machinations.
2018-09-06 22:17:29 +01:00
TehRealSalt
82cf95d9f1 Forgot this 2018-09-06 16:09:17 -04:00
TehRealSalt
e2643c5ebd Player arrows can show x10
Requires new patch.kart
2018-09-06 16:06:37 -04:00
TehRealSalt
3520a3fb55 More Jawz tweaking
- Z pos checking is Battle-only now
- Made the Z pos limit much higher
- Increased its range in Battle
2018-09-06 16:05:57 -04:00
TehRealSalt
d299e59ce9 Sink bug fix
Sink would only spawn its trail ever if you threw it on a tic that was (leveltime % 4 == 0), because it called its action every 4 tics instead of every tic
2018-09-06 15:52:27 -04:00
TehRealSalt
bc15392514 Boost tweaks
Fix offroad not affecting you as soon as it did before, and tweaking boost cam to be stronger
2018-09-06 13:02:08 -04:00
TehRealSalt
b4aa01ed61 Wrote a new function for MT_SOLID object bumping
A lot more similar to the code used for player wall bumping, and is much less likely for you to just... pass through the object if you keep trying hard enough.

Also, falling rocks get pushed aside by invinicible players with no resistance.
2018-09-06 11:49:58 -04:00
TehRealSalt
36356f8a64 Boost cam 2018-09-05 11:19:00 -04:00
TehRealSalt
1548e59b2b Change a few cvar defaults 2018-09-04 21:18:20 -04:00
TehRealSalt
ff26811646 Lowest speed happens slower 2018-09-04 21:14:42 -04:00
TehRealSalt
9b2d9f1915 Heavy as shit now 2018-09-04 20:51:16 -04:00
TehRealSalt
e271c2de5d If the game would normally end in a bomb kill, then always switch their places 2018-09-04 20:16:42 -04:00
TehRealSalt
d3913a72df Addressed some of Chrome's thoughts
- Don't drag
- Shield isn't visible to anyone but yourself
- Projectile is twice as heavy
2018-09-04 19:58:20 -04:00
TehRealSalt
001d46873d Ghost sink "shield"
Sink shield that makes it double-press to use, gives the trailing item slowdown, and shows other people that you have it, but doesn't have any collision
2018-09-04 19:14:44 -04:00
TehRealSalt
b84e9a4133 Jawz ignores targets too high/low 2018-09-04 18:47:30 -04:00
TehRealSalt
733207d197 Splitscreen fix
Just changed order of operations
2018-09-04 18:27:36 -04:00
TehRealSalt
d49099693d Alternate demo replay camera
Not good, but less bad than before :V
2018-09-04 18:21:55 -04:00
TehRealSalt
381883b747 Revert a few of the changes from last commit
Ended up not liking them
2018-09-04 17:07:53 -04:00
TehRealSalt
6e328a4e73 Misc camera fixes
- Fixed remaining instances where camera position would scale with the player instead of the level; the camera should almost 100% certainly not change now when you get Grown/Shrunk
- Reset camera when switching viewpoint, to make it not look *as* weird when switching after you've finished (needs tested)
2018-09-04 16:10:59 -04:00
TehRealSalt
2a20939617 Camera panning for drifts 2018-09-04 16:08:37 -04:00
TehRealSalt
9394179c12 Camera outrunning 2018-09-04 15:11:14 -04:00
TehRealSalt
fd16ece77c Z pos smoothing 2018-09-04 02:51:00 -04:00
TehRealSalt
12bbb04fb9 This was not meant to be commited 2018-09-03 21:21:40 -04:00
TehRealSalt
c1d92a45f8 Camera now sticks close behind you, only the angle is lagged 2018-09-03 20:40:46 -04:00
Monster Iestyn
38ac999d77 Merge branch 'addfile-verify-fix' into 'next'
Addfile command verify fix.

See merge request STJr/SRB2!272
2018-09-03 17:17:46 -04:00
Monster Iestyn
ea06e8a62b SOCK_Send: Split the actual sending data parts into a new function, SOCK_SendToAddr, to make everything look a bit neater in general 2018-09-03 20:53:40 +01:00
Monster Iestyn
7b083f07cd UDP_Socket: I doubt client addresses are meant to be included in the total for broadcast addresses 2018-09-03 15:56:02 +01:00
Monster Iestyn
846bddfdcf SOCK_Send: Fix what appears to be a mistaken use of i instead of j 2018-09-03 15:52:22 +01:00
Monster Iestyn
24aafa6dac UDP_Socket: Add missing limit checks for s, for client and broadcast addresses 2018-09-03 15:43:36 +01:00
TehRealSalt
83eb9c1b43 Redone stat graph 2018-09-03 00:06:17 -04:00
TehRealSalt
3b5f251ff0 Vote screen uses the font's intended character spacing 2018-09-02 22:53:40 -04:00
TehRealSalt
70b9f49c94 Move wall sector type to from Section1:14 to Section1:12
The SMK maps will probably need an update
2018-09-02 20:57:40 -04:00
TehRealSalt
e85688bfee Remove an #ifdef here 2018-09-02 20:50:22 -04:00
Monster Iestyn
6ae78da47e Merge branch 'master' into next 2018-09-02 13:00:56 +01:00
Steel Titanium
54fec7fa5c Merge branch 'master' into addfile-verify-fix 2018-09-01 19:33:59 -04:00
toaster
e01f2ff096 Update arrow rendering to use simple character function rather than overkill string function. 2018-08-31 22:38:56 +01:00
TehRealSalt
203b43a138 Toggle All option 2018-08-31 14:41:37 -04:00
TehRealSalt
68a94b5657 Small fix 2018-08-31 13:23:05 -04:00
TehRealSalt
e6303d1889 Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on 2018-08-31 13:18:19 -04:00
Monster Iestyn
322da62b3c Fix HOM removal not working properly for non-green resolutions 2018-08-31 17:14:44 +01:00
Latapostrophe
ccc6f71980 Cleanup + coloured text for spectators / PMs 2018-08-31 15:02:48 +02:00
Latapostrophe
8bb8eef997 Removed that one empty space thing 2018-08-31 13:56:11 +02:00
Latapostrophe
c9303cb180 Cleaned up a little, courtesy of toaster 2018-08-31 13:52:53 +02:00
toaster
a7bb16ada9 Improve intermission drawer further.
* Change `MM:SS.MS` to `MM'SS"MS' to match all other recorded instances of time in-game.
* Add a full stop to NO CONTEST to scrounge up an extra four pixels to match the increased width of above.
* Make it such that the number of players per column will never be desynced with future code changes by tying it to a local #define.
* Other minor code improvements.
2018-08-31 12:37:15 +01:00
Latapostrophe
c323b821d6 Coloured names for chat 2018-08-31 13:30:40 +02:00
TehRealSalt
157819b063 Scale the speed of SA dash pads with higher scales
Also, added a define for GROWNEVERMISSES, which fixes every single jump with Grow but with feels terrible.
2018-08-31 00:05:46 -04:00
TehRealSalt
1ab9ebf1c0 separate var for dashpad cooldown
- no longer has weirdness with pw_flashing
- can now have an SA1-style effect for it
2018-08-30 22:27:18 -04:00
TehRealSalt
cdaaca9b62 Grow no longer sets flashing tics
Just causes a bunch of other, really dumb side-effects, and nothing else I could test suffers from it
2018-08-30 21:51:27 -04:00
TehRealSalt
ea8465cc61 Karma players can bump again 2018-08-30 21:32:24 -04:00
TehRealSalt
ff09c0643c Jawz reticule 2018-08-30 19:24:22 -04:00
Steel Titanium
0f5d685d1f Only do this if the admin player isn't the server host also. 2018-08-30 18:32:26 -04:00
TehRealSalt
f6ce2bfb54 Ignore texture on horizon lines when in OGL
Before: https://cdn.discordapp.com/attachments/300531341957529602/484842910475354124/kart0110.png
After: https://cdn.discordapp.com/attachments/270211093761097728/484841628771680258/kart0109.png

Not a solution, but better than the previous.
2018-08-30 17:53:25 -04:00
TehRealSalt
9d514f2f98 Remove use of a duplicated sound 2018-08-30 17:50:47 -04:00
TehRealSalt
0ff7fad0c6 Halved radius of MT_CHOMPER 2018-08-30 17:12:35 -04:00
TehRealSalt
b973522bf1 Apply to bananas, eggmen, and mines also 2018-08-30 16:36:46 -04:00
TehRealSalt
2e8f513eb5 Put on player's center during this animation 2018-08-30 16:28:01 -04:00
TehRealSalt
0dbd48b9da Held Orbinaut & Jawz radius+scaling animation on spawn 2018-08-30 16:10:25 -04:00
TehRealSalt
3a9342e2c6 More fundamental Jawz changes.
1.) Instead of prioritizing best angle above all else, it averages both distance and angle to figure out which is the best overall target.
2.) Jawz will completely cut out angles higher than 45 degrees, preventing instances where someone behind you is considered a better target than who you're looking at.
3.) Jawz does the 45 degree angle checking in Race as well, meaning that they will ignore racers that are neck & neck with you, even if they're technically the next place above you, so that Jawz doesn't take a hard left into a wall.
2018-08-30 15:30:27 -04:00
toaster
bd7e0e75f0 Overlays and rings now properly handle encore-ness, in that they are sans encore (most of the time).
... :V
2018-08-30 13:13:25 +01:00
TehRealSalt
59751c81e9 Foolish 2018-08-29 18:12:18 -04:00
TehRealSalt
0d3d1af317 - Revamped Jawz targetting for Battle Mode
- Cleaned up some redundant code
- Halved the speed of backwards thrown missiles (previously PROJSPEED/2, now is PROJSPEED/4)
2018-08-29 18:12:02 -04:00
toaster
7c7a7bf849 disable encore ruby/flip on record attack menu with kartencore on 2018-08-29 22:02:42 +01:00
toaster
22be81ef02 * Prettier record attack screen!
* Uses the in-game timer element to draw its times.
	* This includes showing them time emblems-to-get!
	* good night sweet prince
* Make the emblem time use the same ' and " as the normal time.
2018-08-29 21:37:47 +01:00
toaster
c1fd658e4b Merge branch 'sonicitems' into encore 2018-08-29 19:56:52 +01:00
TehRealSalt
92bb1e7131 Lower capped spring pad max speed even harder, to properly fix BC3 2018-08-29 14:46:42 -04:00
TehRealSalt
d6c54b3f47 Item distribution debugger, and oversight pointed out by this
Item distribution debugger is a netvar that enables cheats, so no exploiting!
2018-08-29 14:28:28 -04:00
toaster
7a758708c6 * Add support for .kart files.
* Wrap behind-the-scenes `addfile/exec` contents in quotation marks to allow for files with spaces in them.
2018-08-29 14:19:08 +01:00
toaster
0776460643 * Make some minor performance improvements.
* Make the I_Errors in filesrch.c more descriptive.
* Fix up the loading of sounds.kart such that it has SOME protection against being loaded with game-modifying lumps.
* SERIOUSLY fix up the MD5/mainwads++ section in D_SRB2Main, since 1) I broke it and 2) it was already a little broken in the first place but we just didn't notice it because #ifndef DEVELOP.
2018-08-29 12:50:25 +01:00
TehRealSalt
360f083512 Make the low player count distributions slightly more extreme
Scales below 8 players instead of 6 players. The distance multipler in 4P is now x1.14 instead of x1.07.
2018-08-28 23:06:31 -04:00
TehRealSalt
a745417a3f This doesn't work
1.) I mixed it up, so opponent win/lose quotes would play globally instead of your own
2.) You can't even play skin-specific sounds globally, so it'd always be Sonic
2018-08-28 22:50:53 -04:00
TehRealSalt
2564d2f017 Wrong order here 2018-08-28 18:50:59 -04:00
TehRealSalt
118d9caad1 New voices
- Following Oni's proposal. This means taunts are split into 2 types for offensive items and boost, 2 less hurt sounds, and there's another clip for using invincibility item (or whatever other powerful items we want to apply it to later; maybe size-down?)
- Win/lose quotes are played at full volume for the person who said it.
- A new sound effect plays when you hit someone with voices disabled.
- Reduce amount of RNG being called from the vanilla P_Play[whatever]Sound functions
- Added our skin sound constants to the dehacked list.
- Unrelated: finish line sfx plays in splitscreen
2018-08-28 16:29:50 -04:00
toaster
b6dbecd2f8 Addons menu.
Bitch.
2018-08-28 21:08:47 +01:00
TehRealSalt
c22d670fa5 Merge branch 'sonicitems' into sal-misc 2018-08-27 21:08:39 -04:00
TehRealSalt
14ccdb0dcf Last touches for smk maps
- different min/max on capped spring pads
- turn the normally almost-useless "non-ramp sector" type into "wall sector", which disables both stepup AND stepdown instead of just stepdown
2018-08-27 18:09:32 -04:00
toaster
ca8aceb059 Fix that thing where item boxes just wouldn't respawn in battle if you nabbed them all too quickly (which is very likely to happen in large netgames where we have the great fortune of playing on battal bowl). 2018-08-27 17:25:22 +01:00
TehRealSalt
6fdb743a59 Correct remaining instances where step up/down scales with the object instead of the map 2018-08-27 01:07:44 -04:00
TehRealSalt
b426e43d2d Adjustments made to address the netgame
Less grow, less invinc, less ballhog, just a teensy bit less triple orbinaut, and SPB odds no longer scale with lower player counts like other power items do
2018-08-26 19:55:31 -04:00
Monster Iestyn
61836e1565 Merge branch 'master' into next 2018-08-26 21:10:41 +01:00
TehRealSalt
6c003dc7d0 Good catch 2018-08-26 15:17:55 -04:00
TehRealSalt
344accbfed Rebalance Battle items in response to last night's netgame 2018-08-26 14:58:21 -04:00
toaster
fc6b0b23ec Increase the amount of time between the switch to the Rankings half of intermission and ranking is calculated a tad.
Turns out it wasn't taking the length of the level-to-rankings switch animation into account!
2018-08-26 17:31:04 +01:00
toaster
1038028468 Real time reordering of intermission rankings as rank counts up!
Also features jittering of the intermission elements because I thought it'd be fun, plus some better handling of players leaving (and then new ones joining) mid-intermission.
2018-08-26 16:23:50 +01:00
toaster
cdf5874ff5 * Exempt drop shadows from encore remapping.
* Make MT_GHOST's encoremapping depend on whether the source was encoremapped.
* Revamp how sector typegroup 2, type 15 inverts the encoremapping (so planes don't get awkwardly desynchronised).
2018-08-26 15:15:03 +01:00
toaster
b505ea43f0 Merge branch 'sonicitems' into encore 2018-08-26 12:45:02 +01:00
toaster
58e2e581fa Undef SHITPLANESPARENCY downstream from vanilla, as promised. 2018-08-26 12:43:31 +01:00
toaster
08a23d7b87 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
# Conflicts:
#	src/g_game.c
#	src/v_video.c
2018-08-26 12:42:55 +01:00
toaster
710550bb9d Missed one! 2018-08-26 12:38:53 +01:00
toaster
7b31d7a9b9 Dumbass copypaste rectified, stplyr is NOT valid in mobjthinker code. toaster, stop making commits to sonicitems 2018-08-26 12:27:45 +01:00
TehRealSalt
277c4deb30 Merge branch 'sonicitems' into encore 2018-08-26 00:12:02 -04:00
TehRealSalt
1554f4d771 Merge branch 'sal-misc' into sonicitems 2018-08-26 00:11:19 -04:00
Monster Iestyn
d5ab3e75a5 Merge branch 'v_video_killed_the_r_radio_star' into 'master'
v_video Killed The r_radio Star

See merge request STJr/SRB2!270
2018-08-25 16:43:25 -04:00
Monster Iestyn
ed5bed4d2c Merge branch 'zalloc_potter_and_the_death-free_hallows' into 'master'
Zalloc Potter and the Death-Free Hallows

See merge request STJr/SRB2!269
2018-08-25 16:43:14 -04:00
toaster
85474e33dd Introduce a temporary measure to enable the old stuff, minus one of the most obviously terrible bugbears of yesteryear. Let it be known that any downstream poirt will almost certainly toggle this ASAP. 2018-08-25 21:17:34 +01:00
toaster
80ac2366ba Clean up a bunch of v_video.c functions that previously exhibited unfortunate side effects when run in non-green resolutions.
* V_DrawFixedPatch and ilk:
	* Change the offset of V_FLIP so it's not one screen-pixel off where its non-flipped sprite would have started being drawn from.
	* Write to x and y as well as desttop so that anti-screen-overflow checks later in the function behave properly with non-green resolutions.

* V_DrawFill:
	* Reduce number of operations performed upon `c`.

* V_DrawString and ilk:
	* Offset the left and right boundary checks in non-green resolutions such that you can actually draw stuff to the left of basevid screen x coordinate 0.
2018-08-25 19:52:17 +01:00
toaster
91eb248e46 Fix up them there ghosts!
* Stop orphaning their memory. They ARE PU_LEVEL, so they'll disappear eventually, but, like... it's not good memory management practice to just *orphan* them when you're literally never going to do anything with them ever again. Y'know?
* Make ghosts spawn properly on slopes.
2018-08-25 17:11:49 +01:00
toaster
973b3c3f5e Continuing my recent streak of making random lighting/colormap-related fixes to long-standing bugs:
* Fix that thing where ALL transparent FOF planes were continuously fullbright unless encased in a fog which disables sprite fullbrightness, which was long-hated by many people in the community!
	* For backwards compatibility, setting flag 1 in that fog field (which is probably the most common "in-the-wild" usage of this feature) will continue to make objects un-fullbright.
	* For situations where you desperately want the behaviour to be enabled, you can apply fog flag 2.
* Change the fadestart and fadeend range in which colormaps are generated.
	* The problem HERE was that the darkest light level reached by generated colormaps was actually slightly brighter than the darkest level reached by normal colormaps.
	* The typo I fixed does have SOME basis in fact - standard colormap lumps are 34 (33 in 0-indexing) long rather than 32 (31), but whoever wrote this didn't realise that the code for generating them didn't do it DooM style, just bright-to-dark with no extras on the end...
2018-08-25 16:46:45 +01:00
toaster
a6813ae08e No longer are orbiting/trailing objects in charge of removing themselves.
* They're clearly not quick enough at the job, since it causes a bunch of silly race conditions.
	* Instead, K_UpdateHnextList and K_CleanHnextList are in charge of removing them, which are called in the circumstances itemamount (and itemheld/eggmanheld) is changed.
	* Also, tweak a few places so that trailers AND orbiters can use the same system.
Also, some minor thingies.
	* Turn all the useless ```if (a) { A } else if (!a) { B }``` bullshit into ```if (a) { A } else { B }``` bullshit.
	* Fix up some minor inaccuracies in the playerarrow stuff that doesn't result in creating more sprites.
2018-08-24 15:14:18 +01:00
toaster
e5566df4c2 Fix up the bugs from last night's hell netgame.
* The tab and intermissions rankings...
	* ...now have parity in behaviour!
	* ...now properly handle player counts over 8, and no longer supports player counts over 16!
* The Item Arrow in Battle...
	* No longer develops any extremely stupid bugs due to Orbinaut sprites that makes all objects in state S_INVISIBLE develop <!>'s! (Ask me about this if you're curious as to how it affected everything else too.)
2018-08-24 13:36:03 +01:00
TehRealSalt
b9d55765e9 Spring jump changes for Grow & Shrink
All spring jump issues on the sheet are fixed now.
2018-08-23 12:53:29 -04:00
Monster Iestyn
2daaf637d9 Merge branch 'master' into next 2018-08-21 15:36:36 +01:00
Monster Iestyn
9d3aad9036 Merge branch 'XPMupdate' into 'master'
update XPM icon

See merge request STJr/SRB2!267
2018-08-21 10:31:25 -04:00
Monster Iestyn
dcf843e485 Merge branch 'defaultsoundvol' into 'master'
Change default sound volume

See merge request STJr/SRB2!238
2018-08-20 09:41:04 -04:00
Monster Iestyn
b63290211a Merge branch 'master' into next 2018-08-16 22:04:00 +01:00
Monster Iestyn
a4cfa9e82a Merge branch 'lua-sector-names-fix' into 'next'
Lua sector names fix

See merge request STJr/SRB2!263
2018-08-16 16:57:41 -04:00
Monster Iestyn
364339e1ce Merge branch 'sdl_mixer_fixes' into 'master'
SDL Mixer fixes

Closes #31

See merge request STJr/SRB2!260
2018-08-16 16:57:14 -04:00
toaster
acba635c90 Realised I'd forgotten to stop the item explosion from being encoremapped. 2018-08-16 15:29:34 +01:00
toaster
77ba3e3c2d Additional oversight corrected. 2018-08-15 16:59:28 +01:00
toaster
1d894f36c3 Correct minor issue with random map name selection. 2018-08-15 16:56:26 +01:00
toaster
be1e43fc0b Merge branch 'sonicitems' into encore 2018-08-15 16:12:42 +01:00
toaster
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
toaster
c895f45d96 Make some minor tweaks to the two server setup menus (splitscreen and not-splitscreen).
I wouldn't have done this, but I was already in the code to fix the bugs, so I hit something that was bugging me[/sonic adventure voice] as well
2018-08-15 15:22:50 +01:00
toaster
7f066fbf60 Add some more safety checks to the item system.
While I cannot guarantee the class of glitches that allows for additional items to be thrown/dropped has been completely obliterated, this DOES prevent the class of exploits that allows for "infinite items" (really just negative quantities not completely bounds-checked for).
2018-08-15 14:40:06 +01:00
toaster
8c5d4dd270 Fix alignment of rocket sneaker bar. 2018-08-15 14:05:13 +01:00
toaster
1156da88c2 Merge branch 'sonicitems' into encore 2018-08-14 22:17:11 +01:00
toaster
746c48af60 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-08-14 22:16:55 +01:00
toaster
9f96be6375 Hide non-splitscreen number for natural quantities of orbinaut spikeball.
Also, minor code tweaks.
2018-08-14 22:16:33 +01:00
SeventhSentinel
949417e94b Flashing diff change 2018-08-14 13:15:33 -04:00
toaster
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
toaster
2d92aefc29 Merge branch 'sonicitems' into encore 2018-08-14 15:25:38 +01:00
toaster
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
toaster
6c7bc63587 Merge branch 'sonicitems' into encore 2018-08-13 22:59:38 +01:00
SeventhSentinel
e58d07abd8 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-08-13 17:46:54 -04:00
SeventhSentinel
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
toaster
2d53f13a88 Merge branch 'sonicitems' into encore 2018-08-13 14:22:52 +01:00
toaster
6c66de5423 Fixed battle item respawning (caused by a stupid accidential assignment typo that was my fault). 2018-08-13 14:22:13 +01:00
toaster
5a6b34c4ca Merge branch 'sonicitems' into encore 2018-08-12 16:18:29 +01:00
SeventhSentinel
9655dcf350 revert this for the future 2018-08-12 11:17:30 -04:00
toaster
57740bcc9b Merge branch 'sonicitems' into encore
# Conflicts:
#	src/info.c
2018-08-12 16:16:21 +01:00
SeventhSentinel
995f2a9d06 added return 2018-08-12 11:12:18 -04:00
SeventhSentinel
6fa4c27bf6 fakes use MF_SPECIAL, no longer destroyable 2018-08-12 11:04:36 -04:00
SeventhSentinel
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
SeventhSentinel
ff893f8f63 hud stuff
eggman nums & rocket sneaker bar
2018-08-12 10:15:55 -04:00
toaster
b7f7da4f6c Bugfix for "Blue Mountain 0", "Green Hills K".
Also, minor tweak.
2018-08-12 15:10:47 +01:00
toaster
9f107166f3 Merge branch 'sonicitems' into encore 2018-08-12 11:46:21 +01:00
toaster
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
toaster
806353c86a Fixed Encore remappings not being loaded when joining mid-netgame. 2018-08-12 11:20:53 +01:00
toaster
8256739052 Merge branch 'sonicitems' into encore 2018-08-12 01:55:07 +01:00
SeventhSentinel
82343719e2 fixed n blame 2018-08-11 20:54:08 -04:00
SeventhSentinel
4ac97eb77b Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-08-11 20:19:12 -04:00
SeventhSentinel
cde54211c2 eggman
broken
2018-08-11 20:19:09 -04:00
toaster
dd6259c44f Encore mapload linedef executor (number 328), as requested by Oni. 2018-08-11 23:20:05 +01:00
toaster
000fbe8b52 Merge branch 'sonicitems' into encore 2018-08-11 22:52:24 +01:00
toaster
53dd391ac8 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-08-11 22:52:09 +01:00
toaster
6fa0605416 Merge branch 'sonicitems' into encore
# Conflicts:
#	src/d_main.c
2018-08-11 22:37:17 +01:00
toaster
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
toaster
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
TehRealSalt
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
Steel Titanium
d9c7334dea Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
toaster
c1a2c2fba4 Merge branch 'sonicitems' into encore 2018-08-10 23:22:28 +01:00
toaster
d4eabcf3ad Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 2018-08-10 23:21:57 +01:00
Alam Ed Arias
3479310546 SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
toaster
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
toaster
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
Monster Iestyn
7ee9c5b0f4 Merge branch 'master' into next 2018-08-10 19:31:15 +01:00
toaster
542b758206 Merge branch 'sonicitems' into encore 2018-08-10 15:39:08 +01:00
toaster
a10c0f1bcf Fix issue where random boxes would become invisible after respawning in race. 2018-08-10 15:38:32 +01:00
toaster
c190db903c Merge branch 'sonicitems' into encore
# Conflicts:
#	src/st_stuff.c
2018-08-10 15:35:00 +01:00
toaster
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
TehRealSalt
01093f4ca2 Orbinaut x4 2018-08-09 22:52:22 -04:00
TehRealSalt
a49983a6d1 Lap start animation 2018-08-09 21:52:02 -04:00
toaster
a6ca459164 Fix all actionable comments in my review of sonicitems. 2018-08-09 22:59:52 +01:00
toaster
145c050e14 ...and R_DrawTranslucentSplat_8, even though it isn't used! 2018-08-09 17:08:20 +01:00
toaster
5daeaf529f Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well. 2018-08-09 16:56:43 +01:00
toaster
6f2840fe19 * Make Encore Mode an unlockable, rather than freely available.
* Make unlockables have a "showing" conditionset, for when you're able to see them on the Extras screen.
* A shorter Encore ruby-pulse fade, for when encore mode is already active!
2018-08-08 20:48:29 +01:00
toaster
7577d289c3 Encore mode is shippable, if still a tad incomplete!
* Turns out the Linedef Type 606 support WAS working and I just had a bad MAP01E lump.
* Ruby fade and ambience start track.
* Fix bad phrasing.
2018-08-08 15:03:02 +01:00
toaster
6f4308905f Merge branch 'sonicitems' into encore 2018-08-08 12:04:17 +01:00
toaster
cd28a95908 Fix two bugs with how I disabled midi music for Kart.
* Correct the thing where it would print "music not found" when digital music is disabled.
* Make the MIDI music rejection text print if MIDI music is found (and digital music is on).
2018-08-07 21:51:03 +01:00
toaster
c52a4de933 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_md2.c
2018-08-07 21:20:27 +01:00
Monster Iestyn
10a2ba8d39 Merge branch 'master' into next 2018-08-07 20:54:19 +01:00
toaster
ecc9ebe8c1 Change the order of operations when applying transparency and colormap such that colormap isn't applied to the screen pixel twice (or, in the case of R_DrawTranslatedTranslucentColumn_8, thrice).
Please note I haven't touched the ASM equivalent, given as it's not actually used.
2018-08-07 19:12:10 +01:00
toaster
cfaaac78be Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore 2018-08-07 17:09:25 +01:00
Monster Iestyn
c703bc2fd7 Trim off any extra null bytes off the end of sector floorpic/ceiling when you access them in Lua 2018-08-06 22:37:44 +01:00
toaster
c256f2ae29 * Tweak battle odds in a few ways, as authorised by Sal.
* Steal a point from Ballhog and give to Orbinaut.
	* Make it based on the maximum number of bumpers someone has, not the average for everyone.
	* Improve the odds a tad if you're Wanted.
	* Tweak the score multiplication to give three points for Wanted and two for removing the last bumper (both disabled if you get the hit with a fake item).
* Allow Karma players to drop their Random box.
	* These boxes flicker out of existence after 15 seconds.
	* Causes a WAIT penalty, too.
* Remove some redundant PF_ATTACKDOWN stuff, given under the conditions the flag would be applied, it has definitely *already* been applied.
2018-08-06 18:37:03 +01:00
toaster
2abf256531 * Fix various instances where bananadrag might not be reset.
* Improve K_KillBananaChain to be tail recursive.
2018-08-06 16:19:07 +01:00
Monster Iestyn
02d2b61866 Merge branch 'master' into next 2018-08-06 15:15:35 +01:00
Monster Iestyn
2738f3a537 Rewrite archiving/unarchiving of Lua strings for netgames.
This now means:
* Lua strings longer than 1024 chars can now be read properly without awful crashes
* Lua strings with embedded zeros can be written/read without truncating anything (hopefully)
2018-08-05 22:02:20 +01:00
Monster Iestyn
8d622ff6f8 Quick fix for LJ's password fix: don't check if password is set until we've confirmed that the receiving player is the server! 2018-08-05 20:17:30 +01:00
toaster
59c64e1ec7 * Change/add a handful of sounds.
* Make Orbinaut Shields animate at 3 tics per frame, not 1.
* Make dead items flash in and out of visibility.
* Related to above, fix a few circumstances where returning was not properly handled after removing a mobj in mobjthinker.
2018-08-05 16:38:46 +01:00
toaster
fb5ddf44d6 Improve y_inter.c levelname setting. 2018-08-05 16:35:33 +01:00
toaster
c1749b01b1 * Tint, not Teint.
* Update/rearrange menus a tad, to be more appealing and correct some categorisation in general.
2018-08-05 16:34:51 +01:00
Latapostrophe
ee5ebd978a Chat wordwrap fix + Minichat bg highlight 2018-08-05 13:08:27 +02:00
TehRealSalt
ad15ad4b89 Orbinaut shield 2018-08-04 16:54:48 -04:00
TehRealSalt
bf4f85fcca Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-08-04 15:48:50 -04:00
TehRealSalt
97ec385234 Thunder shield overlay 2018-08-04 15:48:31 -04:00
toaster
b319c2d9b8 * Homogenise old chat mode detection, which includes cv_consolechat.value, dedicated, and vid.width < 640.
* Make the chat notification sounds work in old chat mode.
2018-08-03 23:01:09 +01:00
toaster
ad119af07b * Get chat to compile with errormode on.
* Add chat options to the HUD and Sound Option menus.
2018-08-02 23:52:07 +01:00
Latapostrophe
9109bb1ee7 Fix console leftover + positionning 2018-07-31 23:35:16 +02:00
Monster Iestyn
74646052b0 Merge branch 'master' into next 2018-07-31 19:36:30 +01:00
Monster Iestyn
485d990949 Merge branch 'gme-lowvolume-fix' into 'master'
GME low volume fix

See merge request STJr/SRB2!248
2018-07-31 14:35:32 -04:00
Monster Iestyn
16999b7080 Merge branch 'gme-pause' into 'master'
Fix pausing on gme

See merge request STJr/SRB2!251
2018-07-31 14:33:56 -04:00
Latapostrophe
3af7b7bf91 merge sonicitems into chat-changes so that it's not lagging 10 years behind 2018-07-31 19:45:49 +02:00
toaster
f2070ba6d1 Some tidbits for countdowns.
* Fix an inconsistency in timing re a time over that involves a single person (the number of tics exiting usually takes), versus a time over that involves multiple people (8*TICRATE).
* Barebones preparatory work for F-Zero explosion, since I was futzing around in this already.
2018-07-30 23:20:04 +01:00
toaster
731b05e263 More UI crap!
* Fix minor additional error in tab rankings.
* Remove FREE PLAY from intermission drawer, per Sal's request.
* Remove "second%s" from the end of the "Start in %d"/"Vote ends in %d" string.
* Rename cv_advancemap's "Off" value to "Same", to make the behaviour clearer.
* Make the "Start in %d" string now begin with cv_advancemap's string (ie, "Vote in %d", "Same in %d", "Random in %d, Next in %d"...
2018-07-30 23:17:14 +01:00
toaster
057bc41203 Fix dropped else in tab rankings view, leading to the exiting text being drawn on top of other text for no good reason. 2018-07-30 22:07:28 +01:00
toaster
7f509c7c27 Some UI stuff.
* Place FREE PLAY in a less contentous location.
* Fix comeback timer being incorrectly offset from the center of the screen.
* Prevent vote drawer from nuking itself (visual-wise) at the start of the level fade following it.
2018-07-30 21:53:54 +01:00
toaster
65a956259b * Re-enable kartvoices controls for K_PlayTauntSound and K_PlayOvertakeSound.
* Make the three P_Play<?>Sounds from p_local.h actual functions that acknowledge the kartvoices cvar.
2018-07-29 23:51:08 +01:00
toaster
2907fe8836 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-29 23:07:15 +01:00
toaster
0dddf7623a Buggy netgame! Sorry yalls.
* Fix free play on intermission.
* Fix crash in killing/damaging mobj with null death/pain state.
2018-07-29 23:07:10 +01:00
TehRealSalt
8d4fd5a1ea sink 2018-07-29 15:59:35 -04:00
TehRealSalt
74e182237a Revert bad RNG 2018-07-29 15:09:20 -04:00
toaster
f125573048 Some minor things to help draw sonicitems to a close.
* "kartvoices" cvar. Possible values "Never", "Tasteful" (default), and "Meme".
* Added a way to move quickly through the credits, rather than skip them entirely (hold spacebar or down arrow).
* Fix a few mistakes in M_ChangeCvar, some of which I introduced and some of which were weird in the first place.
* Tweak the offset of the arrows that let you know you can modify a cvar by pressing left or right (some via a patch.kart change, but others via tweaking the drawing location).
2018-07-29 18:35:56 +01:00
toaster
62c6bc0a13 Change brightness of buffer fade in intermission (Oni-approved). 2018-07-29 01:04:43 +01:00
TehRealSalt
f0f9e204aa Reverse gravity fixes pt 1: basic driving
- Turning dust is spawned in the correct position
- Turning dust sprites are flipped
- Shadows display on the ceiling for flipped objects
- Drift sparks display in the correct position for flipped players

Will continue with item fixes tomorrow
2018-07-28 02:37:00 -04:00
Steel Titanium
c02ee9a502 Re-did this fix. 2018-07-28 01:58:25 -04:00
TehRealSalt
a80c6ccf39 Fix basenumlaps prints 2018-07-27 22:21:13 -04:00
TehRealSalt
7073c9ede2 Use joysticks 1-4 by default, restore KEY_BACKSPACE functionality
These are both huge boons for gamepad functionality. If we can add a way to add a menu key, then all of the controller requirements for v1 will be covered.
2018-07-27 22:16:56 -04:00
TehRealSalt
25c344a6e8 A lot more safety checks on the voting screen for spectators
- A new variable, voteclient.loaded, for keeping track of whenever or not voting data has been set up or not. Gets set to true in Y_StartVote, false in Y_UnloadVoteData. This is used to prevent drawing the screen in cases where it would crash, and preventing duplicate Y_EndVote calls.
- The game checks for all spectator when transitioning to vote, to decide whenever or not it should skip it entirely or not.
- Unrelated: made the roulette cheating much more common. Hopefully it's as cheaty as Mario Party now :p
2018-07-27 21:59:00 -04:00
TehRealSalt
8c8d7127f6 Actually, add another point here, too~ 2018-07-27 18:04:27 -04:00
TehRealSalt
68aa98eb42 Better Grow odds 2018-07-27 17:56:10 -04:00
TehRealSalt
ca115c1d71 15 tic delay on first instashield 2018-07-27 17:22:51 -04:00
TehRealSalt
22a87e5926 Experimental air speed cap
Made very easy to revert if needed. tbh I can hardly notice it unless if I pay attention, and it most definitely never happens without Grow
2018-07-27 17:08:45 -04:00
TehRealSalt
f9e5a11060 - Instashield on failed damge
- Ballhog explosion separated onto another sprite
- Disabled banana jitter
2018-07-26 20:12:42 -04:00
toaster
bd12658355 Added the ability to toggle the f-zero style elimination of last place specifically.
Type `karteliminatelast off` to turn it off, and `karteliminatelast on` to... you know the rest.
2018-07-25 21:33:03 +01:00
TehRealSalt
0dc2c43a67 Banana drag touches
- Banana drag timer resets when placing one, for x3 & x10 bananas
- Banana dragging spawns transulcent dust
- Dragging bananas make them twitch up & down
2018-07-25 12:49:30 -04:00
TehRealSalt
b42d083b99 Finishing touches on Ballhog
- Ballhog has explosion + sound on death
- Ballhog shrinks to nothing if it didn't hit anything
- Replaced a Mario sound on Orbinaut
- Fixed Jawz's sound effect
- Fixed Mines not being removed on death pits
2018-07-24 22:47:09 -04:00
toaster
5a9e10c663 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems
"It is only the *results* that remain in this world! All the *actions* you take in a world where time is erased are meaningless!" - Diavolo, Chapter 520
2018-07-24 22:13:20 +01:00
toaster
4f1ddaaa7d Fix buffer overrun and iteration clobbering in D_SetupVote by:
* Decreasing number of writes - now the unchanging gametype is only written once, and both gametypes are written as UINT8s instead of UINT16s.
* Increasing size of buffer to match new threshold.
2018-07-24 22:04:27 +01:00
wolfy852
f98bc6f851 Fix a minor conditional error in d_netcmd.c 2018-07-23 19:50:28 -05:00
toaster
4f23b84f92 ...fix it properly instead of rushing into it at 1am 2018-07-24 01:12:40 +01:00
toaster
823497ea06 Fix accidentially tripped PARANOIA error for teamchanges. 2018-07-24 01:03:59 +01:00
toaster
bd78c34b99 Encore mode - a fresh take on mirror mode!
* Palette remaps.
* Branding.

TODO:
* Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but...
* Transmaps are broken in Encore for some reason.
* I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 23:50:41 +01:00
TehRealSalt
f820733d9b Orbinaut 2018-07-22 20:55:18 -04:00
TehRealSalt
6ddfc904da Merge branch 'bumpstuff' into sonicitems 2018-07-22 18:19:29 -04:00
TehRealSalt
2f5baa6199 Item dist scales with low player count instead of just odds, you can change some cvars during start countdown 2018-07-22 18:15:11 -04:00
toaster
0711e21ffd Do Oni's suggested changes to the wipe-based level intro fade. https://cdn.discordapp.com/attachments/270211093761097728/470690865279401994/kart0019.gif 2018-07-22 21:49:17 +01:00
toaster
992b1dc795 MAP HELL IS REAL
* Force map hell if there are two or more non-spectators (ie, same condition as to not be in FREE PLAY) and everyone has selected the RANDOM level slot.
* Unique gasp-and-Shulk-based sounds for both forced and non-forced map hell occourances.
2018-07-22 21:02:31 +01:00
toaster
b4a0e0a83f Force the display of FREE PLAY on the pre-rankingsmode part of the intermission screen, since it's important to show what it was. When in rankingsmode, THAT'S when it's able to freely change with the number of players jumping in and out. 2018-07-22 17:39:09 +01:00
toaster
7564aa466e * FREE PLAY! The necessary corollary to HERE COMES A NEW CHALLENGER...
* Activates when there are less than two non-spectators in a netgame.
	* Shows flashing text at the bottom of the screen.
	* Prevents drawing several UI elements that only make sense with multiple players.
	* Prevents matchesplayed being increased.
* Improve the mapreset timer's behaviour.
	* Now you get to see the HERE COMES A NEW CHALLENGER screen as the starting frame of the relevant map transition, since it happens on mapreset being 1 rather than 0.
	* Make a bunch of normal gameplay stuff that might've activated unnecessarily during mapreset now not able to.
	* Hide some other stuff that might've been visible for no good reason.
* Improve Mirror mode.
	* First person now works with it!
	* Tweaked the minimap player heads. Although the main section of the automap is mirrored, it feels... wrong to mirror the player head? IDK, you may wish to revert this, but given that everything else is the right way around except for the level itself...* Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
* Disable the titlescreen demos, at least until we actually gear up for release and make real ones.
2018-07-22 16:16:03 +01:00
TehRealSalt
cac613f3ef Merge branch 'sonicitems' into bumpstuff 2018-07-22 00:32:11 -04:00
TehRealSalt
77165631c4 HERE COMES A NEW CHALLENGER 2018-07-22 00:31:02 -04:00
TehRealSalt
87cc2c28ce Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-21 17:45:25 -04:00
TehRealSalt
a4299ce069 Map reset timer 2018-07-21 15:54:05 -04:00
toaster
b818c8a2cf * Make cancelling a join work on the pause menu and console. (You need to write "changeteam spectator" to cancel a PF_WANTSTOJOIN.)
* Stop respawning spectators when their PF_WANTSTOJOIN request hasn't been processed yet.
* Handle PF_WANTSTOJOIN requests in GS_WAITINGPLAYERS.
* Refactor K_CheckSpectateStatus, and make it so PF_WANTSTOJOIN requests are processed if there's only one player in the server, even if they're on lap 2 or up.
* Make the player entry mechanism in P_SpawnPlayer use the PF_WANTSTOJOIN mechanism so that it can also take advantage of the level refresh mechanism with no extra code.
	* NOTE: This does a bad hack in order to not send multiple mapchanges while the joining timer is low! If you can think of a better way to do this, please let me know/commit it.
* Change the timer until you can hit ITEM again when a spectator who has to wait to join shorter.
* (controversial, but I think necessary) - flash the ITEM text when the above-mentioned timer is nonzero.
2018-07-21 16:45:08 +01:00
TehRealSalt
75f339f6c1 Spectator flashing tweak 2018-07-20 23:01:08 -04:00
TehRealSalt
99e1149ec3 Spinout quick fix 2018-07-20 22:51:18 -04:00
TehRealSalt
a63b172351 Merge branch 'sonicitems' into bumpstuff 2018-07-20 19:13:04 -04:00
TehRealSalt
6eaed1ac7b Spectator overhaul
- New player flag, PF_WANTSTOJOIN, added for setting up a spectator queue. You are allowed to join as long as no one has started lap 2.
- Map resets when two people have entered the game, so matches can start naturally without the need of an admin.
2018-07-20 19:11:36 -04:00
Alam Ed Arias
79e4c3760a Merge branch 'master' into next 2018-07-20 17:35:53 -04:00
Alam Ed Arias
1ee7eda0ad Fixup PROFILEMODE 2018-07-20 17:35:18 -04:00
TehRealSalt
91214fbee5 Small correction 2018-07-20 16:13:41 -04:00
TehRealSalt
584082882c More tweaking
- Getting wipeout bumped into offroad slows you down
- Orbinaut & Jawz are relative to your weight (Jawz is heavier), via new function K_GetMobjWeight
- Reorangized where K_KartBouncing is called so that wipeout changes don't affect Eggman Items
2018-07-20 16:13:02 -04:00
toaster
a69eef9d82 Fullbright drift sparks. 2018-07-20 13:08:38 +01:00
toaster
ebae845af8 Bugfix the exitlevel music condition to take into account all local players, rather than any player globally. 2018-07-20 13:02:34 +01:00
toaster
e30bbdde0b De-ghetto 2P splitscreen FINISH. https://cdn.discordapp.com/attachments/270211093761097728/469827997990649856/kart0012.gif 2018-07-20 12:37:09 +01:00
TehRealSalt
b891ebe614 Wipeout items bounce you 2018-07-20 03:41:26 -04:00
TehRealSalt
ce161e470f Merge branch 'sonicitems' into bumpstuff 2018-07-19 22:38:31 -04:00
TehRealSalt
d25cb1aa56 Wipeout bumps
- You can bump other people during spinout.
- Bumping during spinout activates a "slow down" timer, which increases your friction after a few tics.
- You have a Smash-style dust effect after a spinout bump, indicating clearly if you'll slow down or not.
2018-07-19 22:37:32 -04:00
toaster
c0a7891e60 Don't show (+ 0) for players that didn't get any points this round. 2018-07-19 16:28:36 +01:00
toaster
1f5f00da34 Acommodate MF2_SHADOW in first person view 2018-07-19 16:07:14 +01:00
toaster
c72225f58e More FINISH stuff!
* Make it two seconds exactly, instead of two and change.
* Draw it in battle too!
* While testing the above, I discovered 3p's karma comeback timer drawing was slightly broken. Fixed that too.
2018-07-19 15:58:07 +01:00
toaster
cdc5f92baf Fix another bug I introduced, this time on the Tab HUD. I shouldn't have tried to be too clever with lowestposition... 2018-07-19 15:56:21 +01:00
toaster
37bf55543f Minor across-board bugfixes re the past 24 hours of commits.
* d_main.c - fix the wipedef for skipping to the titlescreen to be the checkered one again.
* k_kart.c - Tweak drawtime's setting slightly.
* y_inter.c - Make endtic ALWAYS set when not netgame/splitscreen, to prevent an undesirable, possible hang whenever we add more stuff later.
2018-07-19 14:59:38 +01:00
toaster
1aa6267665 Further improvements to cv_timelimit support, to the point that I DO think it might be worth having on the menu (but mark the game as modified if it's touched, to discourage its overzealous use?) 2018-07-19 14:39:46 +01:00
toaster
7af613a814 Some more intermission stuff.
* Combine three basically-identical functions into a generic framework function that takes a function pointer for the purposes of comparison!
	* Y_CalculateMatchData handles the (re)calculation of data.match whenever necessary.
	* Y_CompareRace handles time comparisons for Race.
	* Y_CompareBattle handles score comparisons for Battle.
	* Y_CompareRank handles rank comparisons for both gametypes.
* Move the recalculation for the rankingsmode to a different, non-drawing function.
* Re-organise Y_Ticker for sanity purposes.
* Tweak the countdown timer on both intermission and vote screens.
2018-07-19 14:29:11 +01:00
toaster
fc2d12425e * Correct a bug with data.match.increase's ordering changing between CalculateTournamentPoints/CalculateMatchWinners and MakeRankingsTable.
* Per Sal's request, remove all commented out code that was just inhereted from vanilla (or is unlikely to ever be re-enabled again if it was written for Kart) in y_inter.c.
2018-07-19 13:23:15 +01:00
TehRealSalt
0050e430af Made the items odds smoother!
What the heck does THAT supposed to mean, I hear you ask? Well...
- Mashing for items' effect on chances is now relative to how fast you pressed it! I'll give a more detailed explanation in #main_kart_dev.
- Instead of coding the Auto Frantic Items setting like I said I would, I did the same effect in a completely different way! Odds will automatically get better depending on how many players below 5 there are.
2018-07-19 03:31:14 -04:00
TehRealSalt
983a9dbd60 Use simpler logic for squishing other players
Instead of comparing k_growshrinktimer in awkward ways, just make sure the squishing player's scale is high enough above the victim's scale. This way, we can allow shrunk players to bump other shrunk players, and grown players to bump other grown players.
2018-07-19 01:11:21 -04:00
TehRealSalt
5e51c9b847 Enhance toaster's awesome intermission work a bit further
- Further divide the 2 screens' functionality; the first screen is purely for match results, the second screen is purely for rank results. (only time/score is on the first page, only rank and rank increase is on the second page, instead of time/score and rank increase being on the first page, then rank increase carries over to the rank page...)
- The page switch now happens at exactly the halfway point of the intermission timer
- It now uses a cool picture of the view buffer, like SRB2 SP, except faded, instead of the previous intermission tile.
- Fixed an issue with the previous commit.
2018-07-19 00:07:13 -04:00
TehRealSalt
b231421c80 I'll one-up your request, toaster
Just make P_EndingMusic not do anything for non-local players, since P_RestoreMusic wouldn't either.
2018-07-18 22:01:52 -04:00
toaster
7e0d5a479c Fix the egregrious bugs from our last testing netgame.
* Made Got_Teamchange's level-based stuff only happen in GS_LEVEL.
* If, by chance, DoTimeOver gets called on a player without an object, it won't crash either.
* Make ending music play when you get time overed.
* Make changing-to-spectators get removed from the intermission drawer.
2018-07-19 01:27:36 +01:00
toaster
f6a00cc60e COOL(!/?) 2018-07-18 23:42:34 +01:00
toaster
2054859691 RACE FINISH ANIMATION GRAPHIC! Scrolls across the screen, magestically. Like an eagle. Piloting a blimp. 2018-07-18 23:20:08 +01:00
toaster
a036e9cdc8 A bunch of little things.
* Fix both cv_timelimit and cv_pointlimit as "hidden options" for people to play with if they know about them via the console.
* Show GAME SPEED on the tab screen.
* Fix Invincibility and Grow's music changes being broken. (I didn't test them properly when making them P_RestoreMusic calls, sorry.)
* Stop showing the First Person Kart view in spectator mode, per Sal's request.
2018-07-18 21:40:04 +01:00
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
TehRealSalt
02dd7280c5 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-16 18:12:02 -04:00
TehRealSalt
534766df40 Expose P_SpawnShadowMobj 2018-07-16 18:11:35 -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
TehRealSalt
cc64c71027 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-16 15:39:50 -04:00
TehRealSalt
bb8142460e Workaround for EVALUATION support for now 2018-07-16 15:37:05 -04: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
Monster Iestyn
6b1fa399dc Use plain malloc instead of Z_Malloc to allocate sound buffers in mixer_sound.c's I_GetSfx.
This should prevent I_FreeSfx making a mess of things later, hopefully.
2018-07-14 18:15:59 +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
d21b6282f3 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-12 19:05:18 -04:00
TehRealSalt
4032a14581 Change how battle music/patch is decided 2018-07-12 19:04:37 -04:00
toaster
7f96774dbd Layout tweaks to record attack menu and statistics screen. 2018-07-12 15:45:00 +01: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
Monster Iestyn
a06ef26149 Merge branch 'master' into next 2018-07-11 21:37:23 +01:00
Monster Iestyn
8e19611033 Merge branch 'opengl-fof-lowerunpegged' into 'master'
OpenGL: FOF walls + Lower unpegged

See merge request STJr/SRB2!258
2018-07-11 16:36:26 -04:00
Monster Iestyn
09ae0aae53 Merge branch 'master' into next 2018-07-11 21:18:39 +01:00
Monster Iestyn
c127ea3ceb Merge branch 'opengl-projectsprite-fix' into 'master'
OpenGL HWR_ProjectSprite fix

See merge request STJr/SRB2!255
2018-07-11 16:15:42 -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
9da279006f Merge branch 'master' into sonicitems 2018-07-10 17:02:55 -04:00
toaster
0accb8fca7 While we're doing it, fix the animation/music happening while paused! 2018-07-10 19:51:34 +01:00
toaster
c65a2e3177 Fix unpausing when you're a waitingplayers admin. 2018-07-10 19:39:11 +01:00
Sryder
bbbc0d3820 User server instead of checking servernode
For some reason both node and servernode are identical at that point.
Both were 1 for the client when I tried it myself.
2018-07-10 19:21:59 +01:00
toaster
fffe82b863 Correction to the bug that prevented starting a server. 2018-07-10 13:29:44 +01:00
toaster
a3e294062d Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-09 22:38:51 +01:00
Sryder
fa0132bef6 Merge branch 'gamestate-download-fix' into 'master'
Don't set joining clients to immediately be connected

See merge request KartKrew/Kart!3
2018-07-09 15:45:20 -04:00
TehRealSalt
6bfe7bd134 Merge branch 'master' into sonicitems 2018-07-09 00:52:38 -04:00
TehRealSalt
0377956276 This is wrong and is causing issues and I'm entirely surprised this hasn't tripped vanilla yet 2018-07-08 19:07:54 -04:00
TehRealSalt
44e2215448 The last error
Sryder & toaster, please check for me with your compile setups, but this looks like the last warning, in both Release & Debug builds
2018-07-08 18:05:22 -04:00
TehRealSalt
ec0c358755 Merge branch 'master' into sonicitems 2018-07-08 17:51:44 -04:00
Sryder
d10883b033 Don't set joining clients to immediately be connected
They need to download the gamestate first
2018-07-08 21:46:23 +01:00
TehRealSalt
2c7082a475 Internal sky improvement ports
Horizon lines, barrel sky distortion
2018-07-08 15:44:01 -04:00
colette
0a931a1364 Update f_finale.c 2018-07-07 20:20:46 -04:00
Sryder
cd898707d7 Silly fixes to absurd compiler warnings
Thanks toaster
2018-07-07 23:49:34 +01:00
TehRealSalt
b3b264e745 Merge branch 'debug-fix' of https://git.magicalgirl.moe/KartKrew/Kart into debug-fix 2018-07-07 17:43:30 -04:00
TehRealSalt
278fd87452 Fix Sryder's bool error
I don't seem to get this error for some reason, even after upgrading to w64 & GCC 7.2.0, but hopefully this fixes it
2018-07-07 17:33:26 -04:00
Sryder
50f6053ecf 22 needs to be added to these char arrays to account for zone title being a settable string 2018-07-07 22:10:26 +01:00
TehRealSalt
8d056d3ca5 better parentheses 2018-07-07 16:46:32 -04:00
Alam Ed Arias
17570c1ad6 Merge branch 'master' into next 2018-07-07 16:42:50 -04:00
Alam Arias
a79b9a9127
Update m_misc.c 2018-07-07 20:41:11 +00:00
TehRealSalt
85ab4015eb The remaining errors on a GCC 6.3 setup 2018-07-07 16:38:54 -04:00
TehRealSalt
2e3afaa7f5 Fix incorrect PRIdS
Thanks, Alam!
2018-07-07 16:38:14 -04:00
Alam Arias
7da6aca450
Update m_misc.c 2018-07-07 20:33:19 +00:00
toaster
97348beb66 Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably:
* Remove FUNCMATH from all void-returning functions, given GCC80 specifically complains about this case.
	* Extend the length of all extant buffers to the safety threshold recommended by the compiler.
	* Add void casts to WS_getaddrinfo's setting to prevent complaints about incompatible typecasts.
	* Extend the charsel, face, and superface buffer sizes and writes to include the null terminator. (I didn't really want to do this because it's not even particularily NEEDED, but there was literally zero way to get around the request that I could find with multiple online searches. I tried.)
2018-07-07 16:52:01 +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
7e7f4dc5bc F_WaitingPlayersTicker() -> F_WaitingPlayersTicker(void) 2018-07-06 19:44:21 -04:00
Sryder
7b82d0e695 Fix warning relating to max 0 with an unsigned variable
I've looked at the code above and can't see anything that would try to lower the value below 0 as it's mostly just addition and dividing
2018-07-07 00:34:03 +01:00
toaster
292b529c51 Free unwittingly malloc'd memory. 2018-07-06 23:59:05 +01:00
Sryder
5d342f32c8 Merge branch 'master' into sonicitems 2018-07-06 23:33:54 +01:00
toaster
6c8a92b44f Remove the need for sending the savegame if you're the host. You don't need to send it to yourself. What are you doing? 2018-07-06 23:18:22 +01:00
toaster
e37efda57e Fix a crashy oversight in the archiving! 2018-07-06 23:18:18 +01:00
toaster
39e6169b42 Improve the defaulting thing to not play the sound if the cvar isn't to be touched. 2018-07-06 20:55:22 +01:00
toaster
5c5cbeeea2 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-06 20:40:47 +01:00
toaster
1a2dfaed79 * Add a way to revert all non-awkward cvars back to their default settings, with special casing for prefcolor as a default for playercolor on the record attack menu.
* Make MT_GHOST's dispoffset -1, so that at the starting line in record attack your player is always visible even when you have multiple ghosts in play.
2018-07-06 20:40:42 +01:00
Sryder
6fc29ce37d Always send gamestate to joiners.
It's cut down already outside of levels, needed to stop Lua sending mobj references during intermission though.
This is needed because in the past there was a separate way to send player information to joiners that has since been removed. Meaning player information is always desynched for joiners during anything but levels.
2018-07-06 20:25:13 +01:00
Monster Iestyn
f1bba60373 Merge branch 'md2-fopen-error' into 'master'
More helpful error messages

See merge request STJr/SRB2!243
2018-07-06 14:38:59 -04:00
Monster Iestyn
130de10f97 Merge branch 'md2-smoother-interpolation' into 'master'
Smoother MD2 interpolation

See merge request STJr/SRB2!224
2018-07-06 14:38:37 -04:00
TehRealSalt
b77c54e6f1 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-06 14:24:08 -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
toaster
5f28e11fd2 Fix a bunch of issues with record attack!
* Fixed the issue where your runs would be saved as belonging to the wrong character.
	* Make the Ghost menu always visible. This isn't PERFECT, but it's better than hiding the option to toggle ghosts just because you're doing your first run as a new character.
	* Fix the number of laps carrying over from MP(!!!!!!!!! plugged a huge security hole for the authenticity of replays...)
Other stuff!
	* Hide map hell maps in the statistics.
	* Clean up some nonet stuff in the menu.
	* Put player setup last again, and tweaked its wording.
	* Disable the special Kart waiting for players behaviour when not playing a netgame - seeing a double gamestate transition in record attack is weird.
2018-07-06 18:08:35 +01:00
GoldenTails
761a221840 Merge remote-tracking branch 'STJrSRB2/master' into patch-1 2018-07-05 16:44:34 -05:00
Monster Iestyn
e5236c3137 Merge branch 'master' into next 2018-07-05 21:09:39 +01:00
Monster Iestyn
8c56e39c18 Merge branch 'lua-exploit-fix' into 'master'
Lua exploit fix

See merge request STJr/SRB2!259
2018-07-05 16:08:08 -04:00