Commit Graph

7327 Commits

Author SHA1 Message Date
b4b8c58f91 Merge pull request #4312 from wwylele/update-fmt
Update fmt to 5.2.1
2018-10-06 08:06:21 -04:00
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
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
61155a25c3 Update fmt to 5.2.1
It seems to fix msvc warnings
2018-10-06 01:58:09 -04:00
389d3d630e fs/archive: wrap states into archive manager 2018-10-06 01:23:03 -04:00
7678327bf2 fs/archive: move file and directory classes to their own files 2018-10-06 01:23:03 -04:00
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
0e42fa9fa7 Merge pull request #4307 from valentinvanelslande/movie
movie: fix some checks
2018-10-05 17:37:52 -05:00
dcd6e7f99f movie: fix some checks
Fixes invalid movie error
2018-10-05 17:20:14 -05:00
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
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
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
2306af3600 Handle cases when std::optional does not contain a value 2018-10-05 16:51:33 +02:00
53afb1cc2d Move if 2018-10-05 09:27:16 -05:00
2a90426cb8 Merge pull request #4267 from zhaowenlan1779/movie
movie: Add clock init time to CTM header
2018-10-05 08:20:33 -05:00
19ef115f50 Address comment 2018-10-05 07:22:26 -05:00
d37a2270d6 Replace boost::optional with std::optional where possible 2018-10-05 13:51:09 +02:00
7efe60ed23 Use SPSCQueue::PopWait in Scripting 2018-10-05 11:25:23 +02:00
9b49a79a72 threadsafe_queue: Add WaitIfEmpty and use it in logging 2018-10-05 11:09:38 +02:00
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
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
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
eb494c574d Merge pull request #4244 from wwylele/swap-enum
common/swap: add swap template for enum
2018-10-04 14:51:49 -04:00
4352c6784b Revert "Port yuzu/#1367 from yuzu: "game_list: Handle plurals within setFilterResult() better"" 2018-10-04 12:04:49 -04:00
458346d1e8 Adressed feedback 2018-10-04 12:34:51 +02:00
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
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
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
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
38f136048e Cleanup NWM_UDS::SendTo 2018-10-04 00:00:49 +02:00
ea53b0f795 Merge pull request #4298 from Subv/am_titles
Services/AM: Implemented BeginImportProgramTemporarily, EndImportProgramWithoutCommit and CommitImportPrograms.
2018-10-03 17:41:40 -04:00
7e7f17c78d Add filter to PacketHandling; Fix some issues with Disconnect 2018-10-03 23:07:31 +02:00
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
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
544eb25c99 fixup! Give frontend access to the hle service interfaces 2018-10-03 20:08:01 +02:00
d3694a930e Give frontend access to the hle service interfaces 2018-10-03 19:44:23 +02:00
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
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
874a95cea7 Merge pull request #4291 from KyButler/master
Slightly changed wording of LOG_ERROR statements.
2018-10-02 13:32:33 -06:00
7df8c118d4 Slightly changed wording of LOG_ERROR statements.
More grammatically correct.
2018-10-02 13:20:36 -06:00
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
2d116607fe Merge pull request #4288 from Subv/am_system_mutex
Services/AM: Implement the GetSystemUpdaterMutex function.
2018-10-02 11:14:04 -04:00
b067b5aa5a Implement SeedDB & Seed Crypto 2018-10-02 10:12:40 -05:00
7aa97198a3 Services/AM: Implement the GetSystemUpdaterMutex function.
This function just returns a Mutex.
2018-10-02 09:07:00 -05:00
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
c709ac0021 travis: disable scripting for transifex push job
Fixes transifex push.
2018-10-02 18:50:54 +08:00
32aecd42a2 LLE Mapped Buffer: Corrected behavior 2018-10-01 21:07:25 -04:00
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
cb775eb1ba core, citra_qt: add frame advancing to framelimiter
Frame advancing is a commonly used TAS feature which basically means running the game frame by frame. TASers use this feature to press exact buttons at the exact frames. This commit added frame advancing to the framelimiter and two actions to the Movie menu. The default hotkey is `\` for advancing frames, and `Ctrl+A` for toggling frame advancing. The `Advance Frame` hotkey would automatically enable frame advancing if not already enabled.
2018-10-02 07:28:58 +08:00
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