vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4287 commits 50 branches 7 tags 75 MiB
Commit graph

4287 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Ed Arias f81d01edca 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 d14f87b8c6 Cleanup whitespace 2018-11-14 10:54:33 -05:00
Alam Ed Arias 938bf1605c Merge branch 'master' into next 2018-11-14 10:52:49 -05:00
Alam Ed Arias f73ea4f984 Clean up warnings 2018-11-14 10:52:16 -05:00
toaster 3b48bf0079 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 d9b1d33d89 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 8777d5c6c9 Comment context for declaration changes; remove extern terms 2018-11-14 08:15:38 -05:00
Marco Z 51768e7dd1 Remove unnecessary SDLCALL from xpm declarations 2018-11-14 08:06:07 -05:00
Monster Iestyn f3b59c1731 Fix VC project files to include hw_clip.c/h 2018-11-14 12:11:57 +00:00
Monster Iestyn 0625ffcf8a 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 ba9818c8ca Skip errors for staff ghosts 2018-11-14 05:20:51 -05:00
TehRealSalt 6afcde4aa5 More lenient balloon color setting 2018-11-14 04:45:40 -05:00
TehRealSalt 9119191b43 maps.kart quick patch 2018-11-14 04:16:13 -05:00
TehRealSalt 106d8c6d3f Remove "Kart" in front of the version number 
Just looks silly :V
 2018-11-14 01:12:58 -05:00
Sal f10e7bade4 Merge branch 'disable-develop' into 'master' 
Disable DEVELOP mode

See merge request KartKrew/Kart!85
 2018-11-14 00:52:00 -05:00
TehRealSalt 682599def8 Update hashes 
NO MORE FILE EDITING FOR V1!!
 2018-11-14 00:51:36 -05:00
TehRealSalt f859139353 Final title screen 2018-11-14 00:30:51 -05:00
Marco Z 0b97b2a76c Missed #ifdef HAVE_LIBGME in win_snd 2018-11-13 22:50:08 -05:00
mazmazz b4c87d585e Add SDL Mixer 2.0.4 VC package 2018-11-13 22:05:05 -05:00
mazmazz 85fc8a1d47 Add SDL 2.0.9 VC package 2018-11-13 22:02:18 -05:00
TehRealSalt 7c2535808f Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-13 21:02:49 -05:00
TehRealSalt 1ab5ac58a7 Title demos don't interrupt the music 2018-11-13 21:01:59 -05:00
toaster 6fb45fa2a9 replacement quit sounds per sal 2018-11-14 01:30:26 +00:00
toaster 5d2e638e8a final menu tweaks before i fall asleep in my chair 2018-11-14 01:27:01 +00:00
TehRealSalt 5a06ae76ea Switch Chao Cup & SMK Cup 2018-11-13 18:34:37 -05:00
Monster Iestyn 302358c403 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 41b4ffd458 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 2db2b6e6af Win32 boolean fixes 2018-11-13 17:24:19 -05:00
Steel Titanium 95ed3fcf7e Save current renderer to screenshots 2018-11-13 17:19:22 -05:00
mazmazz 894ee02f3f Fix x64 build issue 2018-11-13 17:12:18 -05:00
mazmazz 2e39e5ffdd Update SDL Mixer to 2.0.4; remove unnecessary extra lib and include folders 2018-11-13 16:43:16 -05:00
mazmazz ba821056ce Update SDL2 to 2.0.9; remove unnecessary extra lib and include folders 2018-11-13 16:40:43 -05:00
Monster Iestyn e9fe0ebae1 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 0d38061db8 Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode 2018-11-13 18:13:51 +00:00
Monster Iestyn 395a67196e 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 d09fd4b861 Carry over old explosion sfx flags 2018-11-13 01:09:36 -05:00
TehRealSalt 29c9448148 Fix clash sound flags not being carried over 2018-11-13 01:06:13 -05:00
TehRealSalt b009bddd3b Lowered volume of drift sparks, made local 2018-11-12 17:18:39 -05:00
TehRealSalt 13b51823ba 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 e85f73117c 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 faaea8abe3 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 63ba59341b 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 d0f21ca415 Merge branch 'sfx-clean' 2018-11-12 04:26:02 -05:00
TehRealSalt 91ae26e213 Use S2 rips on the title screen 2018-11-11 19:22:15 -05:00
TehRealSalt 93ab9850a3 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 71c72bf0c5 Realign YOU ARE THIS PLAYER highlight on non-green-res voting 2018-11-11 14:36:24 +00:00
Sryder b3f24ecb3e Merge branch 'nextmerge' into 'master' 
Merge In Vanilla Next

See merge request KartKrew/Kart!87
 2018-11-11 09:22:05 -05:00
Sryder 799efd5b31 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into nextmerge 2018-11-10 22:29:37 +00:00
toaster aece934083 Fix not found 40833 2018-11-10 22:27:04 +00:00
Sryder 6af56273bf Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge 
# Conflicts:
#	src/d_main.c
#	src/d_main.h
#	src/d_netcmd.c
#	src/doomtype.h
#	src/hardware/hw_md2.h
#	src/p_user.c
#	src/r_splats.h
#	src/s_sound.c
#	src/s_sound.h
#	src/screen.c
#	src/sdl/i_system.c
 2018-11-10 21:14:53 +00:00