Commit graph

4291 commits

Author SHA1 Message Date
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
TehRealSalt
bd3ae4a8f7 Switch Chao Cup & SMK Cup 2018-11-13 18:34:37 -05:00
Monster Iestyn
0c0cbb3b00 Merge branch 'mixer-sound-x64-fix' into 'master'
mixer_sound fix x64 build issue

See merge request STJr/SRB2!323
2018-11-13 17:42:23 -05:00
Monster Iestyn
a09ee2729c Merge branch 'extend-png-metadata' into 'master'
Save the current renderer to screenshots.

See merge request STJr/SRB2!324
2018-11-13 17:28:29 -05:00
mazmazz
86f48304ba Win32 boolean fixes 2018-11-13 17:24:19 -05:00
Steel Titanium
792d42ebd9 Save current renderer to screenshots 2018-11-13 17:19:22 -05:00
mazmazz
366aeadac4 Fix x64 build issue 2018-11-13 17:12:18 -05:00
mazmazz
9086d880a3 Update SDL Mixer to 2.0.4; remove unnecessary extra lib and include folders 2018-11-13 16:43:16 -05:00
mazmazz
b4de5baa08 Update SDL2 to 2.0.9; remove unnecessary extra lib and include folders 2018-11-13 16:40:43 -05:00
Monster Iestyn
f114f8cd26 Fix OpenGL's HUD not being scaled the same way as Software's, by removing an old OpenGL-specific hack for fdupx/fdupy 2018-11-13 18:14:59 +00:00
Monster Iestyn
0ed4efdb58 Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode 2018-11-13 18:13:51 +00:00
Monster Iestyn
b45622fc0e Merge branch 'monitors-floatbob-fix' into 'next'
Fix for object z positions on floating, bobbing FOFs

See merge request STJr/SRB2!316
2018-11-13 08:58:08 -05:00
TehRealSalt
b442d8a042 Carry over old explosion sfx flags 2018-11-13 01:09:36 -05:00
TehRealSalt
80fdcad166 Fix clash sound flags not being carried over 2018-11-13 01:06:13 -05:00
TehRealSalt
244cc61449 Lowered volume of drift sparks, made local 2018-11-12 17:18:39 -05:00
TehRealSalt
79f11a2675 Some tweaking
- Swap order of Silver & Gold, for menu appearances & bug fixing
- Ensure that totalplaytime and matchesplayed aren't kept when M_ClearSecrets getss called in M_EraseDataResponse
- Set sensible defaults for emblem sprite/color
2018-11-12 17:09:37 -05:00
Monster Iestyn
ad8f789935 Split camera initialisation code from P_SetupLevel, make sure the camera has an initial subsector set! 2018-11-12 20:07:45 +00:00
TehRealSalt
d1db7bbe15 Final emblem setup
- Added silver time medals for the new maps
- Added gold dev time medals for all maps
- Added 4 more matches played milestone medals
- Changed requirements for most silver time medals to be easier, especially in the early game
- Made all unlockable requirements higher, in both medals & matches, to balance out with the additional medals and make sure stuff is unlocked further into the first release week
2018-11-12 14:42:52 -05:00
Monster Iestyn
59b309be0f Fix monitors (and other objects) on a floating, bobbing FOF being stuck slightly above said FOF after it has finished bobbing 2018-11-12 16:23:59 +00:00
TehRealSalt
e9a432f7d0 Merge branch 'sfx-clean' 2018-11-12 04:26:02 -05:00
TehRealSalt
dbff5e96cf Use S2 rips on the title screen 2018-11-11 19:22:15 -05:00
TehRealSalt
339a2a6ee6 Clean-up of unused/removed sfx, replacement of the last remaining Mario sfx, and new sfx in some spots
- Replaced eggitem landing sfx
- Replaced banana landing sfx
- Replaced item tossing sfx
- Replaced item clashing sfx
- Added sfx for drift spark tier changing
- Added sfx for brake drifting
- Reverted Mario Mode sound replacement back to vanilla
2018-11-11 17:30:30 -05:00
toaster
4432fb106c Realign YOU ARE THIS PLAYER highlight on non-green-res voting 2018-11-11 14:36:24 +00:00