emu-mirror/citra-canary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,080 Commits 1 Branch 0 Tags 58 MiB
261dc33507
Commit Graph

7080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zak Kurka
261dc33507 Merge branch 'master' of github.com:citra-emu/citra into ips-patches 2018-10-20 18:11:38 -05:00
Zak Kurka
bf50bb06f1 Minor style changes and use memcpy 2018-10-20 18:10:32 -05: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
Zak Kurka
2496ecbaf6 Added IPS patching 2018-10-20 13:09:05 -05: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
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
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
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
zhupengfei
8ecd31db41
citra_qt: use enum classes for the settings 2018-10-14 22:55:28 +08:00
Pengfei Zhu
84ddb1cba0
Merge pull request #4331 from zhaowenlan1779/cemuhook-fix 
citra: fix cemuhook module crash
 2018-10-14 21:35:38 +08:00
zhupengfei
b459164c2a
citra: fix cemuhook module crash 
fixes #4144. Updated inih to use the newly added GetString function which returns the default value on empty string.
 2018-10-12 22:58:30 +08:00
B3n30
eb3af0f16a Add GetModule() helper functions, for HID, CAM, and CFG 2018-10-12 11:50:50 +02:00
B3n30
1b1de23a98 Fixup: Remove unneeded GetUsername 2018-10-11 20:05:45 +02:00
B3n30
9d53136f20 remove GetCurrentModule() functions in HLE Services 2018-10-11 19:23:14 +02:00
Weiyi Wang
0962ab8da9
Merge pull request #4305 from wwylele/fs-global 
FS/archive: wrap states into ArchiveManager class
 2018-10-11 13:04:02 -04:00
Weiyi Wang
9adc407112
Merge pull request #4304 from B3n30/std_optional 
Replace boost::optional with std::optional where possible
 2018-10-11 12:40:00 -04:00
Pengfei Zhu
efc0d502ed
Merge pull request #4326 from zhaowenlan1779/multiplayer-retranslate 
citra_qt/multiplayer: retranslate multiplayer dialogs
 2018-10-11 09:44:33 -05:00
Pengfei Zhu
8195d8ff82
Merge pull request #4327 from ccawley2011/patch-1 
travis: Ignore binary files when checking for trailing whitespace
 2018-10-11 09:44:13 -05:00
Cameron Cawley
c220e300c5
travis: Ignore binary files when checking for trailing whitespace 2018-10-10 15:24:25 +01:00
zhupengfei
748a9849ec
citra_qt/multiplayer: retranslate multiplayer dialogs 2018-10-10 18:21:22 +08:00
B3n30
ca77be3ac2 remove std::tie in sdl_impl 2018-10-09 23:19:24 +02:00
B3n30
2b46b838f1 fix deadzone max value 2018-10-09 21:23:50 +02:00
NeatNit
4ee914c7a8 implemented touch in Qt and SDL 
change TouchToPixelPos to return std::pair<int, int>

static_cast (SDL)

various minor style and code improvements

style - PascalCase for function names

made touch events private

const pointer arg in touch events

make TouchToPixelPos a const member function

did I do this right?

braces on barely-multiline if

remove question comment (confirmed in Discord)

fixed consts

remove unused parameter from TouchEndEvent

DRY - High-DPI scaled touch put in separate function

also fixes a bug where if you start touching (with either mouse or touchscreen) and drag the mouse to the LEFT of the emulator window, the touch point jumps to the RIGHT side of the touchscreen; draggin to above the window would make it jump to the bottom.

implicit conversion from QPoint to QPointF, apparently

I have no idea what const even means but I'll put it here anyway

remove unused or used-once variables

make touch scaling functions const, and put their implementations together

removed unused FingerID parameters

QTouchEvent forward declaration; add comment to TouchBegin that was lost in an edit

better DRY in SDL

To do -> TODO(NeatNit)

remove unused include
 2018-10-09 23:10:28 +08:00
zhupengfei
90f9d32f13
citra_qt: Add Game List configuration 
This adds a Game List configuration group box which is similar to yuzu's, with features including icon size setting, row 1/2 text, and ability to hide invalid titles (those without a valid SMDH). I also added a UI tab and moved the language and theme settings there.
 2018-10-09 22:37:21 +08:00
B3n30
e267377111 More fixes 2018-10-09 10:26:44 +02:00
B3n30
ad8b9c0429 Adressed review comments 2018-10-08 23:28:54 +02:00
Sebastian Valle
f405134913
Merge pull request #4306 from Subv/apt_jump 
Services/APT: Better implementation of PrepareToDoApplicationJump and DoApplicationJump.
 2018-10-08 15:44:38 -05:00
Ben
d99b1f581f NWM_UDS: Signal bind_node_event in Unbind (#4321) 2018-10-08 15:44:14 -05:00
BreadFish64
ce823759cc citra-qt: disable directory watcher during CIA installation (#4284) 
* disable directory watcher during CIA installation

fixes several errors while installing multiple CIAs

* use braces in if statement
 2018-10-08 15:37:44 -05:00
Weiyi Wang
756a3d404a
Merge pull request #4283 from valentinvanelslande/seed-db 
Implement SeedDB & Seed Crypto
 2018-10-08 14:18:42 -04:00
Weiyi Wang
3480c1d49d
Merge pull request #4242 from citra-valentin/fix-camera-on-linux-pr 
Fix camera on Linux
 2018-10-08 11:01:59 -04:00
Weiyi Wang
0b7b9a51d6
Merge pull request #4299 from B3n30/uds 
NWM_UDS: Fix some issues, cleanups, better PacketHandling
 2018-10-07 13:56:59 -04:00
Merry
a8155fdf48
Merge pull request #4314 from FearlessTobi/port-1440 
Port yuzu-emu/yuzu#1440: "ui_settings: Place definition of the theme array within the cpp file"
 2018-10-07 11:14:58 +01:00
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