Twinaphex
e786afe481
Update config.def.h
2018-06-27 00:25:52 +02:00
twinaphex
8a1c0be83c
(Android) Another potential buildfix; define ENABLE_HLSL
...
(slang_process) Put HLSL/Cg code around ENABLE_HLSL ifdef
(SPIRV-Cross) Make sure macros no longer need to be redefined; make them
unique in both glsl and hlsl files; needed for Griffin builds
2018-06-26 13:18:17 +02:00
twinaphex
3bbf34aa58
Merge branch 'master' of https://github.com/libretro/RetroArch
2018-06-25 23:55:53 +02:00
twinaphex
0230c2f4d8
Merge commit 'a078d40b80103ba083ad04eab625084279e930b3'
2018-06-25 23:55:41 +02:00
twinaphex
a078d40b80
Squashed 'libretro-common/' changes from edffe4d147..1548bee835
...
1548bee835 Update glsm
df7c8aebea Update glsm
git-subtree-dir: libretro-common
git-subtree-split: 1548bee835ab5fa2d120a4859ff653a5f128de1f
2018-06-25 23:55:40 +02:00
Twinaphex
f88f7419d7
Merge pull request #6923 from libretro/revert-6922-revert-6882-patch-3
...
Revert "Revert "(wiiu) Use portlibs zlib and libpng""
2018-06-25 23:26:51 +02:00
Twinaphex
893dbc6bee
Revert "Revert "(wiiu) Use portlibs zlib and libpng""
2018-06-25 23:26:43 +02:00
Twinaphex
7bdf0fd9a6
Merge pull request #6922 from libretro/revert-6882-patch-3
...
Revert "(wiiu) Use portlibs zlib and libpng"
2018-06-25 22:33:53 +02:00
Twinaphex
3c6c9a8b08
Revert "(wiiu) Use portlibs zlib and libpng"
2018-06-25 22:33:45 +02:00
twinaphex
2ef56e906c
Don't define this unless necessary
2018-06-25 21:52:24 +02:00
twinaphex
d967cbc879
Add another ENABLE_HLSL ifdef
2018-06-25 21:51:23 +02:00
Twinaphex
0f4744bed7
Merge pull request #6921 from theheroGAC/patch-33
...
Update msg_hash_it.h
2018-06-25 21:40:39 +02:00
theheroGAC
8017f706d8
Update msg_hash_it.h
2018-06-25 21:38:22 +02:00
twinaphex
9d6de6b60d
Buildfix for MSVC 2010
2018-06-25 19:49:41 +02:00
Twinaphex
07d226a76d
Merge pull request #6882 from opendata26/patch-3
...
(wiiu) Use portlibs zlib and libpng
2018-06-25 18:16:59 +02:00
twinaphex
234102d475
(glslang) Buildfix for Android
2018-06-25 16:52:15 +02:00
Twinaphex
e10d7d93df
Merge pull request #6906 from meleu/patch-1
...
cheevos: support for ResetIf/PauseIf HitCount - closes #6817
2018-06-24 19:45:07 +02:00
Twinaphex
3bdc7ca352
Merge pull request #6915 from RobLoach/osd-font
...
freetype: Allow getting OSD Font from Assets Directory
2018-06-24 18:13:18 +02:00
Rob Loach
e4fe33f437
freetype: Add comment about assets://
2018-06-24 12:02:28 -04:00
Twinaphex
8585617f69
Merge pull request #6916 from stuartcarnie/sgc-metal
...
feat(Metal): font rendering
2018-06-24 17:54:37 +02:00
Rob Loach
8a96062ed0
freetype: Rename to osd-font.tff
2018-06-24 11:19:40 -04:00
Rob Loach
da6b7987f1
freetype: Get DejaVuSansMono.ttf from the assets directory
2018-06-24 11:00:21 -04:00
Twinaphex
1504a9ed2d
Merge pull request #6914 from DEX357/patch-12
...
Update msg_hash_pl.h
2018-06-24 16:20:57 +02:00
Stuart Carnie
367c15f488
feat(Metal): font rendering
...
* FPS and other OSD messages render correctly
* add autoreleasepool around entire render loop to avoid memory leaks
2018-06-23 23:54:23 -07:00
DEX357
e8e6f20f6c
Update msg_hash_pl.h
2018-06-24 00:53:52 +02:00
Twinaphex
c10aab9830
Merge pull request #6912 from stuartcarnie/sgc-metal
...
More metal resize, stability improvements
2018-06-24 00:28:22 +02:00
Stuart Carnie
eacd52f009
fix(Metal): improve shader stability
...
* use MTKView, which handles layer and scaling changes automatically
between displays
2018-06-23 13:33:27 -07:00
Stuart Carnie
ee8d82dcfe
add additional project files
2018-06-23 13:33:27 -07:00
meleu
536638eaf6
support for ResetIf/PauseIf HitCount
2018-06-23 17:25:16 -03:00
Jean-André Santoni
2a2e732a79
(Menu) Add a setting to hide the shutdown option
2018-06-23 12:01:13 +07:00
Jean-André Santoni
ab3d8979ea
(Menu) Hide overlays, rewind and latency in kiosk mode
2018-06-23 11:18:37 +07:00
twinaphex
7566e09970
Squashed 'libretro-common/' changes from c3c0facc97..edffe4d147
...
edffe4d147 Buildfix for 3DS - implicit declaration of isspace et al.
git-subtree-dir: libretro-common
git-subtree-split: edffe4d1470ae6b846e420392d324c1b2b14281a
2018-06-22 17:43:11 +02:00
Jean-André Santoni
6868670136
(XMB) Code cleaning
2018-06-22 22:31:06 +07:00
Jean-André Santoni
1ff15fd071
(Lakka) Flag MIDI menu as advanced
2018-06-22 22:25:07 +07:00
Jean-André Santoni
bea3822331
(Lakka) Flag more settings groups with SD_FLAG_LAKKA_ADVANCED
2018-06-22 22:22:46 +07:00
Jean-André Santoni
cfa53dd694
Update vscode includePath
2018-06-22 22:14:52 +07:00
twinaphex
e8b0d6974d
Merge commit '48cb38619ff8bbc5ff3c0df93704b3297047a8fe'
2018-06-22 15:00:02 +02:00
twinaphex
48cb38619f
Squashed 'libretro-common/' changes from 999e69a9f1..c3c0facc97
...
c3c0facc97 whoops, cute bug
fc2866b999 no real point leaving these unimplemented, they're easy
bd1d5800db Add filestream_scanf
git-subtree-dir: libretro-common
git-subtree-split: c3c0facc97d3a4c065c72961b5ab165b99d3153c
2018-06-22 15:00:02 +02:00
twinaphex
e3d406808f
Merge branch 'master' of https://github.com/libretro/RetroArch
2018-06-21 21:54:34 +02:00
twinaphex
8baffb3fdf
OPtionally compile hlsl files
2018-06-21 21:53:44 +02:00
Twinaphex
3df1fd7993
Update CHANGES.md
2018-06-21 10:20:31 +02:00
Twinaphex
ad593a1eae
Update CHANGES.md
2018-06-21 08:43:49 +02:00
Twinaphex
58351230d8
Update CHANGES.md
2018-06-21 08:39:41 +02:00
Twinaphex
511044270b
Fix iOS build
2018-06-21 08:37:08 +02:00
twinaphex
3799a33efa
Silence warnings
2018-06-21 08:31:08 +02:00
twinaphex
837cf84fc8
Put this around an ifdef
2018-06-21 08:26:27 +02:00
Twinaphex
c0beef8365
Merge pull request #6905 from stuartcarnie/sgc-metal
...
fix(Metal): fix project file to include .metal resources
2018-06-21 08:25:43 +02:00
twinaphex
863204b343
Merge commit 'c68f2796b95838412610023611398d7c9968a3f3'
2018-06-21 08:22:10 +02:00
twinaphex
c68f2796b9
Squashed 'libretro-common/' changes from c9b117d5b8..999e69a9f1
...
999e69a9f1 More warning fixes
git-subtree-dir: libretro-common
git-subtree-split: 999e69a9f1c3818b6018f39579421e7e52c6bb1b
2018-06-21 08:22:09 +02:00
twinaphex
d14a3f0d1f
Merge commit '5c25cc90765cbf6ad7f01c0b635c72595bc7f457'
2018-06-21 08:18:08 +02:00
