828691a7ac
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
4f8d1383b0
Self-reminder...
2019-03-19 23:45:45 -05:00
3d36f531b9
Merge remote-tracking branch 'remotes/james/netreplays-dedicated-sigsegv-fix' into new_netreplays
2019-03-19 23:44:39 -05:00
f6797e285b
Merge remote-tracking branch 'remotes/james/netreplays-resetview-sigsegv-fix' into new_netreplays
2019-03-19 23:44:22 -05:00
29c6dae776
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
64ceb441e3
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
65ac9b7b0b
Rename recordmultiplayerdemos to netdemo_record
...
Begins the process of namespacing demo recording commands.
2019-03-19 23:08:32 -05:00
d676dd5a1e
Keep record attack replays base-game-compatible for now
2019-03-19 23:02:17 -05:00
438cabcd24
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
7fc1f02b07
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
1c55daef2a
CMake: have funny check for empty CMAKE_SIZEOF_VOID_P
2019-03-19 09:10:25 -04:00
e50eb1f593
Merge remote-tracking branch 'upstream/master'
2019-03-19 01:05:54 -04:00
49dddf54ab
CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac?
2019-03-19 00:04:14 -04:00
6142becb4d
Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check"
...
This reverts commit d03c53930b
2019-03-18 23:58:31 -04:00
2fb569857a
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
d03c53930b
Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check
2019-03-18 16:50:17 -04:00
af17038cfb
LAT
2019-03-17 21:44:11 -05:00
7c3925e1ea
Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git
2019-03-17 22:59:08 +00:00
e18c6c0e1f
Merge branch 'version-prep'
2019-03-17 17:55:38 -05:00
ca522b3702
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next
2019-03-17 22:54:28 +00:00
ca68042d95
Merge remote-tracking branch 'remotes/james/move-changeviewpoint' into version-prep
2019-03-17 16:37:01 -05:00
f909a055d8
Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep
2019-03-17 16:36:52 -05:00
70f40d54cb
Resume sounds on unpausing after a window re-focus
2019-03-16 15:50:16 -07:00
5057c37dfb
Move change viewpoint control checking so it doesn't take precedence
...
Notably over chat.
2019-03-16 15:42:18 -07:00
4b71ac7b6b
Merge branch 'netarchive-fix' into version-prep
2019-03-16 15:00:02 -05:00
b9ae148af6
Merge branch 'colormap-caching-workaround' into version-prep
2019-03-16 14:59:55 -05:00
50c0ed0f07
Fix bad merge in map data archiving code
2019-03-16 14:56:56 -05:00
875506e6cc
Don't free this cached colormap!
2019-03-16 12:22:11 -05:00
f18d2a684b
Merge branch 'lua-ticcmd-latency' into version-prep
2019-03-16 02:41:19 -05:00
d727492c87
Merge branch 'colormap-caching-workaround' into version-prep
2019-03-16 02:41:14 -05:00
0b1cc92f1a
Allow reading ticcmd latency
2019-03-16 02:19:43 -05:00
ebe76f7a1b
Remove dumb special case
2019-03-16 01:29:13 -05:00
cd4fc40b9e
Cache colormaps everywhere to avoid memory leaks
2019-03-16 00:39:52 -05:00
abc479980c
Update patch.kart hash again
2019-03-16 00:35:13 -05:00
fd12ff9163
Merge branch 'kartstuff-fix' into version-prep
2019-03-16 00:02:40 -05:00
6d751ff302
Remove the define.
2019-03-15 18:46:25 -04:00
5a170b9e4e
Merge branch 'master' into errorifpng
2019-03-15 16:40:47 -04:00
67a80ba311
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command
2019-03-15 16:13:31 -04:00
c0782aa89e
Merge branch 'public-musicplus-feature-interfadeout' into 'next'
...
Fade out level music during intermission via level header
See merge request STJr/SRB2!470
2019-03-15 01:40:23 -04:00
6b93ca9221
Intermission: Don't fade out level music when using win32 midi volume hack
2019-03-15 01:26:13 -04:00
6cf05a4613
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
dcd8669ec2
Merge branch 'public-musicplus-inter' into 'next'
...
Custom intermission music by level header [by SteelTitanium]
See merge request STJr/SRB2!469
2019-03-15 00:23:45 -04:00
bd9e42ce6e
Merge branch 'public-gl-next' into public-musicplus-inter
2019-03-14 23:42:16 -04:00
bc85256add
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
fdde5f13c5
When resetting volume on same music, make it fade instead of a hard change
2019-03-13 23:55:30 -04:00
67e2857303
When changing to same music, reset the internal volume
2019-03-13 23:41:35 -04:00
c021e29835
Restore MUSIC_RELOADRESET if block in g_game
2019-03-13 21:18:23 -04:00
2c75d4da69
Fix custom fade source bug for Change Music linedef
2019-03-13 19:53:16 -04:00
aea18f36ba
Remove MP3 warning
2019-03-13 19:51:45 -04:00
93626c2293
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
Monster Iestyn