OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-19 06:21:05 +00:00
Code Issues Projects Releases Wiki Activity
6,675 Commits 1 Branch 0 Tags 135 MiB
702ca755b3
Commit Graph

920 Commits

Author SHA1 Message Date
Merry
702ca755b3
Merge pull request #4131 from FearlessTobi/port-943 
Port #943 from yuzu: "game_list: Join declarations and assignments in onTextChanged()"
 2018-08-24 18:54:31 +01:00
zhaowenlan1779
642f0bd62b Port "kernel/event: Make data members private" from yuzu (#4077) 
* kernel/event: Make data members private

Instead we can simply provide accessors to the required data instead of
giving external read/write access to the variables directly.

* fix compile error
 2018-08-24 19:43:28 +02:00
fearlessTobi
c8b1edac63 Port #943 from yuzu: "game_list: Join declarations and assignments in onTextChanged()" 2018-08-24 17:28:00 +02:00
James Rowe
b3ca900ba7 Revert "Set DiscordRPC OFF by default (#4109)" 
This reverts commit 516be14a6b.
 2018-08-20 10:34:58 -06:00
Vamsi Krishna
516be14a6b Set DiscordRPC OFF by default (#4109) 2018-08-20 16:19:12 +02:00
Vamsi Krishna
6cb9a45154 Add Discord Rich Presence Support (#3883) 
* Initial Discord RPC support

Build with Discord Presence ON

Fix RPC detection

Fix Time elapsed on pause; will now continue to count.

* Fix CI builds with compile flag

Addressed reviews

Fix silly mistakes

Fix 'Not in-game' display

class instead of namespace

Fix

Revamped

remove redundant code

Using Pimpl pattern

* Implement Null class

* Fix config updation

* Addressed All Reviews

* externals/discord-rpc : Updated to latest commit
 2018-08-20 11:20:33 +02:00
zhaowenlan1779
5c5aad09ce qt_themes: add two colorful themes (#4004) 
* qt_themes: add two colorful themes

These two colorful themes are based on the Default and Dark themes, and contain icons that are colored rather than black and white. These icons come from https://icons8.com and they have been slightly revised by me. I'm pretty sure I was licensed to use them for Citra.

* Add license for icons
 2018-08-16 10:39:23 +02:00
James Rowe
20cb8f66db
Merge pull request #4099 from zhaowenlan1779/lle-service-modules-fixup 
citra_qt: set object name for LLEServiceModulesWidget
 2018-08-14 10:48:03 -06:00
zhaowenlan1779
e837717592
citra_qt: set object name for LLEServiceModulesWidget 
Gets rid of a qt error that occurs when Citra is closed.
 2018-08-14 20:28:47 +08:00
James Rowe
aed15a8d9d
Merge pull request #4012 from zhaowenlan1779/ui-retext 
citra_qt: UI text improvements
 2018-08-13 23:31:39 -06:00
zhupengfei
e1ae14d508
input_common/udp: allow changing pad index 2018-08-11 13:23:10 +08:00
Lioncash
265e875e5b
qt/main: Better file-existence checking within OnMenuRecentFile() and UpdateUITheme() 2018-08-10 09:45:48 +08:00
BreadFish64
d09646ab9d citra-qt: service: add convenient LLE service module configuration (#3967) 
* citra-qt: service: add convenient LLE service module configuration

* fix SDL settings

* unexpose AttemptLLE

* static

* fix array includes

* use default with writesetting
 2018-08-09 21:10:11 +02:00
James Rowe
dceb4150a8
Merge pull request #4065 from zhaowenlan1779/port-yuzu-947 
game_list: Use QString::fromStdString() where applicable instead of c_str()
 2018-08-09 09:41:35 -06:00
James Rowe
77573b93ce
Merge pull request #4066 from zhaowenlan1779/port-yuzu-946 
Port "qt/main: Collapse if statement in UpdateRecentFiles()" from yuzu
 2018-08-09 09:41:10 -06:00
zhupengfei
a51c700f59
Port "qt/main: Collapse if statement in UpdateRecentFiles()" from yuzu 2018-08-08 16:55:23 +08:00
zhupengfei
b71fbe62a8
game_list: Use QString::fromStdString() where applicable instead of c_str() 2018-08-08 16:43:59 +08:00
James Rowe
93386efccb
Merge pull request #4056 from zhaowenlan1779/clear-recent-files 
citra_qt: add Clear Recent Files menu action
 2018-08-07 21:28:33 -06:00
James Rowe
6bcbda5ab2 Input: UDP Client to provide motion and touch controls 
An implementation of the cemuhook motion/touch protocol, this adds the
ability for users to connect several different devices to citra to send
direct motion and touch data to citra.
 2018-08-07 21:05:09 -06:00
zhupengfei
6a1f9afbba
citra_qt: add Clear Recent Files menu action 
I had to edit a bit of the Restart action so that it does not go wrong because recent files are cleared.
 2018-08-06 09:19:35 +08:00
Weiyi Wang
5bc72cca6b
Merge pull request #3924 from zhaowenlan1779/settings 
citra_qt: Settings (configuration) default value fix
 2018-08-03 23:09:57 +03:00
zhupengfei
650c20eebf
citra_qt: Settings (configuration) rework 2018-08-03 13:49:30 +08:00
James Rowe
751e00a615
Merge pull request #3902 from valentinvanelslande/restart 
citra_qt: add restart hotkey & menu option
 2018-08-02 22:55:07 -06:00
James Rowe
6bc87cdf3e
Merge pull request #3987 from zhaowenlan1779/language-config-fix-2 
citra_qt/configuration: retranslate hotkey widget on language change
 2018-08-02 11:15:27 -06:00
James Rowe
14b0435df2
Merge pull request #3994 from FearlessTobi/replace-clamp-functions 
Remove MathUtil::Clamp and replace it with its std:: counterpart
 2018-08-02 11:08:07 -06:00
James Rowe
cafe9838b5
Merge pull request #4047 from zhaowenlan1779/bg-color 
citra_qt/configuration: Add background color config
 2018-08-02 11:05:20 -06:00
Weiyi Wang
27b015e652
Merge pull request #4011 from zhaowenlan1779/cmake-warning 
citra_qt/CMakeLists: get rid of a warning
 2018-08-02 11:16:46 +03:00
zhupengfei
60edddac7d
citra_qt/configuration: Add background color config 
This is actually very easy to do. I added a label and a push button for it, and used the Qt standard dialog QColorDialog for picking colors.
 2018-08-02 11:39:27 +08:00
Merry
6a9e18a49a
Merge pull request #4022 from zhaowenlan1779/port-yuzu-837 
Port yuzu-emu/yuzu#837 from yuzu
 2018-08-01 15:01:17 +01:00
Merry
703da21688
Merge pull request #4046 from zhaowenlan1779/config-camera-retranslate 
citra_qt/configuration: retranslate camera tab
 2018-08-01 15:00:12 +01:00
zhupengfei
51d05bd42b citra_qt/configuration: retranslate camera tab 
It was really a stupid mistake..
 2018-08-01 21:51:38 +08:00
Lioncash
8e103d0675
kernel/timer: Make data members private where applicable 
Instead, we can just expose functions that return the queryable state
instead of letting anything modify it.
 2018-08-01 17:49:52 +08:00
zhupengfei
383dd967d1
citra_qt: UI text improvements 
Changed a few texts that are not so good in the UI according to
@neobrain.
 2018-08-01 17:32:33 +08:00
James Rowe
7b46b7e29a
Merge pull request #4010 from zhaowenlan1779/statusbar-retheme 
qt_themes: add themed connected/disconnected icons for dark and fix status bar theme updating
 2018-07-30 10:35:42 -06:00
zhupengfei
5d7ccfb920
citra_qt/CMakeLists: get rid of a warning 
This got rid of a warning of CMake Policy CMP0071 not set. In fact, setting it to either OLD or NEW is same for Citra (I tested on MSVC and MinGW), and the OLD option is deprecated, so I am using NEW here.
 2018-07-30 22:32:48 +08:00
Ben
b4524eb70b
Merge pull request #3988 from zhaowenlan1779/multiplayer-block 
citra_qt/multiplayer: allow blocking other players in chat room
 2018-07-30 14:07:40 +02:00
Ben
d5333c37de
Merge pull request #4033 from zhaowenlan1779/port-yuzu-764 
Port "file_util: Minor changes to ScanDirectoryTree() and ForeachDirectoryEntry()" from yuzu
 2018-07-30 13:51:21 +02:00
Merry
45beea31ea
Merge pull request #4034 from zhaowenlan1779/port-yuzu-802 
Port "wait_tree: Silence warning about all code paths not returning a value" from yuzu
 2018-07-30 12:38:24 +01:00
Weiyi Wang
71729fd47a
Merge pull request #3951 from zhaowenlan1779/cfg-country-code 
service/cfg, citra_qt: add country code configuration
 2018-07-30 12:02:07 +03:00
Lioncash
bf5b5d25ed wait_tree: Silence warning about all code paths not returning a value 
If code execution hits this spot, something has gone very wrong, so mark
the path as unreachable. This silences a warning on MSVC.
 2018-07-30 16:32:09 +08:00
Lioncash
df5069f8c0 file_util: Use a u64 to represent number of entries 
This avoids a truncating cast on size. I doubt we'd ever traverse a
directory this large, however we also shouldn't truncate sizes away.
 2018-07-30 16:19:03 +08:00
Ben
07a78a6dd2
Merge pull request #3986 from zhaowenlan1779/language-config-fix 
citra_qt/configuration: fix input configuration disappearing after changing languages
 2018-07-29 10:35:17 +02:00
zhupengfei
b1bbe0441e
qt_themes: add themed connected/disconnected icons for dark and fix status bar theme updating 
In dark theme, it is very hard to see the connected/disconnected icons because they are dark too. So I added two white-coloured icons for the dark theme. This also fixed an issue where theme update does not change the icon on the status bar.
 2018-07-28 11:50:46 +08:00
Weiyi Wang
be193869cd
Merge pull request #3990 from zhaowenlan1779/retranslation-continue 
citra_qt: minor retranslation fix
 2018-07-27 19:55:58 +03:00
James Rowe
6a973cc0bb citra-qt: Init logging sooner so we dont miss some logs on startup 2018-07-27 09:29:31 -06:00
Weiyi Wang
7babd78a23
Merge pull request #3928 from zhaowenlan1779/log-settings 
citra_qt: Log settings on launch
 2018-07-27 11:22:23 +03:00
fearlessTobi
71e1d6e25d Fix compile errors 2018-07-26 13:23:25 +02:00
Weiyi Wang
7568020ea0
Merge pull request #3979 from zhaowenlan1779/filter-untranslated 
game_list: move SearchField to game_list_p.h and fix untranslated text
 2018-07-26 12:26:39 +03:00
Weiyi Wang
4b6d240641
Merge pull request #3983 from zhaowenlan1779/gamelist-translation 
game_list: fix untranslated texts
 2018-07-26 12:26:12 +03:00
James Rowe
4a3c4f5f67
Merge pull request #3989 from zhaowenlan1779/statusbar-retranslate 
citra_qt: retranslate status bar
 2018-07-25 10:19:11 -06:00