citra/citra-canary
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-canary.git synced 2024-12-23 17:05:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
6651 commits 3 branches 2798 tags 74 MiB
Commit graph

5522 commits

Author SHA1 Message Date
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
James Rowe 4b59c1b601
Merge pull request #4042 from wwylele/i-love-drivers 
gl_rasterizer: apply AMD hack only when the vendor is AMD
 2018-08-02 11:01:25 -06:00
James Rowe c771dd9813
Merge pull request #4021 from FearlessTobi/port-709 
Port #709 from yuzu: "common/misc: Deduplicate code in GetLastErrorMsg()
 2018-08-02 11:00:53 -06:00
Weiyi Wang 5bf87e986e
Merge pull request #4040 from valentinvanelslande/lighting 
swrasterizer/lighting: remove newline in logging macro
 2018-08-02 11:18:03 +03:00
Weiyi Wang 9b558253a0
Merge pull request #4031 from zhaowenlan1779/port-yuzu-723 
Port "gdbstub: Get rid of a few signed/unsigned comparisons" from yuzu
 2018-08-02 11:17:38 +03: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
Weiyi Wang 14bc20fc8d
Merge pull request #3996 from NarcolepticK/dsp-remove-weakptr 
service/dsp: Clean up global state
 2018-08-02 11:14:59 +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
BreadFish64 aa4b71d0ce update fmt to latest stable release 
5.1.0
fixes a multitude of errors on MSVC
 2018-08-01 14:10:24 -05:00
BreadFish64 74cd98ecad core: clean up warnings 2018-08-01 14:10:23 -05:00
Merry ba6eee71f5
Merge pull request #4024 from zhaowenlan1779/port-yuzu-745 
Port yuzu-emu/yuzu#745 from yuzu
 2018-08-01 15:02:40 +01: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
Lioncash b92af5a858
param_package: Take std::string by value in string-based Set() function 
Allows avoiding string copies by letting the strings be moved into the
function calls.
 2018-08-01 17:21:11 +08:00
wwylele 266f2b6242 gl_rasterizer: only apply AMD hack when the vendor is AMD 2018-07-31 22:58:17 +03:00
Valentin Vanelslande b2ad88dac1
swrasterizer/lighting: remove newline in logging macro 
Software rasterizer version of #3904
 2018-07-30 16:09:16 -05:00
James Rowe 05eb0ccb03
Merge pull request #4014 from wwylele/old-service 
service: remove deprecated service interface
 2018-07-30 11:31:54 -06:00
Merry 9af731793a
Merge pull request #4025 from zhaowenlan1779/port-yuzu-775 
Port "string_util: Minor changes" from yuzu
 2018-07-30 18:28:38 +01:00
Merry ec76cd82b0
Merge pull request #4037 from zhaowenlan1779/port-yuzu-710 
Port "common/common_funcs: Remove unused rotation functions" from yuzu
 2018-07-30 18:28:11 +01: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
James Rowe ecb3dc2fb8
Merge pull request #4038 from zhaowenlan1779/port-yuzu-711 
Port "common/swap: Minor changes" from yuzu
 2018-07-30 10:21:49 -06:00
James Rowe 8fd9f22657
Merge pull request #4030 from zhaowenlan1779/port-yuzu-743 
Port "logging: Use std::string_view where applicable" from yuzu
 2018-07-30 10:19:28 -06:00
zhupengfei 5a47cbed17
no need to cast to u32 according to @wwylele comment 2018-07-30 22:40:56 +08:00
Lioncash b4cdbf3ee8
gdbstub: Get rid of a few signed/unsigned comparisons 
Ensures both operands in comparisons are the same signedness.
 2018-07-30 22:40:43 +08: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
