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
mazmazz
368b12d6d9
Line 457: Calculate input angle tolerance correctly
2018-11-14 10:13:39 -05: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
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
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
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
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
mazmazz
4b63f20e9d
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-11-13 14:34:40 -05:00
mazmazz
22ce982335
Merge branch 'master' into musicplus-core
2018-11-13 14:19:04 -05:00
mazmazz
336610c042
Remove misplaced tutorialmode = false due to debugging
2018-11-13 14:12:22 -05:00
mazmazz
df7d23f00d
Merge branch 'master' into musicplus-core
2018-11-13 13:46:30 -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
Digiku
656a471908
Merge branch 'text-prompts' into 'master'
...
SOC and Line Exec Text Prompts
See merge request STJr/SRB2Internal!200
2018-11-13 11:14:02 -05:00
mazmazz
7b0ec6479f
Merge branch 'master' into text-prompts
2018-11-13 11:12:44 -05:00
Digiku
aac4a99e99
Merge branch 'tutorial-time' into 'master'
...
Tutorial mode handling
See merge request STJr/SRB2Internal!201
2018-11-13 10:49:02 -05:00
Digiku
38107c9b3d
Merge branch 'control-switching' into 'master'
...
Game control switching
See merge request STJr/SRB2Internal!202
2018-11-13 10:48:18 -05:00
Digiku
3f7df0561d
Merge branch 'tracerangle' into 'master'
...
Line Exec 457, 458: Track mobj's angle to tracer; executes line tag if mobj faces away
See merge request STJr/SRB2Internal!198
2018-11-13 10:48:01 -05:00
Digiku
d10191ea5d
Merge branch 'monitor-exec' into 'master'
...
Run linedef exec upon popping a monitor
See merge request STJr/SRB2Internal!199
2018-11-13 10:47:37 -05:00
