mirrors/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8034 commits 1 branch 0 tags 59 MiB
Commit graph

8034 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pengfei Zhu
22d3099ea2
Merge pull request #4925 from vitor-k/icon-style 
Change the coding style of GameListIconSize bounds check to use the enum
 2019-09-13 23:20:45 +08:00
James Rowe
7bfd829c77
Merge pull request #4893 from wwylele/nfc-state 
NFC: extract frontend-facing tag state
 2019-09-13 08:59:51 -06:00
Vitor K
4d2fee31b3
Prevent repetition on config.cpp 
Type is already indicated on right hand side.

Co-Authored-By: Mat M. <mathew1800@gmail.com>
 2019-09-10 00:01:55 -03:00
James Rowe
d6f2bc8c04
Merge pull request #4896 from zhaowenlan1779/game-list-fix-3 
citra_qt: Misc game list updates/fixes
 2019-09-09 20:04:04 -06:00
vitor-k
ccf6d380af Change the coding style of GameListIconSize bounds check to use the enum instead of magic numbers 2019-09-08 19:37:55 -03:00
Weiyi Wang
24ec11f928
Merge pull request #4915 from FearlessTobi/port-2818 
Port citra-emu/citra#2818: "externals: update fmt to 6.0.0"
 2019-09-08 08:42:02 -04:00
Pengfei Zhu
4bc22aa350
Merge pull request #4918 from vitor-k/warnings 
Silence warnings from unused code and mismatched declaration
 2019-09-06 22:08:06 +08:00
vitor-k
61f9710d95 remove unused call to nodiscard function 2019-09-05 17:11:38 -03:00
Ethan
56091241ff externals: update fmt to 6.0.0 2019-09-05 02:39:13 +02:00
James Rowe
8c2a33553a
Merge pull request #4914 from vitor-k/windows-coffee 
Fix to Windows sleep issues
 2019-09-03 14:25:58 -06:00
Weiyi Wang
42d3d563b9
Merge pull request #4897 from zhaowenlan1779/warning-core-timing 
core_timing: Silence sign comparison warnings
 2019-09-03 16:06:27 -04:00
vitor-k
50cee98bca Move the SetThreadExecutionState calls to their own separate functions 2019-09-03 16:13:14 -03:00
vitor-k
bcf33b0ac6 Fix to windows sleep issues, now with clang format! 2019-09-03 11:06:57 -03:00
vitor-k
6e3652d15b Struct vs class declaration and unused variable 2019-09-02 22:45:38 -03:00
James Rowe
8acd2b966d
Merge pull request #4894 from wwylele/remove-gs 
opengl: remove hw geometry shader related stuff
 2019-09-02 09:38:05 -06:00
Pengfei Zhu
285b2b3207
Merge pull request #4906 from vvanelslande/hotkey-and-fullscreen-fixes 
citra_qt: fix the stuck in fullscreen mode and hotkey bugs
 2019-09-01 23:00:46 +08:00
Pengfei Zhu
05a07f944b
Merge pull request #4911 from vitor-k/master 
Add a cancel option to analog stick configuration
 2019-09-01 21:50:10 +08:00
vitor-k
ac3a854f45 Add cancel option to analog stick configuration 2019-08-31 21:58:07 -03:00
Weiyi Wang
1e3f943f6f
Merge pull request #4907 from vvanelslande/lle-applets-comments 
applet_manager: remove the "we are going to disable loading LLE applets before further fixes are done" comments
 2019-08-30 09:24:11 -04:00
Valentin Vanelslande
2959b002cd applet_manager: remove the "we are going to disable loading LLE applets before further fixes are done" comments 
LLE Applets are enabled again in #4500, but @wwylele didn't remove these comments.
 2019-08-29 20:41:16 -05:00
