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 |
|
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 |
|
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 |
|
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 |
|
fickleheart
|
95179ed1f3
|
Update patch.kart hash again
|
2019-03-16 00:35:13 -05:00 |
|
fickleheart
|
22b02ed7b3
|
Merge branch 'kartstuff-fix' into version-prep
|
2019-03-16 00:02:40 -05:00 |
|
Steel Titanium
|
4757031929
|
Remove the define.
|
2019-03-15 18:46:25 -04:00 |
|
Steel Titanium
|
4837c1742b
|
Merge branch 'master' into errorifpng
|
2019-03-15 16:40:47 -04:00 |
|
Sal
|
0942793cf5
|
Merge branch 'kartstuff-fix' into 'master'
Add missing deh entry for k_starpostflip
See merge request KartKrew/Kart!127
|
2019-03-14 17:32:22 -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 |
|
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 |
|