Commit graph

4263 commits

Author SHA1 Message Date
toaster
b0fcb7c436 Fix Eggman shrink bug.
Specifically: removed K_StripOther calls from touching fakes: No, none of these things need to be stripped! Also, poke K_StripOther just in case it eventually becomes relevant to have it.
2018-11-17 14:41:08 +00:00
Sryder
c7f7434f96 Fix Battle Causing the game to crash in dedicated servers
Check that the displayplayer mo exists before trying to use it for scaling on Player Arrow
2018-11-16 23:07:27 +00:00
TehRealSalt
24215074d0 Minor credits issues 2018-11-16 12:05:57 -05:00
TehRealSalt
541443cfe8 add TOL_TV to dehacked 2018-11-16 12:04:24 -05:00
TehRealSalt
65d79b190c Ensure MS packets are sent correctly 2018-11-16 12:01:57 -05:00
TehRealSalt
4ceb09372a Final credits 2018-11-15 22:55:01 -05:00
TehRealSalt
0743867a56 Don't allow kart files to be downloaded 2018-11-15 19:18:04 -05:00
TehRealSalt
e77ec879f2 Add Kart files to Makefile 2018-11-15 19:17:49 -05:00
TehRealSalt
48f3c27625 Remove music.dta from loading
We've replaced/changed out all vanilla songs, so we no longer need it.
2018-11-15 19:17:06 -05:00
toaster
a998dc53de More cinematic title demos (hide most HUD elements, show a title logo in the bottom right hand corner). 2018-11-15 14:30:11 +00:00
Sryder
67f0b120c7 Squash various warnings
Shadowed declarations
Unsuffixed float constants
There's an unsuffixed float constant I can't fix because the define is outside of SRB2. We could have our own copy of Pi if we really wanted.
2018-11-14 21:53:57 +00:00
Monster Iestyn
d366ee76b6 Merge branch 'master' into next 2018-11-14 21:49:11 +00:00
Monster Iestyn
9e3e9a3248 Merge branch 'opengl-hud-scale-fix' into 'master'
OpenGL HUD scaling fix

See merge request STJr/SRB2!320
2018-11-14 16:48:13 -05:00
Alam Ed Arias
aef0d9a421 Merge branch 'master' into next 2018-11-14 15:45:29 -05:00
TehRealSalt
fbc4fbfd56 Add S_StopSoundByID to Lua
It was brought up to me in another server that character creators might want to have unique engine sounds. While I don't want to support that ourselves, as we have consistent engines for gameplay reasons, this gives people the ability to script around it if they so choose.

Plus, it's just generally useful and I'm surprised vanilla hasn't added it, even though they have the function to stop ALL sounds on an object.
2018-11-14 15:35:16 -05:00
MonsterIestyn
0ea835058c Merge pull request #313 from LJSonik/analog-flipcam-synch-fix
Fix desynch when toggling analog mode or flipcam
2018-11-14 19:57:47 +00:00
TehRealSalt
e50f08a357 This effect assumed that it was spawned at base scale anyway... 2018-11-14 14:48:16 -05:00
TehRealSalt
202f4a65cb Double spectator movement speed to keep up with action better, scale it with map size 2018-11-14 14:41:28 -05:00
TehRealSalt
b8a6d2993f Slightly less duplication 2018-11-14 14:39:37 -05:00
MonsterIestyn
44646db6af Merge branch 'master' into analog-flipcam-synch-fix 2018-11-14 19:36:39 +00:00
TehRealSalt
f3795ace88 Hide unlockables with ???s 2018-11-14 14:15:24 -05:00
Monster Iestyn
4e86572285 Merge branch 'master' into next 2018-11-14 18:01:31 +00:00
Monster Iestyn
a0bec73904 Merge branch 'public-sdl2mixer-update' into 'master'
Update SDL Mixer to 2.0.4

See merge request STJr/SRB2!322
2018-11-14 12:58:07 -05:00
Monster Iestyn
16451363b9 Merge branch 'public-sdl2-update' into 'master'
Update SDL2 to 2.0.9

