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

7107 Commits

Author SHA1 Message Date
Tobias dec3fb2dcf nfc: Add Amiibo support (REOPENED) (#4337) 
* Initial implementation

* Various fixes and new features

* Address some review comments

* Fixes

* Address more comments

* Use g_hle_lock

* Add more state checking, remove unneeded include

* Minor changes
 2018-10-24 21:01:38 -04:00
Weiyi Wang 6742472133
Merge pull request #4235 from FearlessTobi/port-1259 
Port various game_list changes from yuzu
 2018-10-24 20:57:58 -04:00
Weiyi Wang 218cbd7289
Merge pull request #4360 from FearlessTobi/cmakelists-changes 
Port yuzu-emu/yuzu#1543: "CMakeLists: Use target_compile_definitions instead of add_definitions to define CITRA_ENABLE_COMPATIBILITY_REPORTING"
 2018-10-24 09:56:12 -04:00
Lioncash 6147bb622d CMakeLists: Use target_compile_definitions instead of add_definitions to define YUZU_ENABLE_COMPATIBILITY_REPORTING 
Keeps the definition constrained to the citra_qt target and prevents
polluting anything else in the same directory (should that ever happen).
It also keeps it consistent with how the USE_DISCORD_PRESENCE definition
is introduced below it.
 2018-10-23 16:16:11 +02:00
Weiyi Wang 129ca865b3
Merge pull request #4355 from lioncash/query 
svc: Correct vma_map boundary check within QueryProcessMemory
 2018-10-22 09:27:46 -04:00
Lioncash 930abb4b5e svc: Correct vma_map boundary check within QueryProcessMemory 
This should be using the process instance retrieved within the function,
and not g_current_process, otherwise this is potentially comparing
iterators from unrelated vma_map instances (which is undefined
behavior).
 2018-10-21 22:00:12 -04:00
Weiyi Wang 57ce5079bc
Merge pull request #4336 from wwylele/file-util-mingw 
Only redefine some 64-bit file operation for MSVC
 2018-10-21 20:34:48 -04:00
Weiyi Wang 6f1759c5bd
Merge pull request #4341 from wwylele/kernel-global 
Kernel: make a kernel instance and remove object ID counter from global state
 2018-10-21 18:53:36 -04:00
Weiyi Wang 11729eafe1
Merge pull request #4315 from FearlessTobi/port-1332 
WebService: Backport review comments from yuzu-emu/yuzu#1332
 2018-10-20 18:05:06 -04:00
Weiyi Wang 65ec8de31e web_service: hide dependencies to private 2018-10-20 10:47:17 -04:00
fearlessTobi 57d68bb541 Address review comments 2018-10-20 10:35:55 -04:00
fearlessTobi 7daac96862 Review comments - part 5 2018-10-20 10:35:55 -04:00
fearlessTobi 9901b289b6 Review comments -part 4 2018-10-20 10:35:55 -04:00
fearlessTobi 08793a6dae Review comments - part 3 2018-10-20 10:35:55 -04:00
fearlessTobi 8a87a6a72f Address more review comments 2018-10-20 10:35:55 -04:00
fearlessTobi b0aed19823 Address a bunch of review comments 2018-10-20 10:35:55 -04:00
fearlessTobi 111b7db759 Stop splitting includes 2018-10-20 16:31:35 +02:00
Lioncash f56a840333 game_list_p: Take map iterator contents by const reference 
We don't need to copy the whole struct in this instance, we can just
utilize a reference instead.
 2018-10-20 16:31:35 +02:00
Lioncash 52ec85be12 game_list_p: Amend typo in GameListItemCompat's constructor parameter 
Adds a missing 'i' character that was missing in compatibility.
 2018-10-20 16:31:35 +02:00
Lioncash 230edc8c7c yuzu: Move compatibility list specifics to their own source files 
Lets us keep the generic portions of the compatibility list code
together, and allows us to introduce a type alias that makes it so we
don't need to type out a very long type declaration anymore, making the
immediate readability of some code better.
 2018-10-20 16:31:35 +02:00
lioncash 9238015dd4 yuzu: Move GameListWorker to its own source files 
This has gotten sufficiently large enough to warrant moving it to its
own source files. Especially given it dumps the file_sys headers around
code that doesn't use it for the most part.

This'll also make it easier to introduce a type alias for the
compatibility list, so a large unordered_map type declaration doesn't
need to be specified all the time (we don't want to propagate the
game_list_p.h include via the main game_list.h header).
 2018-10-20 16:31:35 +02:00
Weiyi Wang eadd8b91b2
Merge pull request #4338 from FearlessTobi/port-1490 
Port yuzu-emu/yuzu#1490: "citra_qt/main: Simplify OnMenuLoadFile()"
 2018-10-20 10:09:41 -04:00
Weiyi Wang 18caa787d2
Merge pull request #4197 from B3n30/spsc_queue_wait 
threadsafe_queue: Add PopWait and use it where possible
 2018-10-19 19:36:37 -04:00
Weiyi Wang 751ebe55e9 Kernel: pass ref down to Object and wrap ID counter into kernel state 2018-10-18 21:41:36 -04:00
Weiyi Wang 87426b29ff kernel: pass ref to shared memory 2018-10-18 21:41:36 -04:00
Weiyi Wang 2a411bb501 Kernel: wrap resource limit state into kernel state; pass ref to resource limit 2018-10-18 21:41:36 -04:00
Weiyi Wang 13c26b4371 Kernel: pass ref to session pair 2018-10-18 21:41:36 -04:00
Weiyi Wang 1213a298df Kernel: pass ref to port 2018-10-18 21:41:36 -04:00
Weiyi Wang c141657d83 Kernel: pass ref to timer 2018-10-18 21:41:36 -04:00
Weiyi Wang 247249d5d3 Kernel: pass ref to sempahore 2018-10-18 21:41:36 -04:00
Weiyi Wang 181646679c ServiceManager: pass down core reference 2018-10-18 21:41:36 -04:00
Weiyi Wang d940293d32 Kernel: pass ref to thread 2018-10-18 21:41:36 -04:00
Weiyi Wang 9565091fc2 kernel: pass ref in Process 2018-10-18 21:41:36 -04:00
Weiyi Wang 213b259cf1 kernel: pass ref in CodeSet 2018-10-18 21:41:36 -04:00
Weiyi Wang 7449ba85a6 Kernel: pass ref in Mutex 2018-10-18 21:41:36 -04:00
Weiyi Wang eec11a94cb Kernel: pass Kernel ref in Event 2018-10-18 21:41:36 -04:00
Weiyi Wang 734be98966 Kernel: pass Kernel reference into AddressArbiter 2018-10-18 21:41:00 -04:00
Weiyi Wang f446fd1fe5 Kernel: add KernelSystem class 2018-10-18 21:41:00 -04:00
Weiyi Wang 1de63f9b16
Merge pull request #4328 from B3n30/remove_current_module 
remove GetCurrentModule() functions in HLE Services
 2018-10-18 21:39:24 -04:00
Pengfei Zhu 9458ae0977
Merge pull request #4259 from zhaowenlan1779/game-list 
citra_qt: Add Game List configuration
 2018-10-18 21:29:33 +08:00
Weiyi Wang 53a3498aee
Merge pull request #4193 from B3n30/controller5 
Joystick: Allow for background events; Add deadzone to SDLAnalog
 2018-10-17 10:49:21 -04:00
Pengfei Zhu c4ed7e75f4
Merge pull request #4340 from wwylele/disable-scripting 
CMake: disable scripting on default
 2018-10-17 17:48:11 +08:00
Ben f48157c6ea
Load AES keys stored in boot9.bin (#4335) 
* Load AES keys stored in boot9.bin
 2018-10-17 10:13:55 +02:00
Weiyi Wang 380b83e9bd cmake: mingw also needs _FILE_OFFSET_BITS=64 2018-10-16 13:23:07 -04:00
Weiyi Wang 2a7b87874b
Merge pull request #4343 from FearlessTobi/port-1487 
Port yuzu-emu/yuzu#1487: "Apply the [[maybe_unused]] attribute to the parameter of SetDiscordEnabled()"
 2018-10-16 11:07:31 -04:00
Lioncash 15ecc38ada citra_qt/main: Apply the [[maybe_unused]] attribute to the parameter of SetDiscordEnabled() 
Depending on whether or not USE_DISCORD_PRESENCE is defined, the "state"
parameter can be used or unused. If USE_DISCORD_PRESENCE is not defined,
the parameter will be considered unused, which can lead to compiler
warnings. So, we can explicitly mark it with [[maybe_unused]] to inform
the compiler that this is intentional.
 2018-10-16 14:42:48 +02:00
Weiyi Wang fc46bba4f2 CMake: disable scripting on default 2018-10-15 12:23:47 -04:00
Ben b01b94d843 FileSys::Ticket::Load: Return error if signature type does not match (#4339) 
* FileSys::Ticket::Load: Return error if signature type does not match

* fixup! FileSys::Ticket::Load: Return error if signature type does not match
 2018-10-15 11:26:35 -04:00
Pengfei Zhu 0df32275a7
Merge pull request #4282 from zhaowenlan1779/frame-advance 
core, citra_qt: add frame advancing to framelimiter
 2018-10-15 21:25:41 +08:00
Lioncash 7ddfce4a87 citra_qt/main: Simplify OnMenuLoadFile() 
We can utilize QStringList's join() function to perform all of the
appending in a single function call.

While we're at it, make the extension list a single translatable string
and add a disambiguation comment to explain to translators what %1
actually is.
 2018-10-14 22:31:46 +02:00