Brad Parker
48eccc3258
remove unused msg_hash
2016-12-19 18:15:27 -05:00
Brad Parker
94a6e759cf
merge battery branch into master
2016-12-19 18:08:41 -05:00
Brad Parker
5945b8d888
always show battery level, not just when it actually updates
2016-12-19 18:03:31 -05:00
Twinaphex
12390e9237
Merge pull request #4280 from GregorR/netplay-empty-block-warnings
...
Adding blocks in the empty-RECV case to (hopefully) suppress warnings
2016-12-19 23:58:07 +01:00
Gregor Richards
8f35de9da0
Adding blocks in the empty-RECV case to (hopefully) suppress warnings
2016-12-19 17:31:24 -05:00
Twinaphex
1d36c5effa
Silence warnings - remove unused variables
2016-12-19 23:19:59 +01:00
Twinaphex
25fcfb47c7
Use C-style string
2016-12-19 23:17:36 +01:00
Twinaphex
76c4a4f7a0
Merge pull request #4279 from sethk/macos_cleanup
...
macOS cleanup
2016-12-19 23:15:10 +01:00
Twinaphex
8f191d2fe7
Merge pull request #4277 from GregorR/netplay-uint-warnings
...
Be consistent about the type of check_frames
2016-12-19 22:45:52 +01:00
Brad Parker
51b9886586
add timer to check battery level every 30 seconds
2016-12-19 15:49:11 -05:00
Brad Parker
1e5c675702
adjust scaling/positioning for new battery icons
2016-12-19 15:31:10 -05:00
Gregor Richards
30beee6004
Be consistent about the type of check_frames. Fixes warnings.
2016-12-19 14:54:13 -05:00
twinaphex
971a999aa7
Get rid of more implicit memsets
2016-12-19 14:29:27 -05:00
twinaphex
f74b7d5f05
Get rid of some implicit memsets for state tracker
2016-12-19 14:29:27 -05:00
twinaphex
16b26139ff
Get rid of some implicit memsets
2016-12-19 14:29:27 -05:00
twinaphex
d2b3762db8
(input_config.c) Get rid of implicit memset
2016-12-19 14:29:27 -05:00
twinaphex
8caa21ef98
(menu_display_gl.c) Get rid of implicit memset
2016-12-19 14:29:27 -05:00
twinaphex
b536f3f5f7
Get rid of implicit memsets
2016-12-19 14:29:27 -05:00
twinaphex
d99fac1d88
Get rid of some implicit memsets
2016-12-19 14:29:27 -05:00
twinaphex
8250e3d521
Get rid of some implicit memsets
2016-12-19 14:29:27 -05:00
Alcaro
19afa89c7f
Shut up false positive warning
2016-12-19 14:29:27 -05:00
Brad Parker
7aac7f986a
add option to show battery level next to the datetime in the menu
2016-12-19 14:28:21 -05:00
twinaphex
5ca7344436
Get rid of more implicit memsets
2016-12-19 19:17:23 +01:00
twinaphex
31b87594aa
Get rid of some implicit memsets for state tracker
2016-12-19 19:08:37 +01:00
twinaphex
3c7c667cf5
Get rid of some implicit memsets
2016-12-19 19:04:52 +01:00
twinaphex
8dcf05036c
(input_config.c) Get rid of implicit memset
2016-12-19 18:55:02 +01:00
twinaphex
4c33f948e0
(menu_display_gl.c) Get rid of implicit memset
2016-12-19 18:49:56 +01:00
twinaphex
3cdb62b361
Get rid of implicit memsets
2016-12-19 18:40:00 +01:00
twinaphex
8453893778
Get rid of some implicit memsets
2016-12-19 18:30:17 +01:00
twinaphex
3561949a87
Get rid of some implicit memsets
2016-12-19 18:18:40 +01:00
Alcaro
fc1c83d8c0
Shut up false positive warning
2016-12-19 16:38:55 +01:00
Twinaphex
032d29efa4
Merge pull request #4274 from GregorR/netplay-nouveau-nouveau
...
>2-player Netplay
2016-12-19 16:28:37 +01:00
Twinaphex
8b62a4029e
Merge pull request #4275 from Themaister/master
...
Fix unmute after starting muted.
2016-12-19 16:28:22 +01:00
Hans-Kristian Arntzen
d661620962
Fix unmute after starting muted.
...
audio_driver_start() would for some reason fail if audio driver was
already started. The fix is to mute the audio driver on init. Makes
kinda sense anyways.
2016-12-19 14:40:28 +01:00
twinaphex
4c9f2e41ff
Get rid of some implicit memsets
2016-12-19 14:04:37 +01:00
Gregor Richards
11a3063fc6
Forgot the other half of that last bugfix
2016-12-18 20:08:21 -05:00
Gregor Richards
8f8e6dfc5f
Unset the netplay callbacks when we deinit netplay
...
This is a bugfix to master that hadn't migrated to my branch.
2016-12-18 19:54:01 -05:00
Gregor Richards
dcd4b3046b
Making negative check_frames be "check only" mode
2016-12-18 19:28:44 -05:00
Gregor Richards
677ffa9ebd
Support different forms of compression from different clients.
2016-12-18 19:28:44 -05:00
Gregor Richards
84c33634a6
Communicate paused-ness during initial connection SYNC.
2016-12-18 19:28:44 -05:00
Gregor Richards
60b81e3a51
Nominal support for server sending blank INFO
2016-12-18 19:28:44 -05:00
Gregor Richards
e79f30604f
Better stall timing
...
We now stall not until we've reached parity (which makes no sense since
we expect latency), but only until we're not likely to stall again.
2016-12-18 19:28:44 -05:00
Gregor Richards
8195a5bcee
Try to catch up if we're falling behind our peer, not anyone
...
In the previous catch-up system, we would only try to catch up if we
were falling behind the farthest-behind peer. However, as they would
also only try to catch up to us, everyone basically agreed to the
worst-case latency. It makes more sense to try to be in parity with your
direct peer than with indirect connections.
2016-12-18 19:28:44 -05:00
Gregor Richards
b535412914
Adding nick-changing
...
This is just to disambiguate multiple connections with the same nick
(usually Anonymous), which will now become e.g. Anonymous (2).
2016-12-18 19:28:44 -05:00
Gregor Richards
43fdccd89c
Making some messages grammatically similar to others
2016-12-18 19:28:44 -05:00
Gregor Richards
abce07db17
Correcting stateless mode in menu.
2016-12-18 19:28:44 -05:00
Gregor Richards
7c2f12fbd9
Removign some leftover debug code
2016-12-18 19:28:44 -05:00
Gregor Richards
04266cf4f7
Run synchronization even when stalled
...
Previously, we could be stalled by one player but still reading data
from another, which would wedge the client because we would never act
upon the newly-read data. Now we act upon data even if we're stalled.
Fixes bugs in initial connection with high latency.
2016-12-18 19:28:44 -05:00
Gregor Richards
d6d96704fd
Don't panic about delta frames not being ready if we're not even fully
...
connected yet.
2016-12-18 19:28:43 -05:00
Gregor Richards
8b21014d07
Improvements to handshake protocol
...
Making the netplay handshake protocol send the core and content as an
explicit command, so that the other side can (notionally) choose to load
it. That isn't implemented, of course.
2016-12-18 19:28:43 -05:00
