fickleheart
b9ae148af6
Merge branch 'colormap-caching-workaround' into version-prep
2019-03-16 14:59:55 -05:00
fickleheart
50c0ed0f07
Fix bad merge in map data archiving code
2019-03-16 14:56:56 -05:00
fickleheart
875506e6cc
Don't free this cached colormap!
2019-03-16 12:22:11 -05:00
fickleheart
f18d2a684b
Merge branch 'lua-ticcmd-latency' into version-prep
2019-03-16 02:41:19 -05:00
fickleheart
d727492c87
Merge branch 'colormap-caching-workaround' into version-prep
2019-03-16 02:41:14 -05:00
fickleheart
0b1cc92f1a
Allow reading ticcmd latency
2019-03-16 02:19:43 -05:00
fickleheart
ebe76f7a1b
Remove dumb special case
2019-03-16 01:29:13 -05:00
fickleheart
cd4fc40b9e
Cache colormaps everywhere to avoid memory leaks
2019-03-16 00:39:52 -05:00
fickleheart
abc479980c
Update patch.kart hash again
2019-03-16 00:35:13 -05:00
fickleheart
fd12ff9163
Merge branch 'kartstuff-fix' into version-prep
2019-03-16 00:02:40 -05:00
Steel Titanium
6d751ff302
Remove the define.
2019-03-15 18:46:25 -04:00
Steel Titanium
5a170b9e4e
Merge branch 'master' into errorifpng
2019-03-15 16:40:47 -04:00
Steel Titanium
67a80ba311
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command
2019-03-15 16:13:31 -04:00
Digiku
c0782aa89e
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
6b93ca9221
Intermission: Don't fade out level music when using win32 midi volume hack
2019-03-15 01:26:13 -04:00
mazmazz
6cf05a4613
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
Digiku
dcd8669ec2
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
bd9e42ce6e
Merge branch 'public-gl-next' into public-musicplus-inter
2019-03-14 23:42:16 -04:00
Sal
bc85256add
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
fdde5f13c5
When resetting volume on same music, make it fade instead of a hard change
2019-03-13 23:55:30 -04:00
mazmazz
67e2857303
When changing to same music, reset the internal volume
2019-03-13 23:41:35 -04:00
mazmazz
c021e29835
Restore MUSIC_RELOADRESET if block in g_game
2019-03-13 21:18:23 -04:00
mazmazz
2c75d4da69
Fix custom fade source bug for Change Music linedef
2019-03-13 19:53:16 -04:00
mazmazz
aea18f36ba
Remove MP3 warning
2019-03-13 19:51:45 -04:00
mazmazz
93626c2293
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
fickleheart
bae86bbca4
Oh, this was already here...
2019-03-12 08:39:25 -05:00
fickleheart
ee3580098b
Add missing deh entry for k_starpostflip
2019-03-12 07:34:47 -05:00
fickleheart
3aa1e78345
Update version and patch hash
2019-03-11 22:40:15 -05:00
fickleheart
9ff8b73936
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
c30c3f7a3a
Merge remote-tracking branch 'remotes/upstream/next' into HEAD
2019-03-11 21:53:53 -05:00
fickleheart
fcf072cbeb
Merge remote-tracking branch 'remotes/upstream/master' into HEAD
2019-03-11 21:53:47 -05:00
fickleheart
1975a9b885
Prevent music changes from playing when unfocused
2019-03-11 21:48:29 -05:00
Steel Titanium
d6046088a0
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
b6572eceae
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name
2019-03-11 21:54:53 -04:00
wolfs
24b5079f20
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
af67c7abf5
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
8c40f2a10e
Remove disableSpeedAdjust
2019-03-11 17:23:41 -05:00
James R
0f9648eac0
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
bb187c1d27
Make "Focus lost" HUD overlay optional
2019-03-11 12:50:01 -07:00
Latapostrophe
0e6083cf02
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
e2a5e8a18d
Merge branch 'master' into next
2019-03-11 10:01:57 -04:00
Alam Arias
5ca69ce234
Fix compiling with VS
2019-03-11 09:58:37 -04:00
wolfy852
2b66daf12d
Remove P_CanRunOnWater
2019-03-11 00:28:30 -05:00
fickleheart
3de3f10ad3
Make sure Fairy is before Popcorn
2019-03-11 00:10:03 -05:00
colette
6717e09e57
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
66c9d9aa83
Move modified check on -file addons later in startup
2019-03-10 19:44:31 -05:00
wolfy852
fae8833ff4
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
b9c3e56500
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
b955f4f66d
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
07ecfbc1d7
Fix compile warnings.
2019-03-10 23:51:52 +00:00
