Commit graph

23092 commits

Author SHA1 Message Date
mazmazz
304fdea710 Flicky stand states 2018-08-09 01:44:21 -04:00
mazmazz
41a438ece1 Mapthingnums for MT_SECRETFLICKYies 2018-08-09 01:01:20 -04:00
mazmazz
baa16c55fb Fix FlickyFly momentum on MTF_OBJECTSPECIAL 2018-08-09 00:57:35 -04:00
mazmazz
0bccca1a8b Assign mapthingnums to MT_FLICKY
* Type # 570-585
2018-08-09 00:17:46 -04:00
mazmazz
2526d2996e FlickyFly: Configure gravity by MTF_AMBUSH 2018-08-09 00:13:08 -04:00
toaster
36ec90ed21 * 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
829674aa6d 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
a291659b12 Merge branch 'sonicitems' into encore 2018-08-08 12:04:17 +01:00
toaster
a8ef5030f9 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
62ae9d5d64 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
fc68174e8b Merge branch 'master' into next 2018-08-07 20:54:19 +01:00
Monster Iestyn
c666f5f182 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
ca262dcbba 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
1348fa90ad Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore 2018-08-07 17:09:25 +01:00
Monster Iestyn
73ca0b4814 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
8b420c3e08 * 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
3aa2354724 * 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
9812df00d6 Merge branch 'master' into next 2018-08-06 15:15:35 +01:00
Monster Iestyn
8de4bb2be5 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
dcd31eadf8 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
2ad792ccd4 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
ed6f6e3a75 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
2ff3b5c677 * 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
65a32adaf4 Improve y_inter.c levelname setting. 2018-08-05 16:35:33 +01:00
toaster
992a6e5f08 * 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
464135d064 Chat wordwrap fix + Minichat bg highlight 2018-08-05 13:08:27 +02:00
TehRealSalt
2090a8032d Orbinaut shield 2018-08-04 16:54:48 -04:00
TehRealSalt
835a6fa9a8 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-08-04 15:48:50 -04:00
TehRealSalt
101f4f7eba Thunder shield overlay 2018-08-04 15:48:31 -04:00
toaster
080e8abde6 * 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
MascaraSnake
f0f8698d04 Reorganized the thing type numbers 2018-08-03 23:58:11 +02:00
toaster
d966d34627 * 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
Monster Iestyn
594cc953b5 Fix Cacolantern's preparing sound being played everywhere across the map
(or, in other words, fixing this to be the same as the equivalent state in the original SOC)
2018-08-02 16:15:30 +01:00
Monster Iestyn
502c80eaac Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00
Latapostrophe
c2ff88bb62 Fixed sub 400p chat for console 2018-07-31 23:56:23 +02:00
Latapostrophe
a6fa39b7cc Fix console leftover + positionning 2018-07-31 23:35:16 +02:00
Monster Iestyn
1b6e85fda0 Merge branch 'pk3-wad-map-noreload-hotfix' into 'master'
PK3 WAD Map NoReload hotfix

See merge request STJr/SRB2Internal!148
2018-07-31 14:43:14 -04:00
Monster Iestyn
f6b8206660 Merge branch 'public_next'
# Conflicts:
#	src/hardware/hw_md2.c
2018-07-31 19:41:54 +01:00
Monster Iestyn
10668f14b8 Merge branch 'master' into next 2018-07-31 19:36:30 +01:00
Monster Iestyn
e4f38995e7 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
6bf3274452 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
5aba0a4b5a merge sonicitems into chat-changes so that it's not lagging 10 years behind 2018-07-31 19:45:49 +02:00
Latapostrophe
ac8920ac7a Repositionning chat & bugfixes 2018-07-31 15:57:19 +02:00
Latapostrophe
a4bded8e9e SRB2chat test rework 2018-07-31 11:10:02 +02:00
toaster
9ea382ba16 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
0aba310643 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
36ebe5d116 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
bc9da8ee31 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
f9c9f06464 * 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
d9acbd0ddb Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-29 23:07:15 +01:00