octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,013 Commits 52 Branches 0 Tags
aab56c2e2016f3daf239e27bd7633f2839a8d84b
Commit Graph

7013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Merry
aab56c2e20 Merge pull request #4316 from FearlessTobi/port-1442 
Port yuzu-emu/yuzu#1442: "Avoid unnecessary string temporary creation in PrintMessage()"
 2018-10-07 11:13:48 +01:00
Merry
20d6d450bd Merge pull request #4317 from FearlessTobi/port-1376 
Port yuzu-emu/yuzu#1376: "Logging: Change the TimeStretch::Process log from debug to trace level."
 2018-10-07 11:12:13 +01:00
Subv
1d59c8f792 Logging: Change the TimeStretch::Process log from debug to trace level. 
This function is called too many times and makes the debug logging basically unusable due to the spam.
 2018-10-06 16:55:05 +02:00
Lioncash
cd7596e67e text_formatter: Avoid unnecessary string temporary creation in PrintMessage() 
operator+ for std::string creates an entirely new string, which is kind
of unnecessary here if we just want to append a null terminator to the
existing one.

Reduces the total amount of potential allocations that need to be done
in the logging path.
 2018-10-06 16:46:02 +02:00
Mat M
b4b8c58f91 Merge pull request #4312 from wwylele/update-fmt 
Update fmt to 5.2.1
 2018-10-06 08:06:21 -04:00
Mat M
5b7c4c0b2c Merge pull request #4313 from NeatNit/patch-1 
CONTRIBUTING.md - remove note about casting numeric types
 2018-10-06 07:32:41 -04:00
NeatNit
31369c9a8c CONTRIBUTING.md - remove note about casting numeric types 
Apparently it's not true: https://github.com/citra-emu/citra/pull/4310#discussion_r223174725
 2018-10-06 11:57:50 +03:00
Weiyi Wang
61155a25c3 Update fmt to 5.2.1 
It seems to fix msvc warnings
 2018-10-06 01:58:09 -04:00
