Commit graph

6550 commits

Author SHA1 Message Date
fickleheart
1941ba09b0 Use skin with closest stats if the expected one wasn't found
This allows people to watch replays without the characters loaded,
without making everyone be Sonic.
2019-03-24 19:41:25 -05:00
fickleheart
b922c2289e Add some checks against invalid replays 2019-03-24 19:19:57 -05:00
fickleheart
77aea850ba Clean up demo header read/write code 2019-03-24 19:14:34 -05:00
fickleheart
0c6c401d88 Add title to netreplays and do some format cleanup 2019-03-24 18:48:14 -05:00
fickleheart
d13134bae2 Prepare for a demo format upgrade! 2019-03-24 17:47:24 -05:00
fickleheart
d22601e979 Clear P3 and P4 controls too when clearing all controls 2019-03-24 17:31:04 -05:00
fickleheart
4870ea582e Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 2019-03-24 17:23:49 -05:00
Alam Arias
212a2ecf5b Merge remote-tracking branch 'upstream/master' 2019-03-23 15:08:45 -04:00
Nev3r
64353bf373 Merge branch 'allow-localhost' into 'master'
Allow connecting to localhost / 127.0.0.1

See merge request STJr/SRB2!474
2019-03-23 05:16:44 -04:00
Alam Arias
0d63271c7a Merge remote-tracking branch 'upstream/master' 2019-03-22 10:42:07 -04:00
Alam Arias
d6da0b1b7f Merge commit 'upstream/master~1' 2019-03-22 10:18:10 -04:00
Alam Arias
ce6353f7d3 Merge commit 'upstream/master~2' 2019-03-22 10:15:32 -04:00
wolfy852
9518939a9d Fix Visual Studio compiling 2019-03-21 00:32:27 -05:00
James R
6939dca52a Actually allow connecting to "localhost"
Because IPv6 doesn't seem to work anyway.
2019-03-20 20:37:00 -07:00
James R
25bd4a0876 Let localhost connections 2019-03-20 20:37:00 -07:00
wolfy852
963cbf4671 Merge branch 'next' into md3-vanilla-kart
# Conflicts:
#	src/hardware/r_opengl/r_opengl.c
2019-03-20 19:50:20 -05:00
Monster Iestyn
ce37e4c9c8 Merge branch 'sdl-noxinput-nohidapi' into 'master'
-noxinput and -nohidapi command line parameters.

See merge request STJr/SRB2!468
2019-03-20 17:33:04 -04:00
Monster Iestyn
fa6f9062fe Merge branch 'errorifpng' into 'master'
Error if the lump is a PNG lump

See merge request STJr/SRB2!466
2019-03-20 16:26:28 -04:00
fickleheart
ab0bb33d6e Self-reminder... 2019-03-19 23:45:45 -05:00
fickleheart
4e5aba836e Merge remote-tracking branch 'remotes/james/netreplays-dedicated-sigsegv-fix' into new_netreplays 2019-03-19 23:44:39 -05:00
fickleheart
cfe78569d9 Merge remote-tracking branch 'remotes/james/netreplays-resetview-sigsegv-fix' into new_netreplays 2019-03-19 23:44:22 -05:00
fickleheart
fa28feb8db Add command to lower netreplay sync frequency
This makes for smaller replay files while keeping
sync checks in place!
2019-03-19 23:39:04 -05:00
fickleheart
62281de40a Fix MAXMOM being above the max value GZT_MOM* could store
This caused a lot of """desyncs""" when players were moving
between 128-255 FU/T, which was exacerbated by this next commit...
2019-03-19 23:38:26 -05:00
fickleheart
3a96ee70af Rename recordmultiplayerdemos to netdemo_record
Begins the process of namespacing demo recording commands.
2019-03-19 23:08:32 -05:00
fickleheart
d6167ef35a Keep record attack replays base-game-compatible for now 2019-03-19 23:02:17 -05:00
fickleheart
4be82dc30f Don't resync position until off for two tics in a row
This patches over a few trouble spots, like Misty Maze, causing
consistent resyncs and screwing up playback.
2019-03-19 22:59:27 -05:00
fickleheart
be458c1d05 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
2019-03-19 22:17:25 -05:00
Alam Ed Arias
94e29d1bb4 CMake: have funny check for empty CMAKE_SIZEOF_VOID_P 2019-03-19 09:10:25 -04:00
Alam Arias
edd8598628 Merge remote-tracking branch 'upstream/master' 2019-03-19 01:05:54 -04:00
Alam Ed Arias
727d9cae23 CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac? 2019-03-19 00:04:14 -04:00
Alam Ed Arias
4cb71746a7 Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check"
This reverts commit 7d14342a8f.
2019-03-18 23:58:31 -04:00
Monster Iestyn
5d059da843 Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
2019-03-18 22:00:23 +00:00
Alam Ed Arias
7d14342a8f Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check 2019-03-18 16:50:17 -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