Steel Titanium
e47854880a
Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into forceskin-by-name
2019-03-27 19:18:51 -04:00
fickleheart
5c6f142da1
LAT
2019-03-17 21:44:11 -05:00
Sryder
03f762bd56
Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git
2019-03-17 22:59:08 +00:00
fickleheart
1a27ad4105
Merge branch 'version-prep'
2019-03-17 17:55:38 -05:00
Sryder
8d1372bec8
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next
2019-03-17 22:54:28 +00:00
fickleheart
bd5c8f0ce5
Merge remote-tracking branch 'remotes/james/move-changeviewpoint' into version-prep
2019-03-17 16:37:01 -05:00
fickleheart
6555802dc0
Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep
2019-03-17 16:36:52 -05:00
James R
81669c9372
Resume sounds on unpausing after a window re-focus
2019-03-16 15:50:16 -07:00
James R
52deb3ea74
Move change viewpoint control checking so it doesn't take precedence
...
Notably over chat.
2019-03-16 15:42:18 -07:00
fickleheart
344b43d151
Merge branch 'netarchive-fix' into version-prep
2019-03-16 15:00:02 -05:00
fickleheart
8670de1398
Merge branch 'colormap-caching-workaround' into version-prep
2019-03-16 14:59:55 -05:00
fickleheart
93bd5b61c9
Fix bad merge in map data archiving code
2019-03-16 14:56:56 -05:00
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
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
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