Weiyi Wang
81657b737f Remove "#" in the version number (#4311) 
So that people can stop using it in issue/pr comments and randomly link some other issue/pr unintentionally.
 2018-10-06 00:55:52 -04:00
Pengfei Zhu
0e42fa9fa7 Merge pull request #4307 from valentinvanelslande/movie 
movie: fix some checks
 2018-10-05 17:37:52 -05:00
Valentin Vanelslande
dcd6e7f99f movie: fix some checks 
Fixes invalid movie error
 2018-10-05 17:20:14 -05:00
Weiyi Wang
b163502744 Core: pass down Core::System reference to all services (#4272) 
* Core: pass down Core::System reference to all services

This has to be done at once due to unified interface used by HLE/LLE switcher

* apt: eliminate Core::System::GetInstance

* gpu_gsp: eliminate Core::System::GetInstance in service

* hid: eliminate Core::System::GetInstance

* nwm: eliminate Core::System::GetInstance

* err_f: eliminate Core::System::GetInstance
 2018-10-05 10:59:43 -04:00
Pengfei Zhu
008242c5f3 appveyor: fix mingw build (#4303) 
* Try to manually overwrite

* Update appveyor.yml

* Update appveyor.yml

* what about don't overwrite?

* what if only syyu once?

* still need to syyu twice it seems

* add comment as well as trigger rebuild

what happened to msvc

* it seems that I can just remove the -Syy
 2018-10-05 10:58:33 -04:00
Weiyi Wang
794498c33e Merge pull request #4289 from wwylele/sdl-twice-twice 
input/sdl: lock map mutex after SDL call
 2018-10-05 10:54:45 -04:00
Pengfei Zhu
2a90426cb8 Merge pull request #4267 from zhaowenlan1779/movie 
movie: Add clock init time to CTM header
 2018-10-05 08:20:33 -05:00
Pengfei Zhu
87e16c80ac Merge pull request #4229 from zhaowenlan1779/open-folder 
citra_qt, core: game list "Open XXX Location" improvements
 2018-10-05 00:46:43 -05:00
Weiyi Wang
cdf8d80c87 Merge pull request #4300 from FearlessTobi/port-1429-1431 
Port yuzu-emu/yuzu#1429 and yuzu-emu/yuzu#1431: Minor configuration changes
 2018-10-04 19:38:54 -04:00
Weiyi Wang
a5daf60e62 Merge pull request #4301 from citra-emu/revert-4241-port-yuzu-1367 
Revert "Port yuzu/#1367 from yuzu: "game_list: Handle plurals within setFilterResult() better""
 2018-10-04 15:03:03 -04:00
Weiyi Wang
eb494c574d Merge pull request #4244 from wwylele/swap-enum 
common/swap: add swap template for enum
 2018-10-04 14:51:49 -04:00
Weiyi Wang
4352c6784b Revert "Port yuzu/#1367 from yuzu: "game_list: Handle plurals within setFilterResult() better"" 2018-10-04 12:04:49 -04:00
Lioncash
be534b9388 configure_audio: Move combo box index setting to their own functions 
Keeps the individual behaviors in their own functions, and cleanly
separate. We can also do a little better by converting the relevant IDs
within the core to a QString only once, instead of converting every
string into a std::string.
 2018-10-04 01:39:12 +02:00
Lioncash
2a612f7bd4 configure_audio: Use QString::fromStdString() for converting audio device names 
This ensures that the proper codec will always be used no matter what.
It also avoids relying on ASCII conversions.
 2018-10-04 01:39:12 +02:00
Lioncash
97e8354fb0 configure_audio: Add disambiguation comment for the volume percentage string 
Disambiguates what the string represents to help translators more easily
understand what it is that they're translating. While we're at it, we
can move the code to its own function, so that we don't need to specify
the same string twice.
 2018-10-04 01:39:12 +02:00
Lioncash
00af9da245 configure_input: Make analog mapping strings translatable 
These strings are user-facing, so they should be specified as
translatable with tr().
 2018-10-04 01:39:12 +02:00
Weiyi Wang
ea53b0f795 Merge pull request #4298 from Subv/am_titles 
Services/AM: Implemented BeginImportProgramTemporarily, EndImportProgramWithoutCommit and CommitImportPrograms.
 2018-10-03 17:41:40 -04:00
Weiyi Wang
cfa52e2b7b Merge pull request #4296 from B3n30/service_getter 
Give frontend access to the hle service interfaces
 2018-10-03 15:58:27 -04:00
Subv
0f6f7cfd95 Services/AM: Implemented BeginImportProgramTemporarily, EndImportProgramWithoutCommit and CommitImportPrograms. 
These functions are pretty much identical to BeginImportProgram and EndImportProgram.

We don't need to do anything special in EndImportProgramWithoutCommit and CommitImportPrograms because we don't need to implement the two-phase title installation that the 3DS uses to prevent corruption of the title.db.
 2018-10-03 14:48:39 -05:00
B3n30
544eb25c99 fixup! Give frontend access to the hle service interfaces 2018-10-03 20:08:01 +02:00
B3n30
d3694a930e Give frontend access to the hle service interfaces 2018-10-03 19:44:23 +02:00
Sebastian Valle
3790ccc7b2 Merge pull request #4287 from Subv/am_subfile 
Services/AM: Support using FS subfiles with the CIA-related service functions.
 2018-10-03 10:13:46 -05:00
Subv
5165b63512 Services/AM: Support using FS subfiles with the CIA-related service functions. 
FS subfiles are created with File::OpenSubFile, they have a start offset that must be added to all read/write operations.

The implementation in this commit is done using a new FileBackend that wraps the FS::File along with the start offset.
 2018-10-03 09:57:05 -05:00
James Rowe
874a95cea7 Merge pull request #4291 from KyButler/master 
Slightly changed wording of LOG_ERROR statements.
 2018-10-02 13:32:33 -06:00
Kyran Butler
7df8c118d4 Slightly changed wording of LOG_ERROR statements. 
More grammatically correct.
 2018-10-02 13:20:36 -06:00
Weiyi Wang
22df17c303 input/sdl: lock map mutex after SDL call 
Any SDL invocation can call the even callback on the same thread, which can call GetSDLJoystickBySDLID and eventually cause double lock on joystick_map_mutex. To avoid this, lock guard should be placed as closer as possible to the object accessing code, so that any SDL invocation is with the mutex unlocked
 2018-10-02 11:22:20 -04:00
bunnei
2d116607fe Merge pull request #4288 from Subv/am_system_mutex 
Services/AM: Implement the GetSystemUpdaterMutex function.
 2018-10-02 11:14:04 -04:00
Subv
7aa97198a3 Services/AM: Implement the GetSystemUpdaterMutex function. 
This function just returns a Mutex.
 2018-10-02 09:07:00 -05:00
Weiyi Wang
9813d0deed Merge pull request #4286 from zhaowenlan1779/fix-tx-push 
travis: disable scripting for transifex push job
 2018-10-02 08:17:50 -04:00
Pengfei Zhu
c709ac0021 travis: disable scripting for transifex push job 
Fixes transifex push.
 2018-10-02 18:50:54 +08:00
zhupengfei
8cf1132b2e ncch_container: choose the first id as extdata id when extended save data access is used 2018-10-02 08:15:10 +08:00
Weiyi Wang
fceec34945 Merge pull request #4278 from wwylele/cfg-ptm-direct-fs 
cfg, ptm: access FS via backend directly
 2018-10-01 18:32:43 -04:00
Weiyi Wang
0e77cd385a Merge pull request #4277 from wwylele/cecd-direct-fs 
cecd: access FS via backend directly
 2018-10-01 18:26:51 -04:00
bunnei
4a5a97ab88 Merge pull request #4253 from wwylele/string-util-cleanup 
common/string_util cleanup
 2018-10-01 17:52:58 -04:00
Weiyi Wang
fb720c00b7 Merge pull request #4273 from wwylele/apt-direct-fs 
APT: access FS via backend directly
 2018-10-01 14:24:06 -04:00
Weiyi Wang
5fb3137bdc Merge pull request #4181 from wwylele/cia-crypto 
Add encrypted CIA support
 2018-10-01 14:23:35 -04:00
Pengfei Zhu
b2bfcfcbd7 Merge pull request #4140 from zhaowenlan1779/input-config 
citra_qt/configuration: misc input tab improvements
 2018-10-01 03:05:31 -05:00
bunnei
9f972b9f5c Merge pull request #4276 from MerryMage/jit_breakpoints 
arm_dynarmic: Pass breakpoints to gdbstub
 2018-09-30 21:42:00 -04:00
bunnei
27203c0d47 Merge pull request #4274 from wwylele/http-direct-fs 
http_c: access FS via backend directly
 2018-09-30 21:37:07 -04:00
zhupengfei
bbf391abb9 citra_qt, core: game list "Open XXX Location" improvements 2018-10-01 08:42:22 +08:00
MerryMage
b4d9d9661a arm_dynarmic: Pass breakpoints to gdbstub 
Allow gdbstub to handle execution breakpoints
 2018-09-30 19:40:49 +01:00
zhupengfei
9d142f981d movie: fix default value in StartPlayback 2018-09-30 14:26:38 +08:00