Commit graph

5346 commits

Author SHA1 Message Date
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
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
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
fickleheart
0c85666080 Fix dehacked color list being wrong 2019-03-10 15:48:55 -05:00
fickleheart
99cf366e6e Skip password check if node is already in-game? idk 2019-03-10 15:48:11 -05:00
fickleheart
f8a75cb4fc Improve stability when joining netgames maybe 2019-03-10 12:50:24 -05:00
fickleheart
6fe9a6bd06 Merge remote-tracking branch 'remotes/upstream/next' into join-passwords 2019-03-10 12:35:07 -05:00
colette
4bce1ed401 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
ddb083e856 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
9f48006254 Try a partial disconnect instead 2019-03-09 23:56:13 -06:00
fickleheart
28e4cfdb6d Properly close and reopen the client connection for password challenges 2019-03-09 23:36:11 -06:00
wolfy852
19e515d439 Kill all skin flags but SF_HIRES 2019-03-09 23:18:55 -06:00
fickleheart
fe651ae79b Revert "Move HandleConnect to the same place as other packets"
This reverts commit 055d73c1e7.
2019-03-09 22:17:16 -06:00
colette
4cbc4b1835 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
12750e06e3 Fix improperly-resolved merge conflict 2019-03-09 21:08:29 -06:00
Alam Arias
6560740234 Merge branch 'next' into ping-stuff-take2 2019-03-09 22:02:11 -05:00
Alam Arias
f251bd6d19 Merge branch 'master' into next 2019-03-09 22:00:25 -05:00
Alam Arias
28d101ac1a Please do not go past the doomdata_t space 2019-03-09 21:57:59 -05:00