Commit graph

6476 commits

Author SHA1 Message Date
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
Jaime Passos
76fa343ea1 fix postprocessor 2019-03-21 18:33:03 -03:00
Jaime Passos
08efec4cf3 destroy hw_glide.h because no modern GPU supports such API 2019-03-21 18:23:40 -03: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
Jaime Passos
dbd7a71fb3 add SHADERS comment support 2019-03-19 18:52:41 -03:00
Jaime Passos
4e63b6e6d4 fix shader loading on startup 2019-03-19 18:41:12 -03:00
Jaime Passos
3a34a13118 PK3 support 2019-03-19 18:25:55 -03:00
Jaime Passos
843498ef4a Improve custom shader support 2019-03-19 17:37:04 -03:00
Jaime Passos
4c6b03fdb7 Merge branch 'master' of https://github.com/STJr/SRB2 into gl_shaders 2019-03-19 15:33:16 -03:00
Jaime Passos
d94a7142b1 change (void*) to (char*) 2019-03-19 14:41:48 -03:00
Jaime Passos
3c6dc984cc wups 2019-03-19 13:32:44 -03: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
Jaime Passos
cfc5bd4ac7 custom shader support 2019-03-18 23:03:29 -03:00
Jaime Passos
c028631cdf fix buildbot 2019-03-18 20:04:28 -03:00
Jaime Passos
6dd5037ef1 add vertex shaders 2019-03-18 19:17:47 -03: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
Jaime Passos
35459caea7 md3-vanilla 2019-03-18 18:34:20 -03:00
Alam Ed Arias
7d14342a8f Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check 2019-03-18 16:50:17 -04:00
Jaime Passos
c8bec127ec I don't care about DirectDraw
Neither SDL 1.2
2019-03-18 15:54:29 -03:00
fickleheart
5c6f142da1 LAT 2019-03-17 21:44:11 -05:00
Jaime Passos
fd5fb73671 gl4 2019-03-17 22:27:50 -03: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