Lioncash 1a0529a064 common/swap: Remove unnecessary const on return value of swap() 2018-07-30 21:30:15 +08:00
Lioncash a2203e1566 common/swap: Use static_cast where applicable 2018-07-30 21:30:14 +08:00
Lioncash 5a66820c20 common/swap: Use using aliases where applicable 2018-07-30 21:30:13 +08:00
fearlessTobi b0c35c54ca Fix travis MinGW build 2018-07-30 14:50:23 +02:00
fearlessTobi 15abf35889 Address feedback by wwylele 2018-07-30 14:46:13 +02:00
Lioncash b539745153 common/common_funcs: Remove unused rotation functions 
These are unused and essentially don't provide much benefit either. If
we ever need rotation functions, these can be introduced in a way that
they don't sit in a common_* header and require a bunch of ifdefing to
simply be available
 2018-07-30 20:08:59 +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
Merry 4acc4d87d6
Merge pull request #4032 from zhaowenlan1779/port-yuzu-758 
Port "common: Remove synchronized_wrapper.h" from yuzu
 2018-07-30 12:36:45 +01:00
Merry c4c158c6b6
Merge pull request #4036 from zhaowenlan1779/port-yuzu-705 
Port "file_util: return string by const reference for GetExeDirectory()" from yuzu
 2018-07-30 12:10:35 +01:00
Lioncash 995d1cd785 string_util: Get rid of separate resize() in CPToUTF16(), UTF16ToUTF8(), CodeToUTF8() and UTF8ToUTF16() 
There's no need to perform the resize separately here, since the
constructor allows presizing the buffer.

Also move the empty string check before the construction of the string
to make the early out more straightforward.
 2018-07-30 18:18:15 +08:00
Lioncash f34dde32d1 string_util: Use emplace_back() in SplitString() instead of push_back() 
This is equivalent to doing:

push_back(std::string(""));

which is likely not to cause issues, assuming a decent std::string
implementation with small-string optimizations implemented in its
design, however it's still a little unnecessary to copy that buffer
regardless. Instead, we can use emplace_back() to directly construct the
empty string within the std::vector instance, eliminating any possible
overhead from the copy.
 2018-07-30 18:18:14 +08:00
Lioncash 841bb4e5bd string_util: Remove unnecessary std::string instance in TabsToSpaces() 
We can just use the variant of std::string's replace() function that can
replace an occurrence with N copies of the same character, eliminating
the need to allocate a std::string containing a buffer of spaces.
 2018-07-30 18:18:12 +08: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
Weiyi Wang 1f14ebf35d
Merge pull request #3977 from B3n30/bad_word_list 
Add virtual bad word list; Load if dump is missing
 2018-07-30 12:01:45 +03:00
Lioncash 99b2a871a7 file_util: return string by const reference for GetExeDirectory() 
This disallows modifying the internal string buffer (which shouldn't be
modified anyhow).
 2018-07-30 16:55:55 +08:00
Weiyi Wang 77f4859059
Merge pull request #4026 from zhaowenlan1779/port-yuzu-765 
Port "file_util: Remove goto usages from Copy()" from yuzu
 2018-07-30 11:44:32 +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
Weiyi Wang abc86921ab
Merge pull request #4027 from zhaowenlan1779/port-yuzu-704 
Port "string_util: Remove AsciiToHex()" from yuzu
 2018-07-30 11:22:46 +03: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
Lioncash cc6cb45536 file_util: std::move FST entries in ScanDirectoryTree() 
Avoids unnecessary copies when building up the FST entries.
 2018-07-30 16:16:58 +08:00
Merry f4a389dca5
Merge pull request #4023 from zhaowenlan1779/port-yuzu-797 
Port yuzu-emu/yuzu#797 from yuzu
 2018-07-30 08:28:35 +01:00
Lioncash 1eb3d0c634 common: Remove synchronized_wrapper.h 
This is entirely unused in the codebase.
 2018-07-30 15:12:04 +08:00
Lioncash 1affca05c7 logging/filter: Use std::string_view in ParseFilterString() 
Allows avoiding constructing std::string instances, since this only
reads an arbitrary sequence of characters.

We can also make ParseFilterRule() internal, since it doesn't depend on
any private instance state of Filter
 2018-07-30 14:56:53 +08:00
