Commit graph

4424 commits

Author SHA1 Message Date
Monster Iestyn
3350096b2f Fix VC project files to include hw_clip.c/h 2018-11-14 12:11:57 +00: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
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
Steel Titanium
1a35fbbd53 Make sure the new option only works on Windows.
Is this how you do it? I'm not really sure.
2018-11-13 20:37:14 -05:00
Steel Titanium
be3fac2908 Fix up 64-bit MINGW 2018-11-13 20:32:18 -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
Steel Titanium
6eec21f49d Merge branch 'master' into cmake-use-internal-libs 2018-11-13 19:46:43 -05: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
Steel Titanium
924594e6c6 Fix skybox disappearing after using objectplace command 2018-11-13 17:25:42 -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
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
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
Sryder
d0ed0701f8 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into nextmerge 2018-11-10 22:29:37 +00:00
toaster
378131ca3a Fix not found 40833 2018-11-10 22:27:04 +00:00
Sryder
9350721d12 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
MPC
1fcf3c8863 Render the skies correctly on splitscreen in OpenGL mode 2018-11-10 16:19:41 -03:00
Monster Iestyn
f3d129e1a6 Merge branch 'master' into next 2018-11-10 19:05:33 +00:00
Monster Iestyn
d3271c5797 Merge branch 'opengl-new-clipping-backport' into 'master'
OpenGL new clipping backport

See merge request STJr/SRB2!315
2018-11-10 13:57:16 -05:00
Monster Iestyn
8cacd3f876 Merge branch 'alias-recursion-hotfix' into 'next'
Alias recursion hotfix

See merge request STJr/SRB2!314
2018-11-10 13:56:43 -05:00
Monster Iestyn
51ee510b85 Merge branch 'gcc-compiling-cleanup' into 'master'
Compiling cleanup and fixes

See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
MPC
7c18702f84 Render the startup screen on OpenGL mode 2018-11-10 15:56:13 -03:00
toaster
692b1f0401 Three more CV_NOSHOWHELP's I missed the first time around. (Not making another exe for this, it'll show up the next time one is made... not that important.) 2018-11-10 18:50:19 +00:00
toaster
4281f59971 Merge branch 'fof-slope-skew-backport' of https://git.magicalgirl.moe/STJr/SRB2.git 2018-11-10 18:27:13 +00:00
Sryder
4834f098f5 Merge branch 'com_cleanup_redo' into 'master'
Improved "HELP" command

See merge request KartKrew/Kart!82
2018-11-10 12:51:51 -05:00
Monster Iestyn
2373a6d209 fix using abs() on unsigned 2018-11-10 17:40:09 +00:00
Monster Iestyn
58c8cbf71d Whoops, this broke my non-NEWCLIP test build 2018-11-10 16:10:25 +00:00
Monster Iestyn
3e0ec0ed6e clipping code didn't seem so bad this time (at least compared to without), let's enable it now? 2018-11-10 16:09:52 +00:00