Commit graph

6346 commits

Author SHA1 Message Date
Alam Ed Arias
d69d834c6a use default osx image 2019-03-25 15:48:33 -04:00
Alam Ed Arias
45c641204b TravisCI: move homebrew packages for all mac builds 2019-03-25 15:44:33 -04:00
Alam Ed Arias
042b30c6e5 CircleCI: rebuild depend file with BLUA 2019-03-25 15:34:25 -04:00
Alam Ed Arias
17768854e0 P_SuperDamage() is too big for inlining 2019-03-25 15:30:25 -04:00
Alam Ed Arias
0fbca9a84b CircleCI: also test compiling without BLUA support 2019-03-25 15:21:52 -04:00
Alam Ed Arias
853855eb69 Travis-CI: use a new version of xcode and use homebrew add-on to install packages 2019-03-25 15:16:43 -04:00
Monster Iestyn
fa3349a117 R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them. 2019-03-25 18:54:47 +00:00
Monster Iestyn
7c36a2a99e Merge branch 'master' into next 2019-03-25 18:08:36 +00:00
fickleheart
91868fc3a4 Allow entering a title for replays on save 2019-03-24 22:40:52 -05:00
fickleheart
8d9462d4aa Refactor replay saving handler for later use 2019-03-24 21:55:08 -05:00
fickleheart
f60e92aa70 Move public demo vars to a single struct 2019-03-24 21:32:15 -05:00
fickleheart
f162dc0270 Use demo title as filename for multiplayer replays 2019-03-24 20:36:22 -05:00
fickleheart
557ac6f0d3 Move save replay prompt into the upper-right corner 2019-03-24 19:57:11 -05:00
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