twinaphex
5f5ac1557e
Turn command_event_save_current_config into static function
2016-09-24 17:19:38 +02:00
twinaphex
9637e4ee29
Attempt to fix issue #3605
2016-09-24 17:17:43 +02:00
twinaphex
49a9f189e9
Prevent divide by zero
2016-09-24 17:08:46 +02:00
twinaphex
764a4319a0
(shader_glsl.c) Continue with iteration if pass is NULL
2016-09-24 17:04:49 +02:00
twinaphex
b5416e4041
Change false to 0
2016-09-24 17:04:21 +02:00
twinaphex
5b5ad03ec3
Attempt to fix Coverity warnings
2016-09-24 17:04:01 +02:00
twinaphex
4cf9b3b6be
configuration.c - prevent dereference after null warning from Coverity
2016-09-24 17:00:41 +02:00
twinaphex
09cc6c41b9
Prevent explicit NULL pointer dereference
2016-09-24 16:58:02 +02:00
twinaphex
3aea25479c
Cleanups
2016-09-24 16:54:01 +02:00
Twinaphex
22bd770571
Cleanup unused variable
2016-09-24 16:51:45 +02:00
twinaphex
a27bc0da4f
Create static function command_event_save_config
2016-09-24 16:49:42 +02:00
Twinaphex
6b336a98b1
Merge pull request #3653 from GregorR/netplay-resimulation
...
When we replay, resimulate input
2016-09-24 14:51:38 +02:00
Gregor Richards
fcd57801bd
When we replay, resimulate input so that it doesn't judder between
...
remote states
2016-09-24 08:12:08 -04:00
twinaphex
83be6daa93
Try to prevent input driver from being set with Emscripten EGL context driver if HAVE_SDL2 is defined
2016-09-24 05:57:02 +02:00
Twinaphex
2fa676416a
Merge pull request #3651 from GregorR/netplay-delay-0
...
Small checks to avoid needless blocking in delay_frames=0 mode
2016-09-24 05:52:44 +02:00
radius
f58f7a5923
Revert "Make emscripten_egl default context for emscripten"
...
fixes gamepad support. It seems it only works when we use the SDL2 video context
This reverts commit 1177edf825
.
2016-09-23 22:38:37 -05:00
Gregor Richards
6472b0ce82
Small checks to avoid needless blocking in delay_frames=0 mode
2016-09-23 23:27:07 -04:00
Twinaphex
8d45ea4343
Merge pull request #3648 from lakkatv/wifi
...
Connman: enable wifi before scanning, and restart connman after gener…
2016-09-24 05:02:20 +02:00
Twinaphex
591579e868
Merge pull request #3650 from GregorR/netplay-fixes
...
Netplay fixes
2016-09-24 04:27:39 +02:00
Gregor Richards
fa5b75b635
Bugfixes in how we reset state on a late Netplay connection
2016-09-23 22:21:53 -04:00
Gregor Richards
236839e22f
Reset netplay stall state upon disconnection
2016-09-23 22:20:47 -04:00
Gregor Richards
ae92cfeac2
More care in check_frames code so we don't check CRCs from a previous
...
connection
2016-09-23 22:18:56 -04:00
Gregor Richards
c81b022a7d
Fix conflation of delay_frames and check_frames in configuration.c
2016-09-23 22:18:10 -04:00
radius
c3d5c98849
(ems) change some makefile flags
2016-09-23 19:48:50 -05:00
Andrés Suárez
635a60cb9e
Merge pull request #3643 from loganmc10/patch-4
...
Finalize support for pthreads in emscripten
2016-09-23 19:26:05 -05:00
Jean-André Santoni
eee9e5047b
Connman: enable wifi before scanning, and restart connman after generating the settings file
2016-09-24 00:41:30 +02:00
twinaphex
4e14ff8a66
Go through opaque pointer for glDeleteSync - GLsync as a type
...
might not be available
2016-09-24 00:04:19 +02:00
Twinaphex
75f8a53fcf
Merge pull request #3647 from frangarcj/master
...
(VITA) Fix utf8
2016-09-23 21:56:41 +02:00
Francisco José García García
e654c39944
(VITA) Fix utf8
2016-09-23 21:27:06 +02:00
Twinaphex
6fae03fd19
Merge pull request #3645 from Ezio-PS/master
...
little fix for Spanish translation
2016-09-23 19:55:48 +02:00
Twinaphex
4846bdc8d3
Merge pull request #3646 from lakkatv/wifi
...
Connman driver: this should allow connecting protected networks
2016-09-23 19:54:15 +02:00
Jean-André Santoni
d3878d5a92
Connman driver: this should allow connecting protected networks
2016-09-23 19:50:18 +02:00
Ezio-PS
dfed4a72f5
little fix for Spanish translation
2016-09-23 19:42:49 +02:00
Twinaphex
7bc49b2e7a
Merge pull request #3644 from Ezio-PS/master
...
Update Italian translation
2016-09-23 19:33:09 +02:00
Ezio-PS
4c742fb38d
Update Italian translation
2016-09-23 19:21:39 +02:00
Logan McNaughton
533add53ad
Finalize support for pthreads in emscripten
2016-09-23 10:25:07 -06:00
Andrés Suárez
159d0b55cf
Merge pull request #3642 from loganmc10/patch-3
...
Only set PTHREAD_POOL_SIZE=2 if PTHREAD is on
2016-09-23 10:21:38 -05:00
Logan McNaughton
b5cd030eff
Only set PTHREAD_POOL_SIZE=2 if PTHREAD is on
2016-09-23 09:16:45 -06:00
twinaphex
fff4b8ddcf
Prevent some warnings
2016-09-23 16:08:12 +02:00
twinaphex
12fa0bd019
Fix unchecked return value warning
2016-09-23 16:05:14 +02:00
twinaphex
4e3c9987f5
Prevent null pointer dereference / logically dead code / other misc. warnings
2016-09-23 16:03:37 +02:00
Twinaphex
baeadb775e
Merge pull request #3641 from lakkatv/wifi
...
WiFi: ask for passphrase
2016-09-23 15:42:49 +02:00
Jean-André Santoni
def77b5d34
Wi-Fi menu, pass over the entry index to know which network we're trying to connect
2016-09-23 14:45:07 +02:00
Jean-André Santoni
efeebf32ec
Fix Wi-Fi label
2016-09-23 14:33:35 +02:00
Jean-André Santoni
4734cb2640
WiFi: ask for passphrase
2016-09-23 13:16:27 +02:00
Andrés Suárez
1e95346f27
Merge pull request #3637 from loganmc10/patch-2
...
Allow pthread support in emscripten
2016-09-22 22:56:11 -05:00
Logan McNaughton
17b696c0dd
Add PTHREAD_POOL_SIZE
2016-09-22 21:51:30 -06:00
radius
8cb8390dbe
fix typo
2016-09-22 22:15:02 -05:00
Twinaphex
56a2e57c66
Merge pull request #3640 from GregorR/netplay-reconnection-flip
...
Reset player flip state when we lose Netplay connection
2016-09-23 04:00:26 +02:00
Gregor Richards
65e308c92d
Reset player flip state when we lose Netplay connection
...
This fixes a bug whereby reconnections would be out of sync due to the
flip state of the server and client being different. The server now
resets its flip state on disconnect.
2016-09-22 21:56:19 -04:00