Commit Graph

3064 Commits

Author SHA1 Message Date
toaster a6ca459164 Fix all actionable comments in my review of sonicitems. 2018-08-09 22:59:52 +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
Monster Iestyn c8ea5cfcaa Merge branch 'transparency_i_hardly_knew_er' into 'master'
Transparency? I hardly knew 'er!

See merge request STJr/SRB2!264
2018-08-07 15:29:35 -04: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 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 5943eb125e Merge branch 'lua-archive-long-string-fix' into 'next'
Fixes for archiving/unarchiving Lua strings in netgames

See merge request STJr/SRB2!262
2018-08-06 10:12:59 -04:00
Monster Iestyn 8d54d8adaa Merge branch 'password-fix-hotfix' into 'master'
Password fix hotfix

See merge request STJr/SRB2!261
2018-08-06 09:43:54 -04: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