Steel Titanium
4757031929
Remove the define.
2019-03-15 18:46:25 -04:00
Steel Titanium
4837c1742b
Merge branch 'master' into errorifpng
2019-03-15 16:40:47 -04:00
Steel Titanium
adcc8fe0d8
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command
2019-03-15 16:13:31 -04:00
Digiku
fa581b7518
Merge branch 'public-musicplus-feature-interfadeout' into 'next'
...
Fade out level music during intermission via level header
See merge request STJr/SRB2!470
2019-03-15 01:40:23 -04:00
mazmazz
a40c6f0125
Intermission: Don't fade out level music when using win32 midi volume hack
2019-03-15 01:26:13 -04:00
mazmazz
1381343a2e
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
Digiku
58c6d839d3
Merge branch 'public-musicplus-inter' into 'next'
...
Custom intermission music by level header [by SteelTitanium]
See merge request STJr/SRB2!469
2019-03-15 00:23:45 -04:00
mazmazz
a9b6bad96a
Merge branch 'public-gl-next' into public-musicplus-inter
2019-03-14 23:42:16 -04:00
Sal
0942793cf5
Merge branch 'kartstuff-fix' into 'master'
...
Add missing deh entry for k_starpostflip
See merge request KartKrew/Kart!127
2019-03-14 17:32:22 -04:00
mazmazz
bdb9e8cfda
When resetting volume on same music, make it fade instead of a hard change
2019-03-13 23:55:30 -04:00
mazmazz
2c823703f9
When changing to same music, reset the internal volume
2019-03-13 23:41:35 -04:00
mazmazz
aa22941d2c
Restore MUSIC_RELOADRESET if block in g_game
2019-03-13 21:18:23 -04:00
mazmazz
06f4f355ff
Fix custom fade source bug for Change Music linedef
2019-03-13 19:53:16 -04:00
mazmazz
832a6433c2
Remove MP3 warning
2019-03-13 19:51:45 -04:00
mazmazz
937a423664
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
fickleheart
6456754c1b
Oh, this was already here...
2019-03-12 08:39:25 -05:00
fickleheart
b76201a0df
Add missing deh entry for k_starpostflip
2019-03-12 07:34:47 -05:00
fickleheart
0a22f07751
Update version and patch hash
2019-03-11 22:40:15 -05:00
fickleheart
e536252a8a
Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD
...
# Conflicts:
# src/k_kart.c
# src/p_mobj.c
2019-03-11 21:59:45 -05:00
fickleheart
5c4c0a5ff6
Merge remote-tracking branch 'remotes/upstream/next' into HEAD
2019-03-11 21:53:53 -05:00
fickleheart
e316963e1a
Merge remote-tracking branch 'remotes/upstream/master' into HEAD
2019-03-11 21:53:47 -05:00
fickleheart
b028f33455
Prevent music changes from playing when unfocused
2019-03-11 21:48:29 -05:00
Steel Titanium
df8a5ffc1e
Change array size from MAXSKINS+1 to MAXSKINS+2
...
Also Set the values to 0/NULl, it will be overwritten later when a skin is assigned to the slot.
2019-03-11 22:11:36 -04:00
Steel Titanium
12d0d6ff77
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name
2019-03-11 21:54:53 -04:00
wolfs
2195709d31
Merge branch 'color-flip' into 'next'
...
Fix color enums more
See merge request KartKrew/Kart-Public!112
2019-03-11 19:28:24 -04:00
wolfs
f4947820e4
Merge branch 'maxskins-bump' into 'next'
...
Bump MAXSKINS to 128 + Clean up skin struct
See merge request KartKrew/Kart-Public!82
2019-03-11 19:28:16 -04:00
wolfy852
d0fe0abc9c
Remove disableSpeedAdjust
2019-03-11 17:23:41 -05:00
James R
b91701c948
Miscellaneous window de-focus options
...
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.
(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
James R
ffa3a3f3c6
Make "Focus lost" HUD overlay optional
2019-03-11 12:50:01 -07:00
Latapostrophe
395df49ff0
Fix what was discussed, minus the rocksneaker math which is still shady, but let's not break what currently works
2019-03-11 18:53:23 +01:00
Alam Arias
06cd65cc72
Merge branch 'master' into next
2019-03-11 10:01:57 -04:00
Alam Arias
ed0df9966d
Fix compiling with VS
2019-03-11 09:58:37 -04:00
wolfy852
82d93a95fd
Remove P_CanRunOnWater
2019-03-11 00:28:30 -05:00
fickleheart
ebee7232c7
Make sure Fairy is before Popcorn
2019-03-11 00:10:03 -05:00
colette
f1cd65eccc
Merge branch 'file-exploit-fix' into 'master'
...
Fix majormods not getting set for files added via -file
See merge request KartKrew/Kart!126
2019-03-10 22:24:33 -04:00
fickleheart
ba6975607a
Move modified check on -file addons later in startup
2019-03-10 19:44:31 -05:00
wolfy852
f526955783
Fix the game getting flagged as modified by default
...
As a result, majormods trips for Lua and map replacements now, but modifiedgame isn't set for minor addons...
2019-03-10 19:27:45 -05:00
Sryder
fd59bfc341
Move FORCECLOSE definition to be out of NONET ifdef
...
Should this just be moved into d_net.h instead of defining it here and in d_net.c?
2019-03-11 00:13:43 +00:00
wolfy852
a24fe5e22d
Attempt to fix replaced maps not marking the game as modified
...
What this ACTUALLY does is mark the game as modified by default.
2019-03-10 18:55:55 -05:00
Sryder
e59481735f
Fix compile warnings.
2019-03-10 23:51:52 +00:00
colette
59374c56aa
Merge branch 'join-passwords' into 'next'
...
join passwords
See merge request KartKrew/Kart-Public!104
2019-03-10 19:12:59 -04:00
fickleheart
a16243e84d
Deduplicate character shifting code
2019-03-10 18:09:15 -05:00
fickleheart
f4486cb117
Remove unnecessary padding byte from stored challenge answers
2019-03-10 17:54:17 -05:00
fickleheart
40c77df793
Make sure we don't write kartspeed beyond SV_SPEEDMASK
2019-03-10 17:43:39 -05:00
fickleheart
892b4e77d9
Make noises on the password entry screen
2019-03-10 17:36:16 -05:00
fickleheart
7bd8effc65
Draw a padlock on-screen!
2019-03-10 17:25:55 -05:00
fickleheart
1cd8c15e8c
Show notice of a password-protected server on the join screen
2019-03-10 17:00:27 -05:00
fickleheart
99a934e352
Properly close the connection on the server's side...
2019-03-10 16:22:03 -05:00
fickleheart
a2f849c49c
Update packettypenames
2019-03-10 16:06:46 -05:00
fickleheart
ff7dd2699e
Merge remote-tracking branch 'remotes/upstream/next' into join-passwords
2019-03-10 15:54:06 -05:00
