fickleheart
e590659603
Don't free this cached colormap!
2019-03-16 12:22:11 -05:00
fickleheart
0f658555c4
Merge branch 'lua-ticcmd-latency' into version-prep
2019-03-16 02:41:19 -05:00
fickleheart
2f2f136da4
Merge branch 'colormap-caching-workaround' into version-prep
2019-03-16 02:41:14 -05:00
fickleheart
272640f49a
Allow reading ticcmd latency
2019-03-16 02:19:43 -05:00
fickleheart
1b02ac10e2
Remove dumb special case
2019-03-16 01:29:13 -05:00
fickleheart
932f73a171
Cache colormaps everywhere to avoid memory leaks
2019-03-16 00:39:52 -05:00
fickleheart
95179ed1f3
Update patch.kart hash again
2019-03-16 00:35:13 -05:00
fickleheart
22b02ed7b3
Merge branch 'kartstuff-fix' into version-prep
2019-03-16 00:02:40 -05:00
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
TehRealSalt
b0ae2f1cfa
Finishing touches
2019-03-15 00:29:12 -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
TehRealSalt
e3434cf724
Merge branch 'doubled-boost' into draft
2019-03-14 19:45:33 -04:00
TehRealSalt
f2bbcbefa2
Drafting
2019-03-14 19:43:58 -04:00
TehRealSalt
45fb64c578
Fix item menu using wrong cvars
2019-03-14 17:35:13 -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
TehRealSalt
aa7660f0fe
fix warnings
2019-03-12 01:39:55 -04:00
TehRealSalt
40093a9213
Merge branch 'master' into rings
2019-03-12 01:27:11 -04: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
TehRealSalt
af1ce2d75e
Merge branch 'rings' into doubled-boost
2019-03-11 12:39:40 -04:00
TehRealSalt
6be405953f
Auto-use rings from Super Ring if they'd be wasted due to the cap
2019-03-11 12:39:26 -04:00
TehRealSalt
0f4fd73533
Try out boost stacking
2019-03-11 12:00:39 -04:00
TehRealSalt
5507a41d64
Make Grow not cancel if holding down from roulette
2019-03-11 11:10:53 -04:00
TehRealSalt
5afe936dd9
Remove Eggman monitor early detonation, allow using rings during the countdown
2019-03-11 11:01:01 -04:00
TehRealSalt
d11394f1bd
Remove ring boost when hurt
2019-03-11 10:38:11 -04:00