Lioncash 798ebda049 logging/backend: Add missing standard includes 
A few inclusions were being satisfied indirectly. To prevent breakages
in the future, include these directly.
 2018-07-30 14:56:52 +08:00
Lioncash 765c7e711a logging/backend: Use std::string_view in RemoveBackend() and GetBackend() 
These can just use a view to a string since its only comparing against
two names in both cases for matches. This avoids constructing
std::string instances where they aren't necessary.
 2018-07-30 14:56:51 +08:00
Lioncash 8068f506c5 string_util: Remove AsciiToHex() 
Easy TODO
 2018-07-30 09:06:14 +08:00
Lioncash d3a52e45e3 file_util: Remove goto usages from Copy() 
We can just leverage std::unique_ptr to automatically close these for us
in error cases instead of jumping to the end of the function to call
fclose on them.
 2018-07-30 08:48:58 +08:00
Lioncash 5b691d3fe0 param_package: Use std::unordered_map's insert_or_assign instead of map indexing 
This avoids a redundant std::string construction if a key doesn't exist
in the map already.

e.g.

data[key] requires constructing a new default instance of the value in
the map (but this is wasteful, since we're already setting something
into the map over top of it).
 2018-07-30 08:22:42 +08:00
Lioncash 290bfa1804 param_package: Get rid of file-static std::string construction 
Avoids potential dynamic allocation occuring during program launch
 2018-07-30 08:22:41 +08:00
Lioncash 661f7bbcfd core: Make converting constructors explicit where applicable 
Avoids unwanted implicit conversions. Thankfully, given the large amount
of cleanup in past PRs, only this tiny amount is left over to cover.
 2018-07-30 08:21:13 +08:00
NarcolepticK 8f70e9a318 service/dsp: Addressed comments about function name and pointer type 2018-07-29 15:18:30 -04:00
Lioncash 3ad1ee65ad Port #709 from yuzu: "common/misc: Deduplicate code in GetLastErrorMsg()" 2018-07-29 16:28:58 +02: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
Ben 04bd104c4a
Merge pull request #3992 from Subv/applets_close 
Services/HLE: Implement PrepareToCloseLibraryApplet and CloseLibraryApplet
 2018-07-29 10:34:32 +02:00
Weiyi Wang 383cde84d3
Merge pull request #3917 from Steveice10/master 
am: Fix DLC loading.
 2018-07-28 18:48:28 +03:00
