Monster Iestyn
|
9ef98471a4
|
Merge branch 'buildbot' into 'master'
Buildbot changes
See merge request STJr/SRB2!477
|
2019-03-26 09:44:56 -04:00 |
|
Monster Iestyn
|
8e78369f83
|
Merge branch 'dedicated-server-credits-fix' into 'master'
Dedicated server credits fix
See merge request STJr/SRB2!476
|
2019-03-26 09:44:21 -04:00 |
|
Monster Iestyn
|
7758b28164
|
Merge branch 'mi-side-discolor-fix' into 'master'
MI's side discolor fix
See merge request STJr/SRB2!475
|
2019-03-26 09:43:20 -04:00 |
|
Monster Iestyn
|
67874180b2
|
Merge branch 'gametype-strings-backport' into 'next'
Gametype strings backport
See merge request STJr/SRB2!473
|
2019-03-26 09:42:52 -04:00 |
|
Monster Iestyn
|
8c1c0875a2
|
Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way
|
2019-03-25 21:35:04 +00:00 |
|
Alam Ed Arias
|
73fa35baf0
|
TravisCI: use stock sdl2_mixer for prebuild bottle
|
2019-03-25 16:59:47 -04:00 |
|
Alam Ed Arias
|
fd284f232e
|
travisCI: add sdl2_mixer from mazmazz's srb2 tap
|
2019-03-25 16:43:33 -04:00 |
|
Alam Ed Arias
|
9de5055d7f
|
TravisCI: install deps on sdl2_mixer
|
2019-03-25 16:30:02 -04:00 |
|
Alam Ed Arias
|
ec0afaf6c9
|
TravisCI: try updating homebew
|
2019-03-25 16:02:30 -04:00 |
|
Alam Ed Arias
|
3472bf857c
|
TravisCI: build custom sdl2_mixer build
|
2019-03-25 15:51:13 -04:00 |
|
Alam Ed Arias
|
594c906376
|
use default osx image
|
2019-03-25 15:48:33 -04:00 |
|
Alam Ed Arias
|
3ab0f675ec
|
TravisCI: move homebrew packages for all mac builds
|
2019-03-25 15:44:33 -04:00 |
|
Alam Ed Arias
|
a8681a5b72
|
CircleCI: rebuild depend file with BLUA
|
2019-03-25 15:34:25 -04:00 |
|
Alam Ed Arias
|
fe22fdc5a3
|
P_SuperDamage() is too big for inlining
|
2019-03-25 15:30:25 -04:00 |
|
Alam Ed Arias
|
c4e8a60112
|
CircleCI: also test compiling without BLUA support
|
2019-03-25 15:21:52 -04:00 |
|
Alam Ed Arias
|
9a8d36b822
|
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
|
147221cf6e
|
R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them.
|
2019-03-25 18:54:47 +00:00 |
|
Monster Iestyn
|
7441dd7d9b
|
Merge branch 'master' into next
|
2019-03-25 18:08:36 +00:00 |
|
fickleheart
|
2a9dd8e1f9
|
Allow entering a title for replays on save
|
2019-03-24 22:40:52 -05:00 |
|
fickleheart
|
b2cbe3ed6d
|
Refactor replay saving handler for later use
|
2019-03-24 21:55:08 -05:00 |
|
fickleheart
|
4b7d2aea84
|
Move public demo vars to a single struct
|
2019-03-24 21:32:15 -05:00 |
|
fickleheart
|
ccefc48af3
|
Use demo title as filename for multiplayer replays
|
2019-03-24 20:36:22 -05:00 |
|
fickleheart
|
0940be1633
|
Move save replay prompt into the upper-right corner
|
2019-03-24 19:57:11 -05:00 |
|
fickleheart
|
8906718fb8
|
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
|
402796b3c6
|
Add some checks against invalid replays
|
2019-03-24 19:19:57 -05:00 |
|
fickleheart
|
b135c46d60
|
Clean up demo header read/write code
|
2019-03-24 19:14:34 -05:00 |
|
fickleheart
|
c7109c0ae4
|
Add title to netreplays and do some format cleanup
|
2019-03-24 18:48:14 -05:00 |
|
fickleheart
|
7af0554aba
|
Prepare for a demo format upgrade!
|
2019-03-24 17:47:24 -05:00 |
|
fickleheart
|
ca37b467e0
|
Clear P3 and P4 controls too when clearing all controls
|
2019-03-24 17:31:04 -05:00 |
|
fickleheart
|
d5f27c8339
|
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
|
2019-03-24 17:23:49 -05:00 |
|
Alam Arias
|
32fd6dc834
|
Merge remote-tracking branch 'upstream/master'
|
2019-03-23 15:08:45 -04:00 |
|
Nev3r
|
b5a1030722
|
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
|
0aeae058df
|
Merge remote-tracking branch 'upstream/master'
|
2019-03-22 10:42:07 -04:00 |
|
Alam Arias
|
544f806f92
|
Merge commit 'upstream/master~1'
|
2019-03-22 10:18:10 -04:00 |
|
Alam Arias
|
9b930a8e9e
|
Merge commit 'upstream/master~2'
|
2019-03-22 10:15:32 -04:00 |
|
wolfy852
|
7911fa24d0
|
Fix Visual Studio compiling
|
2019-03-21 00:32:27 -05:00 |
|
James R
|
ed0f8fd967
|
Actually allow connecting to "localhost"
Because IPv6 doesn't seem to work anyway.
|
2019-03-20 20:37:00 -07:00 |
|
James R
|
f139ffd1dc
|
Let localhost connections
|
2019-03-20 20:37:00 -07:00 |
|
wolfy852
|
6b743d383b
|
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
|
ecb6322a52
|
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
|
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 |
|
fickleheart
|
4f8d1383b0
|
Self-reminder...
|
2019-03-19 23:45:45 -05:00 |
|
fickleheart
|
3d36f531b9
|
Merge remote-tracking branch 'remotes/james/netreplays-dedicated-sigsegv-fix' into new_netreplays
|
2019-03-19 23:44:39 -05:00 |
|
fickleheart
|
f6797e285b
|
Merge remote-tracking branch 'remotes/james/netreplays-resetview-sigsegv-fix' into new_netreplays
|
2019-03-19 23:44:22 -05:00 |
|
fickleheart
|
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 |
|
fickleheart
|
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 |
|
fickleheart
|
65ac9b7b0b
|
Rename recordmultiplayerdemos to netdemo_record
Begins the process of namespacing demo recording commands.
|
2019-03-19 23:08:32 -05:00 |
|
fickleheart
|
d676dd5a1e
|
Keep record attack replays base-game-compatible for now
|
2019-03-19 23:02:17 -05:00 |
|
fickleheart
|
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 |
|
fickleheart
|
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 |
|