radius
|
c2acadb979
|
instead of writing absolute paths, try to resolve absolute paths when loading, if not fallback to relative paths
|
2016-12-04 02:09:19 -05:00 |
|
radius
|
5e1ed323bd
|
make shaders paths absolute for now
|
2016-12-04 01:12:57 -05:00 |
|
Twinaphex
|
32423b9e4b
|
Merge pull request #4148 from spec-chum/MSVC
Fix silly typo
|
2016-12-03 19:50:51 +01:00 |
|
Spec-Chum
|
f648b1cfbc
|
Fix silly typo
|
2016-12-03 18:43:12 +00:00 |
|
Twinaphex
|
91550b6ba3
|
Merge pull request #4147 from spec-chum/MSVC
Fix MSVC compilation
|
2016-12-03 19:37:42 +01:00 |
|
Spec-Chum
|
7a6a0ee7af
|
Fix MSVC compilation
|
2016-12-03 18:24:49 +00:00 |
|
Twinaphex
|
564243ae7b
|
Merge pull request #4146 from Themaister/master
Vulkan: Check for more cases in vulkan_load_texture().
|
2016-12-03 18:57:56 +01:00 |
|
Hans-Kristian Arntzen
|
eb7870db5a
|
Vulkan: Check for more cases in vulkan_load_texture().
*Sigh*
|
2016-12-03 18:54:34 +01:00 |
|
Twinaphex
|
42886713be
|
Merge pull request #4144 from RobLoach/tooltips
[Emscripten] Add Tooltips to the buttons
|
2016-12-03 17:53:00 +01:00 |
|
Twinaphex
|
2b66b4c385
|
Merge pull request #4145 from Themaister/master
Vulkan: Load a dummy texture if needed.
|
2016-12-03 17:52:42 +01:00 |
|
Hans-Kristian Arntzen
|
b96f1fa067
|
Vulkan: Load a dummy texture if needed.
|
2016-12-03 17:48:48 +01:00 |
|
Rob Loach
|
d386f63525
|
[Emscripten] Add Tooltips to the buttons
|
2016-12-03 11:44:26 -05:00 |
|
Twinaphex
|
37d129a13d
|
Merge pull request #4142 from Themaister/master
Correctly check errors if preset cannot be found.
|
2016-12-03 16:11:11 +01:00 |
|
Hans-Kristian Arntzen
|
53c30cacd5
|
Correctly check errors if preset cannot be found.
|
2016-12-03 16:05:04 +01:00 |
|
Twinaphex
|
de2a7c2769
|
Merge pull request #4141 from GregorR/netplay-better-error-messages
Better error messages when the Netplay handshake fails
|
2016-12-03 16:01:56 +01:00 |
|
Gregor Richards
|
f725f38061
|
Use strlcpy
|
2016-12-03 09:58:16 -05:00 |
|
Gregor Richards
|
98f0d4d45b
|
Better error messages when the Netplay handshake fails
|
2016-12-03 09:46:20 -05:00 |
|
twinaphex
|
0c74d19112
|
(tasks/task_save) Replace some instances of runloop_msg_queue_push
|
2016-12-03 06:46:53 +01:00 |
|
Brad Parker
|
e39031cbd0
|
revert rest of unicode changes
|
2016-12-03 00:15:29 -05:00 |
|
Brad Parker
|
f725b48555
|
starting to revert unicode changes
|
2016-12-03 00:15:29 -05:00 |
|
twinaphex
|
d36e7700f7
|
(input_driver.c) Style nits
|
2016-12-03 06:14:57 +01:00 |
|
twinaphex
|
697760d580
|
Silence some warnings
|
2016-12-03 06:09:55 +01:00 |
|
Twinaphex
|
37443eb7e1
|
Merge pull request #4140 from GregorR/ifdef-networking-discovery
Make sure discovery code is properly ifdef'd for networking-less systems
|
2016-12-03 06:05:36 +01:00 |
|
Gregor Richards
|
634bdee301
|
Make sure discovery code is properly ifdef'd for networking-less systems
|
2016-12-03 00:03:29 -05:00 |
|
Twinaphex
|
999f23424a
|
Merge pull request #4139 from GregorR/netplay-sendto-msvc
sendto fix for MSVC
|
2016-12-03 05:21:22 +01:00 |
|
Gregor Richards
|
3c7fc73735
|
sendto fix for MSVC
|
2016-12-02 23:15:53 -05:00 |
|
Twinaphex
|
d71df5c06f
|
Merge pull request #4138 from GregorR/netplay-port-unsigned-short
Be explicit about types
|
2016-12-03 05:11:02 +01:00 |
|
Gregor Richards
|
cc664db231
|
Be explicit about types.
|
2016-12-02 23:08:34 -05:00 |
|
Twinaphex
|
4b2a45a276
|
remove unused variables
|
2016-12-03 05:07:27 +01:00 |
|
Brad Parker
|
b69734ce4a
|
more unicode fixes
|
2016-12-02 23:01:44 -05:00 |
|
Brad Parker
|
d20acaa63d
|
more unicode fixes
|
2016-12-02 23:00:27 -05:00 |
|
Twinaphex
|
e351407f67
|
Merge pull request #4137 from GregorR/netplay-discovery
Netplay LAN discovery
|
2016-12-03 04:57:49 +01:00 |
|
Gregor Richards
|
8993003259
|
C++ fixes
|
2016-12-02 22:56:37 -05:00 |
|
Gregor Richards
|
6c516f1de4
|
Griffin-fying Netplay LAN scanning
|
2016-12-02 22:54:14 -05:00 |
|
Gregor Richards
|
c9edc87d4a
|
Add NO_NETPLAY_HOSTS_FOUND to labels as well.
|
2016-12-02 22:52:19 -05:00 |
|
Gregor Richards
|
1f281beea2
|
Replace "no networks found" message with "no netplay hosts found"
|
2016-12-02 22:49:56 -05:00 |
|
Gregor Richards
|
b4ec66e34a
|
Move local network scanning out of settings and into Netplay
|
2016-12-02 22:42:29 -05:00 |
|
Gregor Richards
|
0577749fae
|
Netplay LAN scanning is go! (sort of)
|
2016-12-02 22:40:26 -05:00 |
|
Brad Parker
|
fcf09f10ef
|
more unicode fixes
|
2016-12-02 22:12:00 -05:00 |
|
Gregor Richards
|
077d5440ee
|
Allow Netplay to receive a struct netplay_host to connect to rather than
using the configured setting
|
2016-12-02 21:16:15 -05:00 |
|
Brad Parker
|
cc7bf6b4fa
|
more unicode fixes
|
2016-12-02 21:11:55 -05:00 |
|
Gregor Richards
|
ba0985de37
|
Actually report the host port as the Netplay port, not the discovery port
|
2016-12-02 20:38:55 -05:00 |
|
Gregor Richards
|
3446cf09d6
|
Actually report discovered hosts back to the caller!
|
2016-12-02 20:28:22 -05:00 |
|
Gregor Richards
|
4c18cec752
|
Added Netplay discovery code (not yet in menu)
|
2016-12-02 19:49:42 -05:00 |
|
Gregor Richards
|
addff325d0
|
Netplay discovery LAN scanning task (incomplete)
|
2016-12-02 18:56:29 -05:00 |
|
Jean-André Santoni
|
041fb36531
|
Merge pull request #4135 from GregorR/netplay-nat-traversal-setting
Fix NAT traversal menu setting
|
2016-12-02 22:39:15 +01:00 |
|
Gregor Richards
|
d7dbb6cac0
|
Fix NAT traversal menu setting.
|
2016-12-02 16:36:46 -05:00 |
|
Brad Parker
|
826afd137c
|
disable unicode until GL context is fixed
|
2016-12-02 15:34:15 -05:00 |
|
Brad Parker
|
5be05b3f61
|
Merge branch 'msvc'
|
2016-12-02 14:36:48 -05:00 |
|
Brad Parker
|
84b65514f2
|
ok button input should be unsigned
|
2016-12-02 14:34:29 -05:00 |
|