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

8019 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
James Rowe
23e969dfdc Address review comments 2019-08-14 21:17:32 -06:00
James Rowe
45be693f8c Add telemetry field for mean frametime 
Previously, telemetry results couldn't give a good estimate for
performance over time, because it didn't include any fields related to
performance. With this, devs should be able to query metabase for mean
frametime to check for performance regressions after a change is made.
 2019-08-14 21:17:31 -06:00
James Rowe
62e6c147ae Add perf stat logging through ini setting 
For better tracking of performance regressions on incoming changes, this
change adds a way to dump frametime to file by changing an ini config
option. This is intentionally hidden as its only useful to a small
number of individuals, and not really applicable to the general
userbase.
 2019-08-14 21:17:27 -06:00
James Rowe
84b40f2da6
Merge pull request #4862 from leoetlino/exheader-override-fix 
ncch_container: Assume override exheaders are decrypted
 2019-08-14 09:31:54 -06:00
James Rowe
fa6b5709a7
Merge pull request #4886 from zhaowenlan1779/appveyor-broken-again 
Fix appveyor mingw (partially)
 2019-08-14 09:29:53 -06:00
vvanelslande
1437c4a01a Add MinGW CMake option to disable DWARF debugging information 
Also, I disabled it for the Linux MinGW build.
 2019-08-14 10:29:04 -05:00
James Rowe
e18c7ee78f
Merge pull request #4602 from zhaowenlan1779/video-dump-reborn 
Implement dumping audio+video to video files
 2019-08-14 09:12:14 -06:00
Pengfei Zhu
e008585195
Added a HACK to ignore errors 
Cyclical dependencies will result in errors. Redirecting err to null
doesn't help. I removed the redirection so that errors and warnings
would show up (they might be useful for us).

As FFmpeg is added, even more cyclical dependencies are present now. I
do not want to figure out what to install first to fix such things, so I
just decided to ignore all of them with a `0` at the end.
 2019-08-14 16:29:42 +08:00
Pengfei Zhu
9463e13f5a
Unfreeze CMake version 
The original purpose of freezing CMake is to use a **higher** version than supplied in order to fix a certain issue. Now that a very long time has passed and mingw's CMake has been updated, there's really no reason to still freeze it any more. What's more, trying to use a certain version is unreliable by pacman's design and will probably cause issues for using older versions of dependencies. The current (and previous) mingw errors may come from this...
 2019-08-14 16:28:28 +08:00
zhupengfei
6e2d57e4ff
travis: Update the frozen build to be a flagless Debug build 
This is useful to test whether Citra will compile without any CMake flags, and in Debug type.
 2019-08-14 09:27:06 +08:00
zhupengfei
8202c55cd5
citra_qt: Add video dumping UI 
QtConcurrent is used to stop the video dumping in another thread.
 2019-08-14 09:27:05 +08:00
zhupengfei
526d53af99
citra: Add --dump-video argument 2019-08-14 09:27:05 +08:00
zhupengfei
399a660faa
core/dumping: Add FFmpeg implementation 
Sorry for the large diff, the implementation is quite long, and I can't really find a good way to split it into commits.
 2019-08-14 09:27:04 +08:00
zhupengfei
cf2c354fb9
CMake, CI: Add FFmpeg library dependency 2019-08-14 09:27:03 +08:00
Pengfei Zhu
edf3171a07
Merge pull request #4884 from citra-emu/wwylele-patch-1 
Guard unistd.h with MacOS only macro
 2019-08-14 07:40:54 +08:00