SeventhSentinel
79a848252e
hud stuff
...
eggman nums & rocket sneaker bar
2018-08-12 10:15:55 -04:00
toaster
a8826146b3
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
Alam Ed Arias
e7eaba0118
Merge branch 'master' into XPMupdate
2018-08-11 21:59:39 -04:00
Alam Ed Arias
ca8de769a8
TravisCI: also remove gcc-6
2018-08-11 21:59:08 -04:00
Alam Ed Arias
5b5013c9b1
TravisCI: gcc-4.9 is also gone
2018-08-11 21:44:07 -04:00
SeventhSentinel
3b71aa9be3
fixed n blame
2018-08-11 20:54:08 -04:00
Alam Ed Arias
e4317066a6
Merge branch 'master' into XPMupdate
2018-08-11 20:37:34 -04:00
Alam Ed Arias
e7ec2e3830
Merge branch 'xpm_fix' into 'XPMupdate'
...
Fix white being treated as transparent.
See merge request STJr/SRB2!266
2018-08-11 20:36:57 -04:00
SeventhSentinel
ef81b2d498
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems
2018-08-11 20:19:12 -04:00
SeventhSentinel
8dcee904a5
eggman
...
broken
2018-08-11 20:19:09 -04:00
toaster
5f21a8c925
Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems
2018-08-11 22:52:09 +01:00
toaster
95da13071d
* 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
TehRealSalt
6cdbb7c896
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
cd790eca91
Fix white being treated as transparent.
2018-08-10 19:02:03 -04:00
toaster
ba573eb9d2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems
2018-08-10 23:21:57 +01:00
Alam Ed Arias
e04d13f647
TravisCI: remove gcc-5 test, gcc-5 package is gone
2018-08-10 17:16:26 -04:00
Alam Ed Arias
8f6d20d53c
SDL: update IMG_xpm.c
2018-08-10 17:09:11 -04:00
Monster Iestyn
877ac62895
Merge branch 'master' into next
2018-08-10 19:31:15 +01:00
Monster Iestyn
0001260b3a
Merge branch 'woops!_all_trans' into 'master'
...
Woops! All trans
See merge request STJr/SRB2!265
2018-08-10 14:27:45 -04:00
toaster
bc3fcc8ed0
Fix issue where random boxes would become invisible after respawning in race.
2018-08-10 15:38:32 +01:00
toaster
435784d6c0
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
d351cd535a
Orbinaut x4
2018-08-09 22:52:22 -04:00
TehRealSalt
b6807fc78f
Lap start animation
2018-08-09 21:52:02 -04:00
toaster
471796d8a3
Fix all actionable comments in my review of sonicitems.
2018-08-09 22:59:52 +01:00
toaster
dd31c02415
...and R_DrawTranslucentSplat_8, even though it isn't used!
2018-08-09 17:08:20 +01:00
toaster
e11a734b2f
Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well.
2018-08-09 16:56:43 +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
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
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
Latapostrophe
a6fa39b7cc
Fix console leftover + positionning
2018-07-31 23:35:16 +02: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