B3n30
aabc2144bf
Merge branch 'patch-1' of https://github.com/Jhynjhiruu/citra into Jhynjhiruu-patch-1
2019-08-11 13:21:16 +02:00
Weiyi Wang
d18d2a0a18
citra_qt/configure: move speed limiter to general ( #4864 )
...
The speed limiter being a frame limiter is an implmentation detail and can be changed in the future. What user care about is that it limit the emulation speed in genenral (not just graphics but also audio+input)
2019-08-10 11:13:17 +02:00
Hamish Milne
e3cefe5a5d
Use a clear texture instead of texture 0 (solid black) in the GL rasterizer ( #4844 )
...
* Add OpenGLState.default_texture and set it to Clear in OpenGLRasterizer
* Localize the fix to the GL rasterizer
* Revert unwanted change
2019-08-10 11:05:00 +02:00
Tobias
d80edd99d7
Port yuzu-emu/yuzu#2457: "yuzu/{about_dialog, main}: Specify string conversions explicitly for SCM-related info" ( #4774 )
...
* yuzu/about_dialog: Specify string conversions explicitly
Specifies the conversions explicitly to avoid implicit conversions from
const char* to QString. This makes it easier to disable implicit QString
conversions in the future.
In this case, the implicit conversion was technically wrong as well. The
implicit conversion treats the input strings as ASCII characters. This
would result in an incorrect conversion being performed in the rare case
a branch name was created with a non-ASCII Unicode character, likely
resulting in junk being displayed.
* yuzu/main: Move window title updating logic to its own function
For similar reasons to the previous change, we move this to a single
function, so we don't need to duplicate the conversion logic in several
places within main.cpp.
2019-08-10 11:01:18 +02:00
Weiyi Wang
0269cb6e67
gl_rasterizer: decrease vertex buffer size ( #4703 )
...
Nvidia seems to have flickering issue with pokemon for some specific vertex buffer size. The root cause is still unknown. This is just a workaround
2019-08-10 10:51:24 +02:00
Weiyi Wang
88db89bf57
configure_dialog: reverse tab map to avoid logic based on user-facing/translatable text ( #4866 )
2019-08-10 09:00:56 +02:00
xperia64
8131bd32e3
renderer_opengl: Add support for custom shaders ( #4578 )
...
* Add Anaglyph 3D
Change 3D slider in-game
Change shaders while game is running
Move shader loading into function
Disable 3D slider setting when stereoscopy is off
The rest of the shaders
Address review issues
Documentation and minor fixups
Forgot clang-format
Fix shader release on SDL2-software rendering
Remove unnecessary state changes
Respect 3D factor setting regardless of stereoscopic rendering
Improve shader resolution passing
Minor setting-related improvements
Add option to toggle texture filtering
Rebase fixes
* One final clang-format
* Fix OpenGL problems
2019-08-09 20:00:47 +02:00
Weiyi Wang
3e9c2e77d9
Merge pull request #4859 from weihuoya/opengles
...
minor fix for opengles
2019-08-08 09:30:42 -04:00
Tobias
76aec4d675
[Hotfix] Revert change in configure_dialog ( #4865 )
2019-07-29 12:33:10 +02:00
Weiyi Wang
216fc0b546
Merge pull request #4856 from FearlessTobi/port-2492
...
Port yuzu-emu/yuzu#2492 : "yuzu/debugger: Specify string conversions explicitly"
2019-07-29 00:21:51 -04:00
Weiyi Wang
c9d4a13c5c
Merge pull request #4860 from FearlessTobi/port-2499
...
Port yuzu-emu/yuzu#2499 : "yuzu/configuration: Specify string conversions explicitly"
2019-07-29 00:21:21 -04:00
weihuoya
899e3eb003
minor fix for opengles
2019-07-28 21:18:38 +08:00
Lioncash
4832b29d3d
yuzu/debugger: Specify string conversions explicitly
2019-07-28 15:13:03 +02:00
Lioncash
64a154e890
yuzu/configuration: Specify string conversions explicitly
2019-07-28 15:08:54 +02:00
Weiyi Wang
aca55d0378
Merge pull request #4858 from FearlessTobi/port-2504
...
Port yuzu-emu/yuzu#2504 : "yuzu/configuration/config: Specify string conversions explicitly"
2019-07-27 16:34:18 -04:00
Lioncash
e58a805a22
yuzu/configuration/config: Specify string conversions explicitly
...
Allows the configuration code to build successfully with implicit string
conversions disabled.
Also makes default_hotkeys internally linked:
Given the array is a private static array, we can just make it
internally linked to hide it from external code. This also allows us to
remove an inclusion within the header.
2019-07-25 23:34:29 +02:00
Pengfei Zhu
45ff10c9a0
Merge pull request #4852 from rerpha/compiler_warnings_room_member
...
Added default case for GetErrorStr, removed useless const declaration in header
2019-07-25 08:41:03 +08:00
James Rowe
aef06df388
Merge pull request #4817 from leoetlino/ips-patch-later
...
ncch_container: Apply IPS patch after allocating .bss
2019-07-23 20:58:35 -06:00
Weiyi Wang
fcc7600b2b
Merge pull request #4851 from rerpha/compiler_warnings_in_core_arm
...
Fixing some compiler warnings in core/arm/
2019-07-23 19:34:46 -04:00
Jack Harper
cb455fd410
Added default case for GetErrorStr, removed useless const declaration in header
2019-07-23 23:24:38 +01:00
Jack Harper
b065ac6995
Fixing some compiler warnings
2019-07-23 23:10:17 +01:00
Pengfei Zhu
077eacd419
Merge pull request #4849 from CookiePLMonster/qt-buttons-fix
...
Fixed behaviour of some buttons by connecting functors to correct signals
2019-07-23 07:41:46 +08:00
Silent
4fd22c6a14
Qt: Fixed behaviour of buttons by connecting functors to correct signals
...
Following screens got fixes:
- Cheats
- Configure/Debug
- Configure/Input
- Chat Room
- Direct Connect
- Host
- Lobby List
2019-07-22 23:28:10 +02:00
Jhynjhiruu
e201d44aa9
It's supposed to be OR, not AND!
2019-07-21 11:31:07 +01:00
Jhynjhiruu
834a487388
Fix build issue
...
Co-Authored-By: Ben <bene_thomas@web.de>
2019-07-21 10:51:59 +01:00
Jhynjhiruu
3f49d9920c
Fix whitespace
2019-07-21 10:39:20 +01:00
Jhynjhiruu
17ba67c8c9
Remove magic number
2019-07-21 10:37:29 +01:00
Jhynjhiruu
fb16700fe5
Update smdh.cpp
2019-07-21 00:36:04 +01:00
bunnei
a9df1c29f9
Merge pull request #4832 from wwylele/unused
...
Remove unused stuff
2019-07-18 21:36:23 -04:00
Weiyi Wang
909d04ddea
Remove unused stuff
...
Some unused variables are still kept in services, as they are parameters passed from the command buffer and might be used in the future
2019-07-16 20:27:03 -04:00
Pengfei Zhu
643a396383
Merge pull request #4841 from citra-emu/wwylele-patch-1
...
citra_qt/configure_motion_touch: fix slot name
2019-07-15 12:04:25 +08:00
Pengfei Zhu
fb8adcc08c
Merge pull request #4839 from wwylele/ipc-sign
...
ipc_helpers: silent signed comparison warning
2019-07-15 12:03:31 +08:00
Pengfei Zhu
c6705d6958
Merge pull request #4838 from wwylele/kernel-reorder
...
kernel: silence -Wreorder
2019-07-15 12:03:00 +08:00
Pengfei Zhu
8ece20007a
Merge pull request #4837 from wwylele/interpreter
...
interpreter: silent sign warnings
2019-07-15 12:02:24 +08:00
Weiyi Wang
1904da775e
citra_qt/configure_motion_touch: fix slot name
...
Fixes #4840 , hopefully
2019-07-14 23:02:22 -04:00
Pengfei Zhu
1d6c6a37a1
Merge pull request #4836 from wwylele/chatroom-sign
...
citra_qt: silent sign comparison warning
2019-07-15 07:33:35 +08:00
Pengfei Zhu
f31dd06d91
Merge pull request #4835 from wwylele/profiler-par
...
citra_qt/profiler: add parenthesis to silent warning
2019-07-15 07:32:39 +08:00
Pengfei Zhu
b27a9e1710
Merge pull request #4834 from wwylele/cubeb-sign
...
audio_core/cubeb: silent signed/unsigned comparison warning
2019-07-15 07:31:47 +08:00
Pengfei Zhu
4fb80cb079
Merge pull request #4833 from wwylele/network-state
...
network/room_member: in-header function should be inline
2019-07-15 07:29:49 +08:00
Pengfei Zhu
6b916a22c2
Merge pull request #4831 from wwylele/multiplayer-Wreorder
...
citra_qt/multiplayer: silent Wreorder warnings
2019-07-15 07:26:04 +08:00
Weiyi Wang
fd3cfd0ae0
ipc_helpers: silent signed comparison warning
...
index is only used as positive index in arrays. The warning is in DEBUG_ASSERT_MSG(index == TotalSize() ...)
2019-07-14 14:52:17 -04:00
Weiyi Wang
6ee908dc84
kernel: silence -Wreorder
2019-07-14 14:44:17 -04:00
Weiyi Wang
24d2d6aa23
interpreter: silent sign warnings
2019-07-14 14:36:56 -04:00
Weiyi Wang
3dbd1fd4a8
audio_core/cubeb: silent signed/unsigned comparison warning
2019-07-14 14:30:24 -04:00
Weiyi Wang
f7607c820d
citra_qt: silent sign comparison warning
...
🖕 Qt
2019-07-14 14:21:02 -04:00
Weiyi Wang
3a567390ee
citra_qt/profiler: add parenthesis to silent warning
...
This is indeed confusing
2019-07-14 14:14:34 -04:00
Weiyi Wang
2bbbfa86d8
network/room_member: in-header function should be inline
...
Otherwise produces multpile definition in translation units and generates unused warnings
2019-07-14 14:01:13 -04:00
Weiyi Wang
e689847b11
citra_qt/configure_system: fix string comparison ( #4830 )
...
country_names has type std::array<char*>. Pointer comparison to test empty string is wrong
2019-07-14 19:26:23 +02:00
Weiyi Wang
1c5a55b3cb
citra_qt/camera: silent signed array index warning ( #4829 )
2019-07-14 19:26:06 +02:00
Weiyi Wang
9c2fe1eae8
citra_qt/multiplayer: silent Wreorder warnings
2019-07-14 11:04:52 -04:00