B3n30 97fda30839 Use std::begin and std::end for system archives c array 2018-07-28 12:07:11 +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
wwylele 323313b2e9 service: remove deprecated service interface 2018-07-27 21:22:15 +03: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
NarcolepticK 5c52c6e64a service/boss: Migrate to ServiceFramework (#3998) 
* service/boss: Migrate to ServiceFramework

* service/boss: Addressed comments

* service/boss: Added TODO: verify ResetType
 2018-07-27 16:07:23 +03:00
NarcolepticK 5a4ed10982 service/csnd: Moved into csnd folder and stubbed a few functions (#4006) 
* service/csnd: Moved into csnd folder and stubbed a few functions

* service/csnd: Addresed comment about missing rb.Skip
 2018-07-27 11:25:20 +03:00
Weiyi Wang 719bec84cd
Merge pull request #4007 from B3n30/romfs_file 
RomFS: add RomFSFile and RomFS::GetFile
 2018-07-27 11:24:31 +03: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
B3n30 123c0886e6 RomFSFile: Default constructor 2018-07-26 13:10:56 +02:00
B3n30 b1f8c2fe67 Remove RomFS::GetFilePointer 2018-07-26 12:59:31 +02:00
B3n30 b62978b5a1 RomFS: add RomFSFile and GetRomFSFile 2018-07-26 12:31:59 +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
Subv d19dbe8419 Services/HTTP: Added error handling to AddRequestHeader 2018-07-25 16:48:04 -05:00
Subv 03294ce6b4 Services/HTTP: Implemented the InitializeConnectionSession function. 2018-07-25 16:13:47 -05:00
Subv 28c296a13b Services/HTTP: Corrected some error codes and added a few new ones. 
Use the session data to store information about the HTTP session state.
This is based on reverse engineering of the HTTP module.

The AddRequestHeader function is still mostly incorrect, this will be fixed in follow up PRs
 2018-07-25 14:59:29 -05: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
James Rowe d79cb6373d
Merge pull request #3972 from zhaowenlan1779/common-timer 
common/timer: use std::chrono, avoid platform-dependent code
 2018-07-25 10:00:04 -06:00
James Rowe e4d65927c2
Merge pull request #3991 from zhaowenlan1779/no-lle-applets 
applet_manager: disable loading LLE applets
 2018-07-25 09:54:02 -06:00
James Rowe 9d95373282
Merge pull request #3999 from NarcolepticK/stub-service-ps 
service/ps: Boilerplate to register service, no functions implemented
 2018-07-25 09:52:45 -06:00
James Rowe 7fb8b6b7a2
Merge pull request #3971 from adityaruplaha/cpu-jit-move 
citra_qt: Move CPU JIT toggle to Debug tab.
 2018-07-25 09:50:33 -06:00
Sebastian Valle 472ee00e8f
Merge pull request #3981 from B3n30/httpc 
Migrate HTTP_C to the ServiceFramework and implement functions
 2018-07-25 10:20:27 -05:00
Weiyi Wang b65ee99681
Merge pull request #3997 from zhaowenlan1779/use-std-transform 
common/string_utils: replace boost::transform with std counterpart
 2018-07-25 10:38:36 +03:00
NarcolepticK 081becc9f5 service/ps: Boilerplate to register service, no functions implemented 2018-07-25 02:25:51 -04:00
zhupengfei cc1f44f7bd
common/string_utils: replace boost::transform with std counterpart 
Note: according to cppreference it is necessary to convert char to unsigned char when using std::tolower and std::toupper, otherwise the behaviour would be undefined.
 2018-07-25 08:04:00 +08:00
B3n30 050d116cb6 Fixed include in http_c,h; added ERROR_CONTEXT_ERROR to CreateContext 2018-07-24 23:38:19 +02:00
NarcolepticK b840c63386 service/dsp: Clean up global state 2018-07-24 16:15:37 -04:00
Subv cce882b688 Services/HLE: Implement PrepareToCloseLibraryApplet and CloseLibraryApplet. 
This allows LLE library applets (like swkbd) to properly close and return to the application instead of hanging.

There is still a bug in our rasterizer cache that may cause crashes some time after an applet is closed, but that is tangential to this change and should be tackled separately.
 2018-07-24 14:50:19 -05:00
fearlessTobi 7a3e126a4f Replace MathUtil::Clamp with its std counterpart 2018-07-24 19:08:17 +02:00
zhupengfei 44db59be2b
applet_manager: disable loading LLE applets 
Currently LLE applets cannot exit properly in Citra and causes Citra to hang. We are already providing HLE for applets, and the LLE applets are preventing users who dumped their system files from using the applets correctly. Before the further fix is done, I think we should temporaily disable loading LLE applets.
 2018-07-24 23:24:27 +08:00
zhupengfei 3a8b002ede citra_qt: minor retranslation fix 
When you change the language when a game is running, the "Continue" action in the "Emulation" menu would become "Start". This commit fixes the issue by checking and setting it if it should be "Continue". It seems that this is the only place with this issue.
 2018-07-24 19:49:49 +08:00
zhupengfei 76465dd0f5
citra_qt: retranslate status bar 2018-07-24 19:20:00 +08:00
zhupengfei 921037a7c3
citra_qt/multiplayer: allow blocking other players in chat room 2018-07-24 15:24:21 +08:00
zhupengfei 2cf7576351
citra_qt/configuration: retranslate hotkey widget on language change 
The hotkey widget has a separate class defined for it, and qt cannot automatically retranslate it when retranslateUi is called. This commit explicitly calls the function to retranslate the hotkey dialog.
 2018-07-24 12:32:09 +08:00