See merge request STJr/SRB2!321
2018-11-14 12:57:54 -05:00
Alam Ed Arias
525bd219b6 Merge branch 'master' into next 2018-11-14 11:07:12 -05:00
Alam Ed Arias
05afaa586e Fix misleading indentation 2018-11-14 11:06:45 -05:00
Alam Ed Arias
3bd88acf25 Merge branch 'vc-xpm-fix' into 'master'
Remove unnecessary SDLCALL from IMG_xpm.c declarations

See merge request STJr/SRB2!327
2018-11-14 11:00:20 -05:00
Alam Ed Arias
fbb28ba1b5 Cleanup whitespace 2018-11-14 10:54:33 -05:00
Alam Ed Arias
a4726ee0b7 Merge branch 'master' into next 2018-11-14 10:52:49 -05:00
Alam Ed Arias
45c8920bb1 Clean up warnings 2018-11-14 10:52:16 -05:00
toaster
de85cc34e8 Hide SMK Cup until you've unlocked the Chao Cup on EXTRAS unless you've unlocked the Chao Cup. Fits with our modus operandi of minimising Mario exposure, while still having it for the committed. 2018-11-14 15:29:32 +00:00
toaster
b6f000948e Bugfixes:
* Use CV_NOSHOWHELP as an obstacle for CV_CompleteVar (so the hidden variables don't show up and ruin our party or anything).
* Hack around the karteliminatelast thing so we don't have to hex-edit the netids, and can release with current assets (but a different executable, of course, to get the credits).
* Fix M_HandleConnectIP not saving your current position on the menu if you use it while it's empty.
2018-11-14 15:28:17 +00:00
Marco Z
999a03aada Comment context for declaration changes; remove extern terms 2018-11-14 08:15:38 -05:00
Marco Z
f5fe8c46fa Remove unnecessary SDLCALL from xpm declarations 2018-11-14 08:06:07 -05:00
Monster Iestyn
3350096b2f Fix VC project files to include hw_clip.c/h 2018-11-14 12:11:57 +00:00
Monster Iestyn
fabcb3d842 Merge branch 'public-winsnd-libgme-fix' into 'master'
Missed #ifdef HAVE_LIBGME in win_snd

See merge request STJr/SRB2!326
2018-11-14 06:40:07 -05:00
TehRealSalt
3462133c5a Skip errors for staff ghosts 2018-11-14 05:20:51 -05:00
TehRealSalt
0bf46935da More lenient balloon color setting 2018-11-14 04:45:40 -05:00
TehRealSalt
db3a5ec181 maps.kart quick patch 2018-11-14 04:16:13 -05:00
TehRealSalt
2d63b2780c Remove "Kart" in front of the version number
Just looks silly :V
2018-11-14 01:12:58 -05:00
Sal
822d26a6b7 Merge branch 'disable-develop' into 'master'
Disable DEVELOP mode

See merge request KartKrew/Kart!85
2018-11-14 00:52:00 -05:00
TehRealSalt
102724a128 Update hashes
NO MORE FILE EDITING FOR V1!!
2018-11-14 00:51:36 -05:00
TehRealSalt
d0f869e8f5 Final title screen 2018-11-14 00:30:51 -05:00
Marco Z
af0fdfe6e5 Missed #ifdef HAVE_LIBGME in win_snd 2018-11-13 22:50:08 -05:00
mazmazz
98ba84f50d Add SDL Mixer 2.0.4 VC package 2018-11-13 22:05:05 -05:00
mazmazz
b438361869 Add SDL 2.0.9 VC package 2018-11-13 22:02:18 -05:00
TehRealSalt
01d4978149 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-13 21:02:49 -05:00
TehRealSalt
a8b57e6f0d Title demos don't interrupt the music 2018-11-13 21:01:59 -05:00
toaster
9d221c9f08 replacement quit sounds per sal 2018-11-14 01:30:26 +00:00
toaster
1f93f57a42 final menu tweaks before i fall asleep in my chair 2018-11-14 01:27:01 +00:00