vvanelslande
1ff418de4a citra_qt: fix the stuck in fullscreen mode and hotkey bugs 
The stuck in fullscreen mode bug happens if the emulated program exits, is fixed by adding [this](https://github.com/citra-emu/citra/compare/master...vvanelslande:hotkey-and-fullscreen-fixes?expand=1#diff-5e8bf22f5c3b3579c402308dd96b7563R888-R894), steps to reproduce:
- Start [FBI](https://github.com/Steveice10/FBI)
- Press START

The fixed hotkeys (I changed them to use [connect](https://doc.qt.io/qt-5/qobject.html#connect) instead of [setShortcut](https://doc.qt.io/qt-5/qaction.html#shortcut-prop) + [setShortcutContext](https://doc.qt.io/qt-5/qaction.html#shortcutContext-prop)) are:
- Load File (was not working in windowed mode), fixed by removing the [setShortcut](https://doc.qt.io/qt-5/qaction.html#shortcut-prop) + [setShortcutContext](https://doc.qt.io/qt-5/qaction.html#shortcutContext-prop) calls (there was already a [connect](https://doc.qt.io/qt-5/qobject.html#connect) call)
- Stop Emulation (was not working in fullscreen mode), fixed with the [connect](https://doc.qt.io/qt-5/qobject.html#connect) change and [this](https://github.com/citra-emu/citra/compare/master...vvanelslande:hotkey-and-fullscreen-fixes?expand=1#diff-5e8bf22f5c3b3579c402308dd96b7563R888-R894) change
- Exit Citra (was not working in fullscreen mode), fixed with the [connect](https://doc.qt.io/qt-5/qobject.html#connect) change

Fixes #4876
 2019-08-29 19:50:05 -05:00
Pengfei Zhu
8fa6be5b15
Merge pull request #4898 from zhaowenlan1779/warning-room-member 
network/room_member: Silence -Wswitch warning
 2019-08-21 09:14:28 +08:00
zhupengfei
ebc43239f0
core_timing: Silence sign comparison warnings 
This is causing a lot of warnings all over the place.
 2019-08-20 22:25:18 +08:00
zhupengfei
698b471074
network/room_member: Silence -Wswitch warning 
This causes lots of warnings. Adding the Uninitialized case solves this
 2019-08-20 22:23:32 +08:00
zhupengfei
531bf857f5
Remove old region free logic 2019-08-20 21:03:41 +08:00
zhupengfei
4144f4480d
citra_qt: Add single line mode for game list 
This single line mode is aimed at restoring the intended behavior with Small or None icons. Line breaks will be replaced with commas (Region row) or spaces (Name row). One can toggle this option in UI configuration.
 2019-08-20 20:03:15 +08:00
zhupengfei
b078122167
citra_qt/game_list: Disable uniform row heights 
This option was intended for enabling optimizations when all rows are granted to have the same height. In our case this is not true, and therefore the behavior is actually undefined. Different versions of Qt handle this differently. Newer versions of Qt tend to hide contents that are too big in height, which goes against our wishes. Thus, it's probably the best to disable this option so that things don't go wrong if we ever decide to update Qt.
 2019-08-20 20:01:14 +08:00
zhupengfei
82fea86717
citra_qt/game_list: Add an All Regions check 
Some titles (mostly homebrews) do not use the region free value 0x7FFF but instead set all of the region flags, resulting in all regions displayed in game list, which is not beautiful and not what we want. This fixes it by adding an all_regions check.
 2019-08-20 19:57:33 +08:00
Weiyi Wang
a3fca5b170
Merge pull request #4895 from zhaowenlan1779/separate-ffmpeg-options 
CMake: separate options for FFmpeg decoder/dumper
 2019-08-20 07:49:13 -04:00
zhupengfei
609bd71da3
Fix dependent options 2019-08-20 15:26:59 +08:00
zhupengfei
ce3459192e
fixup! CMake: separate options for FFmpeg decoder/dumper 2019-08-20 14:58:43 +08:00
zhupengfei
f8b3950829
CMake: separate options for FFmpeg decoder/dumper 
Separate options are now provided for FFmpeg AAC audio decoder and FFmpeg video dumper. This allows users to configure Citra with greater freedom.

Also, previously for Linux builds, AAC decoder is accidentally enabled along with the dumper, which could potentially cause patent issues (?). This commit fixes it by only enabling video dumper.
 2019-08-20 14:45:39 +08:00
Weiyi Wang
dd3ba7bd21 opengl: remove hw geometry shader related stuff 2019-08-18 20:07:50 -04:00
Flame Sage
1cf75e55c2
Updated README with new help page. 2019-08-18 22:12:05 +00:00
Weiyi Wang
b4d45b57c7
Merge pull request #4879 from tywald/accurate-gs-on 
Remove 'Accurate Geometry Shader' setting
 2019-08-18 15:52:45 -04:00
Weiyi Wang
24f1c8d009
Merge pull request #4885 from vvanelslande/cmake-dwarf-mingw 
Add MinGW CMake option to disable DWARF debugging information
 2019-08-18 15:40:32 -04:00
Weiyi Wang
8b8111b425 NFC: extract frontend-facing tag state 
Added a new state amiibo_in_range. This state is akin to the real world
physical relationship between a 3DS machine and an amiibo, which is
independent from the service state (or even the machine is powered on or
not). The service state nfc_tag_state is then synchronized with this
physical state on every potential point when the state changes. This
solves the issue where user might load an amiibo before NFC service
initializes, or remove an amiibo after NFC service shutdown, which
previously causes inconsistent state change.

Also removed std::atomic on nfc_tag_state, because
1. It is already protected by g_hle_lock
2. It wasn't properly used in the code anyway. For example, there are
many double loading on this variable, which effectively make it
non-atomic.
 2019-08-17 21:56:12 -04:00
James Rowe
32b88d4719
Merge pull request #4891 from jroweboy/fixfram 
Fixup! Prevent issue deleting PerfStats
 2019-08-16 22:06:01 -06:00
James Rowe
0cffab04b5 Fixup! Prevent issue deleting PerfStats 2019-08-16 21:54:33 -06:00
James Rowe
6f0b009497
Merge pull request #4889 from jroweboy/autouic 
Remove qt5_wrap_ui macro usage
 2019-08-16 19:36:23 -06:00
James Rowe
7fe9a094a5 Remove qt5_wrap_ui macro usage 2019-08-16 19:35:37 -06:00
James Rowe
00eeaf0e9c
Merge pull request #4882 from jroweboy/frametime-logging 
Frametime logging for tracking performance over time
 2019-08-16 19:33:53 -06:00
James Rowe
9bb3de8d23
Merge pull request #4472 from jroweboy/nsapt 
HLE: Move NS:S into APT and remove NS
 2019-08-16 19:21:34 -06:00
James Rowe
135b054f74
Update telemetry_session.cpp 
Change Session -> Performance
 2019-08-15 19:36:02 -06:00
James Rowe
331a9fc12b Change over to std::shared_ptr 2019-08-14 21:30:49 -06:00
James Rowe
61ebeca765 NS: Lowercase NS:S to ns:s like it should be 2019-08-14 21:23:06 -06:00
James Rowe
6c8faaf2c2 HLE: Remove BaseInterface and add ns.cpp back 2019-08-14 21:23:06 -06:00
James Rowe
f2167d76a8 Service: Add BaseInterface and NSInterface 2019-08-14 21:23:03 -06:00
James Rowe
b62ca12e88 HLE: Move NS:S into APT and remove NS 2019-08-14 21:21:33 -06:00
James Rowe
a77cd00cbe Add current date/time to file path 2019-08-14 21:17:32 -06:00