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
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
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
colette
f4318aed58
Merge branch 'join-passwords' into 'next'
...
join passwords
See merge request KartKrew/Kart-Public!104
2019-03-10 19:12:59 -04:00
fickleheart
c65ff70faf
Deduplicate character shifting code
2019-03-10 18:09:15 -05:00
fickleheart
c0ea785900
Remove unnecessary padding byte from stored challenge answers
2019-03-10 17:54:17 -05:00
fickleheart
0e58653727
Make sure we don't write kartspeed beyond SV_SPEEDMASK
2019-03-10 17:43:39 -05:00
fickleheart
048ce8496f
Make noises on the password entry screen
2019-03-10 17:36:16 -05:00
fickleheart
4a8d682b43
Draw a padlock on-screen!
2019-03-10 17:25:55 -05:00
fickleheart
f70163cfb9
Show notice of a password-protected server on the join screen
2019-03-10 17:00:27 -05:00
fickleheart
693da54d94
Properly close the connection on the server's side...
2019-03-10 16:22:03 -05:00
fickleheart
0c6f3c58e6
Update packettypenames
2019-03-10 16:06:46 -05:00
fickleheart
a834ada9ce
Merge remote-tracking branch 'remotes/upstream/next' into join-passwords
2019-03-10 15:54:06 -05:00
colette
3de6231f7a
Merge branch 'color-def-fixes' into 'next'
...
Fix dehacked color list being wrong
See merge request KartKrew/Kart-Public!111
2019-03-10 16:53:45 -04:00
fickleheart
be79b4beec
Fix dehacked color list being wrong
2019-03-10 15:48:55 -05:00
fickleheart
82f3d2cdb8
Skip password check if node is already in-game? idk
2019-03-10 15:48:11 -05:00
fickleheart
bafa4cee7b
Improve stability when joining netgames maybe
2019-03-10 12:50:24 -05:00
fickleheart
426f4192be
Merge remote-tracking branch 'remotes/upstream/next' into join-passwords
2019-03-10 12:35:07 -05:00
colette
ef0130f951
Merge branch 'dontskipframes' into 'master'
...
Don't skip frames in software mode
See merge request KartKrew/Kart-Public!103
2019-03-10 13:29:10 -04:00
colette
8bed922a52
Merge branch 'thunder-fixes' into 'next'
...
Thunder shield-related changes
See merge request KartKrew/Kart-Public!110
2019-03-10 03:51:33 -04:00
fickleheart
ce81504410
Try a partial disconnect instead
2019-03-09 23:56:13 -06:00
fickleheart
386360ff43
Properly close and reopen the client connection for password challenges
2019-03-09 23:36:11 -06:00
wolfy852
499dcc6bdb
Kill all skin flags but SF_HIRES
2019-03-09 23:18:55 -06:00
fickleheart
3e1570c59d
Revert "Move HandleConnect to the same place as other packets"
...
This reverts commit 6bba2f16c0
.
2019-03-09 22:17:16 -06:00
colette
eec76cf4ec
Merge branch 'remove-pinvin' into 'next'
...
Kill invincibility item caps
See merge request KartKrew/Kart-Public!108
2019-03-09 22:16:25 -05:00
fickleheart
416b723567
Fix improperly-resolved merge conflict
2019-03-09 21:08:29 -06:00
Alam Arias
d58cb1aae3
Merge branch 'next' into ping-stuff-take2
2019-03-09 22:02:11 -05:00