Commit graph

6476 commits

Author SHA1 Message Date
James R
841daf940f Don't close console when changing map 2019-03-26 13:04:11 -07:00
James R
d7ad7a4f40 Remove redundant CON_ClearHUD calls 2019-03-26 12:59:13 -07:00
James R
f995e8c241 Resize console upon resolution change
Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.
2019-03-26 12:30:02 -07:00
jameds
a8aea17469 Keep color across wrapped lines
And this works by inserting the same color code on each wrapped line.
2019-03-26 12:07:11 -07:00
jameds
f6143dafb0 Scroll console immediately upon pressing PageUp 2019-03-26 12:05:23 -07:00
Alam Arias
fea79d2185 mistype in merge of TavisCI config 2019-03-26 11:54:54 -04:00
Alam Arias
85b79ae822 Merge commit 'upstream/master~0' 2019-03-26 10:50:36 -04:00
Alam Arias
ef10d08db3 Merge commit 'upstream/master~1' 2019-03-26 09:48:13 -04:00
Monster Iestyn
7ef12f7dd7 Merge branch 'master' into next 2019-03-26 13:46:15 +00:00
Monster Iestyn
0194922509 Merge branch 'buildbot' into 'master'
Buildbot changes

See merge request STJr/SRB2!477
2019-03-26 09:44:56 -04:00
Monster Iestyn
a1c30e3b6a 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
8e51cad3d6 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
e0ae13306a Merge branch 'gametype-strings-backport' into 'next'
Gametype strings backport

See merge request STJr/SRB2!473
2019-03-26 09:42:52 -04:00
fickleheart
c37b570cf9 Fix compile issues 2019-03-26 08:26:41 -05:00
fickleheart
a6fff36298 Unclose a node if it sends PT_CLIENTJOIN..? fuck it, why not 2019-03-26 01:36:12 -05:00
fickleheart
7f0249a1ce Free nodes properly in cleanupnodes
Hopefully the other changes herein have rendered
cleanupnodes obsolete, but I'm not too sure of
that.....
2019-03-26 01:10:00 -05:00
fickleheart
ebd98cfddb Is this useful in any way? 2019-03-26 00:09:23 -05:00
fickleheart
d7ed5ec246 Let's try some sanity checks on the resync code... 2019-03-25 23:58:44 -05:00
fickleheart
5a138981a8 pbbbbt fix compile error 2019-03-25 22:52:42 -05:00
fickleheart
bffe706288 Make sure clients never have local_resynchinprogress on when joining a game... 2019-03-25 22:49:37 -05:00
fickleheart
11a10a839c More attempts that may fix things?
I'm uncommenting a bunch of LJ code that was never
committed uncommented, so I might be breaking something
horribly here....
2019-03-25 22:44:34 -05:00
fickleheart
ee884dccaa Don't force-close connection when getting a join request!
We need to send the ackret, first of all!
2019-03-25 22:23:35 -05:00
fickleheart
307f4a0638 Wacky attempt at not reopening nodes for D/Ced ackreting clients 2019-03-25 22:22:25 -05:00
Monster Iestyn
9da1033467 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
e8a527b6dc TravisCI: use stock sdl2_mixer for prebuild bottle 2019-03-25 16:59:47 -04:00
Alam Ed Arias
05d2dcca97 travisCI: add sdl2_mixer from mazmazz's srb2 tap 2019-03-25 16:43:33 -04:00
Alam Ed Arias
208a835479 TravisCI: install deps on sdl2_mixer 2019-03-25 16:30:02 -04:00
Alam Ed Arias
15dbe3730b TravisCI: try updating homebew 2019-03-25 16:02:30 -04:00
Alam Ed Arias
e47bf6274f TravisCI: build custom sdl2_mixer build 2019-03-25 15:51:13 -04:00
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