Brad Parker
88f915dadd
Merge commit '9ae607553558a37047b4ce50b5aca91908ad9c4e' as 'deps/SPIRV-Cross'
2016-12-20 13:17:07 -05:00
Brad Parker
9ae6075535
Squashed 'deps/SPIRV-Cross/' content from commit 9ccd1ae
...
git-subtree-dir: deps/SPIRV-Cross
git-subtree-split: 9ccd1aea4201ff5d79c09808567348d0d3ab0452
2016-12-20 13:17:07 -05:00
Brad Parker
f3a213039a
Merge commit 'c00e4286009f512418b2b6cf7261cab2bbf050b4' as 'deps/glslang/glslang'
2016-12-20 13:16:23 -05:00
Brad Parker
c00e428600
Squashed 'deps/glslang/glslang/' content from commit be84621
...
git-subtree-dir: deps/glslang/glslang
git-subtree-split: be8462149a3c150fc89db84e57ef06de3ab90d47
2016-12-20 13:16:23 -05:00
twinaphex
0a6d2948c5
Remove these subrepos again
2016-12-20 18:58:13 +01:00
twinaphex
b743db89d9
Try this again
2016-12-20 18:55:54 +01:00
twinaphex
3e26066ea4
Remove this subrepo AGAIN
2016-12-20 18:55:04 +01:00
twinaphex
a90b19126d
Turn this into relative header include
2016-12-20 18:50:20 +01:00
twinaphex
e99d47852f
Get rid of the submodules
2016-12-20 18:43:53 +01:00
twinaphex
88b45350cc
Get rid of the submodules
2016-12-20 18:43:27 +01:00
Twinaphex
c8b9964cf1
Merge pull request #4286 from loganmc10/patch-3
...
Missed one of the texture formats
2016-12-20 18:11:11 +01:00
Logan McNaughton
21779c87b8
Missed one of the texture formats
2016-12-20 10:10:23 -07:00
Twinaphex
fb277b68af
Merge pull request #4285 from loganmc10/textures
...
Fix up some texture format code
2016-12-20 18:02:06 +01:00
Logan McNaughton
3392f3996b
Fix up some texture format code
2016-12-20 08:57:13 -08:00
Hans-Kristian Arntzen
4e9fe4bd54
Vulkan: Fix menu shader parameters for slangp.
...
video_shader_resolve_parameters did not take #includes into account
while the Vulkan implementation did. Added a helper function which
parses a shader file and figures out the shader parameters in the same
way.
2016-12-20 15:58:37 +01:00
Brad Parker
3449324ab4
move battery level to the right of the clock
2016-12-20 09:44:29 -05:00
Brad Parker
d20f45c9d4
make battery level check into a task
2016-12-20 09:18:07 -05:00
Brad Parker
1f450834ed
unknown battery level on windows should not be displayed
2016-12-20 01:25:32 -05:00
Brad Parker
1942d29a33
battery placement
2016-12-19 19:06:19 -05:00
Jean-André Santoni
9e50b6fc44
Improve the battery placement again
2016-12-20 01:03:06 +01:00
Jean-André Santoni
24a34229a6
Improve the battery placement again
2016-12-20 00:55:21 +01:00
Jean-André Santoni
ce27d38d0e
Fix battery placement
2016-12-20 00:47:18 +01:00
Brad Parker
f0fc61be32
fix for non-incrementing difference in timer
2016-12-19 18:42:23 -05:00
Twinaphex
c81d54bd46
(libretro-common) Cleanups
2016-12-20 00:39:45 +01:00
Jean-André Santoni
9a0c7f4a07
Merge pull request #4281 from bparker06/battery
...
Add option to show battery level on menu next to the clock
2016-12-20 00:35:45 +01:00
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