midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,785 Commits 1 Branch 5 Tags 60 MiB
5dacf92fd7
Commit Graph

5640 Commits

Author SHA1 Message Date
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
zhupengfei
79a38f8782 citra_qt/configuration: fix input configuration disappearing after changing languages 
Previously, once you change language, the texts in the buttons in the Input tab will disappear. It is because the default text in the buttons are empty, and we did not update the text after translations are reloaded, aka texts are reset. This commit fixed the issue.
 2018-07-24 12:19:47 +08:00
B3n30
daac1349db Service/HTTP_C: Add some comments; Fixed header in CloseContext 2018-07-23 21:14:41 +02:00
Weiyi Wang
14878a17d9
Merge pull request #3978 from zhaowenlan1779/remove-app-warning 
core/loader: avoid "different type" warning for .app
 2018-07-23 21:02:54 +03:00
B3n30
2f50bf0007 Service/HTTP_C: Fix error in CreateContext 2018-07-23 18:02:35 +02:00
zhupengfei
f70dc9198c
game_list: fix untranslated texts 
Due to a bug of Qt Linguist, the spliters in numbers cannot be parsed correctly and will cause strange issues. As far as I know, this caused 4 texts to be untranslated (translation source for them are not generated). Before the Qt bug is fixed (and we move to that version), I think we can temporarily remove the spliters from the numbers.
 2018-07-23 23:44:43 +08:00
zhupengfei
11da018ea6
game_list: move SearchField to game_list_p.h and fix untranslated text 
I have tested and made sure the text is translatable, but this would require a translation update to take effect.
 2018-07-23 21:26:55 +08:00
zhupengfei
4fb16098a4
core/loader: avoid "different type" warning for .app 
Previously for installed titles, the file type would be NCCH (assumed as CXI) and the extension would be ".app". This would trigger a warning of the file "having a different type than its extension", which is actually not true here.
 2018-07-23 17:37:52 +08:00
Weiyi Wang
87872aa369
Merge pull request #3976 from MerryMage/rm-code_block 
common: CodeBlock is unused
 2018-07-23 09:21:37 +03:00
B3n30
7605e26b94 Add virtual bad word list; Load if dump is missing 2018-07-22 22:55:44 +02:00
MerryMage
eae523ae17 common: CodeBlock is unused 2018-07-22 21:04:29 +01:00
Weiyi Wang
8388e5519b
Merge pull request #3944 from wwylele/soc-new-framework 
Service/SOC: convert to ServiceFramework
 2018-07-22 22:23:05 +03:00
Weiyi Wang
29ddbe4e7b
Merge pull request #3973 from B3n30/MPSCQueue 
remove polymorphism issue
 2018-07-22 22:22:22 +03:00
Weiyi Wang
2cef04db80
Merge pull request #3964 from LittleWhite-tb/soft-keyboard-fix 
Small fixes on software keyboard implementation
 2018-07-22 22:22:06 +03:00
B3n30
2d09355a25 Make Service::HTTP::Context non-copyable 2018-07-22 18:15:44 +02:00
B3n30
5af6a1d8ee Revert stubbed InitializeConnectionSession 2018-07-22 18:15:44 +02:00
B3n30
32155cd683 Service/HTTP: stubbed InitializeConnectionSession 2018-07-22 18:15:44 +02:00
B3n30
65c7ed8445 Service/HTTP: Moved declarations to the header file 2018-07-22 15:01:32 +02:00
B3n30
0606e7010c Services/HTTP: Implemented the AddRequestHeader service function. 2018-07-22 13:38:31 +02:00
zhupengfei
872e505cc6
common/timer: use std::chrono, avoid platform-dependent code 
* core/timer: use even more std::chrono

* common/timer: convert GetLocalTimeSinceJan1970
 2018-07-22 15:40:07 +08:00
Subv
799b45233f Services/HTTP: Stubbed the CloseContext service function. 
It is currently unknown how the real http module handles trying to close contexts for requests that are already in flight.
 2018-07-21 20:11:20 -05:00
Subv
34baa882c8 Services/HTTP: Corrected the error code for an invalid request method. 2018-07-21 19:50:13 -05:00
Subv
70e6979695 Services/HTTP: Implemented the CreateContext function handler. 2018-07-21 19:30:40 -05:00
B3n30
87ec3934a6 Services/HTTP: Added structures to represent an HTTP context. 
More fields will probably need to be added to these structures in the future.
 2018-07-21 19:10:00 -05:00
B3n30
fe5a3d22c5 Services/HTTP: Added structures to store both client and server certificates. 2018-07-21 19:00:50 -05:00
B3n30
1f865fd524 Services/HTTP: Stubbed the Initialize function. 2018-07-21 18:54:06 -05:00
B3n30
28124c053a Services/HLE: Convert the http:C service to the new service framework. 2018-07-21 18:48:57 -05:00
Alexandre LittleWhite Laurent
578b08c53b Truncating UTF16 text before converting them toUTF8 2018-07-21 18:17:46 +02:00
B3n30
8480899d8b remove polymorphism issue 2018-07-21 16:16:21 +02:00
adityaruplaha
38d4b41b0a citra_qt: Move CPU JIT toggle to Debug tab. 2018-07-21 12:43:24 +05:30
Alexandre LittleWhite Laurent
e28c527bfa Fix missing return value 2018-07-20 19:53:23 +02:00
Weiyi Wang
78685065cf
Merge pull request #3916 from wwylele/mipmap-proctex 
gl_rasterizer: implement mipmap for procedural texture
 2018-07-19 11:51:57 +03:00
Weiyi Wang
c8c5b55c00
Merge pull request #3957 from lioncash/qt 
game_list: Remove unnecessary QString initialization in KeyReleaseEater
 2018-07-19 10:14:58 +03:00
Weiyi Wang
f40ce71f76
Merge pull request #3958 from lioncash/func 
game_list: Make containsAllWords() a non-member function
 2018-07-19 10:14:18 +03:00
Weiyi Wang
67c0c2e0a0
Merge pull request #3956 from lioncash/telemetry 
common/telemetry: Minor changes
 2018-07-19 10:14:06 +03:00
Weiyi Wang
680c8b9c0b
Merge pull request #3926 from wwylele/texture-barrier 
gl_rasterizer: call glTextureBarrier when an image is bound to both texture and framebuffer
 2018-07-19 10:13:48 +03:00
zhupengfei
e8ac58c480
settings: move log code to settings 2018-07-19 08:38:57 +08:00
Lioncash
6614450da3 game_list: Make containsAllWords() a non-member function 
This doesn't depend on class state at all, so this can be made internal.
While we're at it, amend the function to take its arguments by const reference.
 2018-07-18 16:55:13 -04:00
Lioncash
033e889645 game_list: Remove unnecessary QString initialization in KeyReleaseEater 
QString initializes to an empty string by default, so this does nothing
meaningful. While we're at it, use a constructor initializer list for
initializing the gamelist member variable.
 2018-07-18 16:44:21 -04:00
Lioncash
0a8563fb79 telemetry: Remove unnecessary Field constructor 
We can just take the value parameter by value which allows both moving
into it, and copies at the same time, depending on the calling code.
 2018-07-18 16:18:34 -04:00
Lioncash
3244042c4c telemetry: Make operator== and operator!= const member functions of Field 
These operators don't modify internal class state, so they can be made
const member functions. While we're at it, drop the unnecessary inline
keywords. Member functions that are defined in the class declaration are
already inline by default.
 2018-07-18 16:17:40 -04:00
Lioncash
faa62b0d1e telemetry: Default copy/move constructors and assignment operators 
This provides the equivalent behavior, but without as much boilerplate.
While we're at it, explicitly default the move constructor, since we
have a move-assignment operator defined.
 2018-07-18 16:15:58 -04:00
Ben
7f1303a834 Use open source Shared Font if no dumped file is available (#3881) 
* Add virtual SharedFont; Load if dumped is missing

* Move open_source_archives to externals; add readme and git hash to open_source_archives

* Updated shared font to newest version: m fixed, symbols fixed
 2018-07-18 10:20:31 -06:00
James Rowe
7fa2076918
Merge pull request #3946 from zhaowenlan1779/macos-no-hw-shader 
citra_qt: disable hw shader by default for macos
 2018-07-18 10:07:12 -06:00
James Rowe
bc30b314d8
Merge pull request #3947 from zhaowenlan1779/autofill-multiplayer 
citra_qt: use Citra Web Service username as default multiplayer nickname
 2018-07-18 10:02:14 -06:00
James Rowe
2f8c9c8126
Merge pull request #3831 from FearlessTobi/add-volume-slider 
citra_qt: Add a volume slider
 2018-07-18 09:56:47 -06:00
zhupengfei
e61b7d265f
service/cfg, citra_qt: add country code configuration 2018-07-18 20:09:34 +08:00
wwylele
aa02c50a2e Service/SOC: convert to ServiceFramework 2018-07-18 09:52:51 +03:00
zhupengfei
bcbfac4081
configure_system: fix an untranslated text 2018-07-18 14:50:38 +08:00
James Rowe
bf6da61da5
Merge pull request #3850 from zhaowenlan1779/swkbd 
applets/swkbd: Software Keyboard Implementation
 2018-07-17 09:02:55 -06:00
zhupengfei
a9e922e68f service/fs: implement obsoleted Create/DeleteExtSaveData (#3948) 
* service/fs: implement obsoleted Create/DeleteExtSaveData

* service/fs: remove the STUBBED warning
 2018-07-17 17:59:42 +03:00
zhupengfei
b54e3b7aa9
frontend/applets/swkbd: use system username 2018-07-17 22:42:53 +08:00
zhupengfei
82aa45d9fa
citra_qt/configuration: log on config dialog close 2018-07-17 15:33:59 +08:00
zhupengfei
250cf584e3
citra_qt: Log settings on launch 2018-07-17 15:33:58 +08:00
zhupengfei
40aea8d6b8
citra_qt: use Citra Web Service username as default multiplayer nickname 2018-07-17 15:25:00 +08:00
zhupengfei
a398bceb93
citra_qt: disable hw shader by default for macos 
Also show an warning when turning it on.
 2018-07-17 10:07:02 +08:00
Merry
47d283a1e4
Merge pull request #3909 from MerryMage/rm-SetDevice 
sink_details: Tidy-up device listing code
 2018-07-12 20:49:29 +01:00
MerryMage
7d642b25e9 sink: Make auto device name a constant 2018-07-12 15:56:37 +01:00
NarcolepticK
c39daa3c01 service/dsp: Migrate to ServiceFramework (#3915) 
* service/dsp: Migrate to ServiceFramework

* service/dsp: Removed redundant buffer copy

* service/dsp: Addressed comment about pushing u32 instead of bool

* service/dsp: Fix clang format

* service/dsp: Addressed comment about minimizing global state

* service/dsp: Addressed comments and fixed log call issue

* service/dsp: Fix missed clang format
 2018-07-12 17:54:26 +03:00
Weiyi Wang
edcea90948
Merge pull request #3921 from B3n30/fixGetStartupArgument 
Fix parameter_size in APT::GetStartupArgument
 2018-07-11 11:41:04 +03:00
B3n30
208e789182 Fix error log 2018-07-11 09:00:05 +02:00
朱鹏飞
aaeba160a1 telemetry: Add a few fields of UserConfig (#3927) 
* telemetry: Add a few fields of UserConfig

* telemetry: change entry names a bit
 2018-07-11 09:51:02 +03:00
zhupengfei
dcaf4a8e83
citra_qt: Add length validation 2018-07-10 13:05:13 +08:00
zhupengfei
5407ed8b5e
citra_qt/applets/swkbd: QtKeyboard and misc fixes 
* Addressed comments and removed the applet interface

* swkbd: address @lioncash's comments

* core: more fixes

** Moved registered_swkbd to System

** Removed an usused virtual

** Removed functionality of DrawScreenKeyboard

** Removed src/core/settings.h change

* swkbd: address @lioncash's 2nd review

* swkbd: update logging macro

* QtKeyboard: Make dialog modal and hide help
 2018-07-10 12:49:55 +08:00
Steveice10
56488a969d am: Run clang-format and attribute TODOs. 2018-07-09 16:05:52 -07:00
wwylele
431fe444a9 gl_rasterizer: call glTextureBarrier when an image is bound to both texture and framebuffer 2018-07-09 23:11:29 +03:00
B3n30
468c689cf4 Set max parameter_size to 0x1000 2018-07-07 18:52:27 +02:00
B3n30
be1ae17c61 Fix parameter_size in GetStartupArgument 2018-07-07 18:38:38 +02:00
Weiyi Wang
c1580c406d
Merge pull request #3899 from wwylele/no-double-log 
citra_qt: only toggle console if the setting has been changed
 2018-07-07 18:47:35 +03:00
Weiyi Wang
7c7adc64fd
Merge pull request #3898 from wwylele/shut-up-texture5 
swrasterizer, gl_shader_gen: return 0.0 for Disabled texture unit 0
 2018-07-07 18:45:13 +03:00
Weiyi Wang
01c4f49e75
Merge pull request #3873 from wwylele/nwm-new-framework 
Service/NWM: convert to ServiceFramwework
 2018-07-07 18:44:31 +03:00
Steveice10
ba35079449 am: Revert changes to content index handling. 2018-07-06 17:15:30 -07:00
Steveice10
d67f119589 am: Address review comments. 2018-07-06 14:16:15 -07:00
Steveice10
680c6e694d am: Correct reported DLC content indices. 2018-07-06 11:00:57 -07:00
Steveice10
142c2b6cfe am: Correct content index bounds in ListDLCContentInfos. 2018-07-06 10:49:13 -07:00
Steveice10
c1ef7a753a am: Add contentIndex to documentation for GetTitleContentPath. 2018-07-06 10:47:50 -07:00
Steveice10
630a1311ca am: Properly handle operations involving content indices. 2018-07-06 00:44:22 -07:00
Steveice10
932eeefff0 am: Correct definition of ContentInfo. 2018-07-05 23:27:47 -07:00
wwylele
2927c88fd3 gl_rasterizer: implement mipmap for proctex 2018-07-06 01:13:02 +03:00
fearlessTobi
6eb7ee99cd Address last review comment 2018-07-03 21:14:00 +02:00
Weiyi Wang
fd5f71bcff
Merge pull request #3912 from BreadFish64/fix-conversion-warnings 
fix conversion warnings
 2018-07-03 21:14:01 +03:00
fearlessTobi
a780f3821e citra_qt: Add a volume slider 2018-07-03 17:26:50 +02:00
Weiyi Wang
9c1c899243
Merge pull request #3911 from BreadFish64/fix-setting-change-freeze 
citra-qt: optimize settings application
 2018-07-03 11:08:42 +03:00
Weiyi Wang
ca9603d1b1
Merge pull request #3908 from NarcolepticK/csnd-migrate-framework 
service/csnd: Migrate to ServiceFramework
 2018-07-03 10:37:07 +03:00
James Rowe
6a08167505
Merge pull request #3905 from valentinvanelslande/remove-return 
citra_qt: Remove return
 2018-07-02 20:12:55 -06:00
NarcolepticK
acefa81ae3 service/csnd: Addressed comments and removed outdated information 2018-07-02 22:09:29 -04:00
NarcolepticK
84c23ce2e5 service/csnd: Fix clang format 2018-07-02 22:09:29 -04:00
NarcolepticK
1f345642c4 service/csnd: Stubbed DataCache functions 2018-07-02 22:09:29 -04:00
NarcolepticK
41d5b31a76 service/csnd: Migrate to ServiceFramework 2018-07-02 22:09:29 -04:00
James Rowe
f36ff5b4c4
Merge pull request #3913 from BynariStar/patch-1 
citra_qt: Remove obsolete application attribute
 2018-07-02 19:52:00 -06:00
BreadFish64
5b181976ce fix conversion warnings 2018-07-02 18:45:45 -05:00
BynariStar
e80ae1a5d7
citra_qt: Remove obsolete application attribute 
As of Qt 5 Qt::AA_X11InitThreads no longer does anything.

See http://doc.qt.io/qt-5/qt.html
 2018-07-03 01:26:54 +03:00
BreadFish64
f649c443d9 optimize settings application 2018-07-02 16:53:34 -05:00
Weiyi Wang
a9f8887c93
remove trailing space 2018-07-02 19:47:41 +03:00
Weiyi Wang
4be2f12914
log/console: no need to test first call 
Just let `console_shown` be initialized to the default status (console isn't shown on startup)
 2018-07-02 19:39:13 +03:00
MerryMage
d269beab0d sink_details: Listing available devices should be separate from sink construction 2018-07-02 14:09:17 +01:00
MerryMage
ce5a5412ae sink_details: Remove unnecessary lambdas 2018-07-02 13:26:14 +01:00
MerryMage
05fc17b88a sink: Remove unnecessary SetDevice method 
Unused, doesn't do anything.
 2018-07-02 13:23:40 +01:00
NarcolepticK
d6f86caf30 service/cecd: Addressed comment about using PushEnum instead of Push<u32> 2018-07-01 12:54:53 -04:00
NarcolepticK
37532f8a76 service/cecd: Fixed clang format 2018-06-30 23:52:45 -04:00
NarcolepticK
363d6fdb89 service/cecd: Migrate to ServiceFramework 2018-06-30 23:38:54 -04:00
Valentin Vanelslande
77b338e928
citra_qt: Remove return 2018-06-30 21:50:30 -05:00
Valentin Vanelslande
b12942a231
gl_shader_gen: remove newline in logging macro 2018-06-30 19:15:15 -05:00
Valentin Vanelslande
5a60c85f58
citra_qt: add Restart to UI 2018-06-30 12:34:09 -05:00
Valentin Vanelslande
6380d52d1c
citra_qt: add Restart hotkey & menu action code 2018-06-30 12:30:56 -05:00
Valentin Vanelslande
fef231dc5b
gl_shader_manager: fix macro 2018-06-30 11:24:38 -05:00
Weiyi Wang
ffae5be1ea
Merge pull request #3895 from NarcolepticK/pm-migrate-framework 
service/pm: Migrate to ServiceFramework
 2018-06-30 13:20:31 +03:00
wwylele
810b86f451 citra_qt: only toggle console if the setting has been changed 2018-06-30 13:07:30 +03:00
wwylele
4d4b833a00 swrasterizer, gl_shader_gen: return 0.0 for Disabled texture unit 0 2018-06-30 11:36:39 +03:00
zhupengfei
f23443b921
applets/swkbd: Implement DefaultCitraKeyboard 2018-06-30 08:01:50 +08:00
zhupengfei
18664c719e
frontend/applets: misc fixes 
* Renamed applet to applets

* Added log classes Applet and Applet.SWKBD

* Fixes to get it compile
 2018-06-30 08:01:49 +08:00
James Rowe
caacefcc2e
frontend/applets: frontend swkbd base 
Original commits by @jroweboy:

* Rebase out the other commit

* changing branches

* More work on stuff and things ecks DEE

Changes by @zhaowenlan1779:

* Removed #include of result.h
 2018-06-30 08:01:31 +08:00
James Rowe
f9a89ff410
Merge pull request #3894 from wwylele/log-finalize 
Finalize logging system migration
 2018-06-29 17:46:07 -06:00
Valentin Vanelslande
7ffcf71d5d
Service/DLP: IsChild: Skip parameter 2018-06-29 13:40:03 -05:00
Valentin Vanelslande
482dc91dd6
Service/DLP: Fix IsChild 2018-06-29 13:03:16 -05:00
NarcolepticK
f72d114335 service/pm: Migrate to ServiceFramework 2018-06-29 10:31:56 -04:00
wwylele
0eab948728 reformat all files with clang-format 2018-06-29 16:56:12 +03:00
wwylele
7c5a76e58b log: replace all NGLOG with LOG 2018-06-29 14:18:07 +03:00
wwylele
fde415968e log: remove deprecated log macros 2018-06-29 14:02:29 +03:00
NarcolepticK
a1e56c1811 service/dlp: Addressed comment about what value to push 2018-06-29 04:27:37 -04:00
NarcolepticK
f5f5ac2197 service/dlp: Migrate to ServiceFramework 2018-06-29 04:24:38 -04:00
Weiyi Wang
fc8f997a28
Merge pull request #3874 from wwylele/ssl-new-framework 
service/SSL: convert to ServiceFramework
 2018-06-29 11:17:26 +03:00
NarcolepticK
db75b80e22 service/mvd: Migrate to ServiceFramework (#3890) 
* service/mvd: Migrate to ServiceFramework

* service/mvd: Silenced clang format
 2018-06-29 11:14:49 +03:00
NarcolepticK
3e42b361b1 service/qtm: Migrate to ServiceFramework (#3892) 
* service/qtm: Migrate to ServiceFramework

* service/qtm: Fix clang format
 2018-06-29 11:13:56 +03:00
NarcolepticK
9ae70e733f video-core: Migrate logging macros (#3878) 
* video-core: Migrate logging macros

* video-core: Fixed missed clang format

* video-core: Migrated LOG_GENERIC macro
 2018-06-29 00:13:30 +03:00
Weiyi Wang
3cf5c1a5b4
Merge pull request #3889 from zhaowenlan1779/camera-ui-fix 
citra_qt: Fix image file selection dialog
 2018-06-28 18:36:06 +03:00
Weiyi Wang
7d535140f6
Merge pull request #3885 from wwylele/fix-fs-log 
FS: fix log with incorrect type
 2018-06-28 18:06:56 +03:00
NarcolepticK
f96497abdb service/dsp: Migrate logging macros (#3863) 
* service/dsp: Migrate logging macros

* service/dsp: Fixed width count
 2018-06-28 18:05:45 +03:00
Weiyi Wang
1619b124b5
Merge pull request #3887 from NarcolepticK/gsp_lcd-migrate-framework 
service/gsp: Migrate gsp_lcd to ServiceFramework
 2018-06-28 18:04:04 +03:00
Weiyi Wang
80f6510355
Merge pull request #3851 from wwylele/shut-up-texture3 
gl_shader_gen: lower log level of using disabled proctex
 2018-06-28 18:03:05 +03:00
zhupengfei
0bd843f324
citra_qt: Fix image file selection dialog 2018-06-28 22:35:12 +08:00
NarcolepticK
d25cfbc4cc service/gsp: Addressed comment about global state 2018-06-27 11:05:38 -04:00
NarcolepticK
188979b3e2 service/gsp: Migrate gsp_lcd to ServiceFramework 2018-06-27 10:40:37 -04:00
wwylele
5150de8613 FS: fix log with incorrect type 2018-06-27 17:15:01 +03:00
NarcolepticK
b94cb61de8 service/gsp: Add Stub for InvalidateDataCache 2018-06-27 04:19:45 -04:00
NarcolepticK
c6554f1fbc service/gsp: Fixed typo in FlushDataCache IPC::RequestParser creation 2018-06-27 04:19:45 -04:00
NarcolepticK
c43f1ed088 service/gsp: Move service/gsp_lcd.* into service/gsp/ folder 2018-06-27 04:19:45 -04:00
James Rowe
5e641d16d0
Merge pull request #3834 from j-selby/fix-cpp-httplib 
Update cpp-httplib for gzip + chunked encoding fixes
 2018-06-26 09:57:08 -06:00
James Rowe
26254072e7
Merge pull request #3759 from degasus/TBO_upload 
Rewrite texture_buffer_object handling.
 2018-06-26 09:24:55 -06:00
Weiyi Wang
0a34054a16
Merge pull request #3880 from wwylele/title-fix 
citra_qt: only update title from game after ensuring loaded successfully
 2018-06-26 13:31:36 +03:00
wwylele
458a96bf90 citra_qt: only update title from game after ensuring loaded successfully 2018-06-24 17:30:43 +03:00
Weiyi Wang
689977bbf8
Merge pull request #3876 from NarcolepticK/kernel-migrate-logging 
hle/kernel: Migrate logging macros
 2018-06-24 01:34:22 +03:00
NarcolepticK
ed18140daa hle/kernel: Addressed comment about obscure formating 2018-06-23 14:12:54 -04:00
Weiyi Wang
fc62da57be
Merge pull request #3877 from tgsm/soc-logging-macro 
Service/SOC: migrate logging macro
 2018-06-23 12:24:53 +03:00
NarcolepticK
c2efd49997 service/ldr: Migrate logging macros (#3867) 
* service/ldr: Migrate logging macros

* service/ldr: Fix clang format

* service/ldr: Addressed comment about .c_str() equivalent .data()

* service/ldr: Fix clang format
 2018-06-23 12:24:05 +03:00
tgsm
15442352fd Service/SOC: migrate logging macro 2018-06-22 21:52:29 -04:00
NarcolepticK
d433a07b6b hle/kernel: Fix clang format 2018-06-22 19:20:58 -04:00
NarcolepticK
a8110cfd3f hle/kernel: Migrate logging macros 2018-06-22 18:54:50 -04:00
NarcolepticK
f831a08224 logging: Added NGLOG_GENERIC (needed for vm_manager) 2018-06-22 18:48:25 -04:00
wwylele
b06f468049 service/SSL: convert to ServiceFramework 2018-06-22 18:52:24 +03:00
Markus Wick
c4ff0ba137 renderer_opengl: Renumber all texture units. 
We spend lots of texture units for our texture buffers. As they are now feed from
one buffer, there is no need to have the big gap in the list of IDs.
 2018-06-22 17:21:28 +02:00
Markus Wick
46f18d6800 gl_shader_gen: Inline now constant texture buffer. 2018-06-22 17:20:55 +02:00
Markus Wick
0838c87dac gl_stream_buffer: Only flush the host buffer if anything was written. 
This might happen in the new TBO upload path.
 2018-06-22 17:20:55 +02:00
Markus Wick
831d4f9aeb gl_rasterizer: Use the shared texture buffer for the proctex lut. 2018-06-22 17:20:55 +02:00
Markus Wick
1ca6d2ea8d gl_rasterizer: Use the shared texture buffer for the noise, color and alpha map. 2018-06-22 17:20:55 +02:00
Markus Wick
63fb7dcc1b gl_rasterizer: Use the shared texture buffer for the fog lut. 2018-06-22 17:20:55 +02:00
Markus Wick
4679487640 gl_rasterizer: Use the shared texture buffer for the lighting lut. 2018-06-22 17:20:54 +02:00
Markus Wick
5a9cde138d gl_rasterizer: Add a new dirty flag for any lighting lut. 2018-06-22 17:17:48 +02:00
Markus Wick
a8396cdbed renderer_opengl: Create shared texture buffer. 2018-06-22 17:05:40 +02:00
Markus Wick
298ebe3752 gl_rasterizer: Inline texture buffer uploads. 2018-06-22 17:04:47 +02:00
Markus Wick
8a8c6f059f gl_rasterizer: Move TBO syncing helper to one function. 2018-06-22 17:04:47 +02:00
Markus Wick
10fba63b94 gl_rasterizer: Provide texture buffer offsets. 
This allows us to move all data into one TBO.
 2018-06-22 17:03:38 +02:00
Weiyi Wang
f50e505a5a
Merge pull request #3778 from wwylele/shadow-hw-image-load-store 
gl_rasterizer: implement shadow map 2D/Cube - Image load/store version
 2018-06-22 17:47:09 +03:00
Weiyi Wang
7b38bde95b
Merge pull request #3872 from NarcolepticK/applets-migrate-logging 
applets: Migrate logging macros
 2018-06-22 17:35:26 +03:00
wwylele
7471373058 Service/NWM: convert to ServiceFramwework 2018-06-22 17:14:23 +03:00
Weiyi Wang
64adf94ef2
Merge pull request #3871 from NarcolepticK/nwm-migrate-logging 
service/nwm: Migrate logging macros
 2018-06-22 16:21:34 +03:00
Weiyi Wang
ed8f69614d
Merge pull request #3870 from NarcolepticK/dlp-migrate-logging 
service/dlp: Migrate logging macro
 2018-06-22 15:27:39 +03:00
Weiyi Wang
e4b5b9daab
Merge pull request #3869 from NarcolepticK/news-migrate-logging 
service/news: Migrate logging macro
 2018-06-22 15:27:26 +03:00
Weiyi Wang
53ad300144
Merge pull request #3868 from NarcolepticK/ptm-migrate-logging 
service/ptm: Migrate logging macros
 2018-06-22 13:33:46 +03:00
NarcolepticK
a42287587e service/fs: Migrate logging macros (#3866) 
* service/fs: Migrate logging macros

* service/fs: Fix clang format
 2018-06-22 13:33:30 +03:00
Weiyi Wang
1449f8e725
Merge pull request #3865 from NarcolepticK/applet_manager-migrate-logging 
service/apt/applet_manager: Migrate logging macros
 2018-06-22 13:33:12 +03:00
Weiyi Wang
199710f346
Merge pull request #3864 from NarcolepticK/am-migrate-logging 
service/am: Migrate logging macros
 2018-06-22 13:33:00 +03:00
Weiyi Wang
ad4a943c7a
Merge pull request #3861 from NarcolepticK/y2r-migrate-logging 
service/y2r: Migrate logging macros
 2018-06-22 11:48:01 +03:00
Weiyi Wang
c3466f38d7
Merge pull request #3860 from NarcolepticK/service-migrate-logging 
service/service: Migrate logging macros
 2018-06-22 11:47:49 +03:00
Weiyi Wang
274859b8ef
Merge pull request #3859 from NarcolepticK/sm-migrate-logging 
service/sm: Migrate logging macros
 2018-06-22 11:47:34 +03:00
NarcolepticK
584e7d71e2 service/ns: Migrate logging macros (#3857) 
* service/ns: Migrate logging macros

* service/ns: Addressed comment about PRIx64

* service/ns: Missed 'x' in format when removing PRIx64
 2018-06-22 11:47:02 +03:00
NarcolepticK
2d94c25265 service/cfg: Migrate logging macros (#3853) 
* service/cfg: Migrate logging macros

* service/cfg: Fix clang format

* service/cfg: Addressed comment about char cast

* service/cfg: Changed to static_cast<char>
 2018-06-22 11:46:22 +03:00
NarcolepticK
958d39a76f applets: Migrate logging macros 2018-06-22 04:24:54 -04:00
NarcolepticK
42b32ac1ea service/nwm: Migrate logging macros 2018-06-22 04:16:38 -04:00
NarcolepticK
3b712321b4 service/dlp: Migrate logging macro 2018-06-22 03:57:23 -04:00
NarcolepticK
bd368d6921 service/news: Migrate logging macro 2018-06-22 03:55:18 -04:00
NarcolepticK
db256c69a4 service/ptm: Migrate logging macros 2018-06-22 03:47:18 -04:00
NarcolepticK
428ae40728 service/apt/applet_manager: Migrate logging macros 2018-06-21 22:43:27 -04:00
NarcolepticK
ccfa92a14f service/am: Migrate logging macros 2018-06-21 22:34:26 -04:00
NarcolepticK
4c67f1c7c6 service/nim: Migrate logging macros (#3856) 2018-06-21 12:20:10 +03:00
NarcolepticK
4666d0c958 service/nfc: Migrate logging macros (#3855) 2018-06-21 12:19:44 +03:00
NarcolepticK
394b626e51 service/mic: Migrate logging macros (#3854) 2018-06-21 12:19:10 +03:00
NarcolepticK
a955385ec0 service/gsp: Migrate logging macros (#3852) 
* service/gsp: Migrate logging macros

* service/gsp: Fix clang format
 2018-06-21 12:16:10 +03:00
NarcolepticK
831e3a0b54 service/err_f: Migrate logging macros (#3849) 
* service/err_f: Migrate logging macros

* service/err_f: Added static_cast<u32>
 2018-06-21 12:14:59 +03:00
NarcolepticK
0525b27b19 service/y2r: Fix clang format 2018-06-21 01:28:47 -04:00
NarcolepticK
9bd4fb2f53 service/y2r: Migrate logging macros 2018-06-21 01:14:27 -04:00
NarcolepticK
fcf42bbe8a service/service: Migrate logging macros 2018-06-21 00:37:06 -04:00
NarcolepticK
b10d2badd0 service/sm: Migrate logging macros 2018-06-20 23:59:58 -04:00
wwylele
2f9b7bdfa9 gl_shader_gen: lower log level of using disabled proctex 2018-06-20 18:34:01 +03:00
NarcolepticK
964602dfcb service/cam: Migrate logging macros (#3848) 
* service/cam: Migrate logging macros

* service/cam: Fix clang format

* service/cam: Missed one clang format fixup
 2018-06-20 13:39:05 +03:00
Weiyi Wang
b2cbf2403f
Merge pull request #3820 from daniellimws/core-macros-1 
core: Replace logging macros
 2018-06-20 13:36:48 +03:00
Weiyi Wang
3938e6c592
Merge pull request #3847 from NarcolepticK/ir-migrate-logging 
service/ir: Migrate logging macros
 2018-06-20 13:34:52 +03:00
Weiyi Wang
2d98b2e77a
Merge pull request #3845 from NarcolepticK/hid-migrate-logging 
service/hid: Migrate logging macros
 2018-06-20 13:34:41 +03:00
Weiyi Wang
9ef9e6c48e
Merge pull request #3844 from NarcolepticK/frd-migrate-logging 
service/frd: Migrate logging macros
 2018-06-20 13:34:32 +03:00
Weiyi Wang
0ed4d575f4
Merge pull request #3843 from NarcolepticK/csnd-migrate-logging 
service/csnd_snd: Migrate logging macros
 2018-06-20 13:34:15 +03:00
NarcolepticK
8c08678606 service/ir: Migrate logging macros 2018-06-20 01:09:50 -04:00
James Rowe
fa5d247b43
Merge pull request #3846 from zhaowenlan1779/clang 
service/ac: fix clang format
 2018-06-19 19:44:23 -06:00
zhupengfei
7b4738ad33
service/ac: fix clang format 2018-06-20 09:42:39 +08:00
zhupengfei
fa80ba9846
citra-qt: Improve Title Bar display 2018-06-20 09:30:29 +08:00
zhupengfei
ddc97b15f4 common: Parse Nightly/Canary build version 2018-06-20 09:30:26 +08:00
NarcolepticK
ad70214dbf service/hid: Migrate logging macros 2018-06-19 19:52:03 -04:00
NarcolepticK
705eb597c8 service/frd: Migrate logging macros 2018-06-19 19:46:12 -04:00
NarcolepticK
a7a3718fce service/csnd_snd: Migrate logging macros 2018-06-19 19:30:59 -04:00
NarcolepticK
c9737ff16c service/cecd: Migrate logging macros 2018-06-19 15:07:17 -04:00
James Rowe
e27bb6394d
Merge pull request #3837 from zhaowenlan1779/aboutdialog-builddate 
citra-qt: Add build date in about dialog
 2018-06-19 11:57:40 -06:00
NarcolepticK
f410974644 AC Migrate Logging Macros (#3838) 
* service/ac: Migrate logging macros

* service/ac: Added 0x on hex

* service/ac: Changed lowercase x to uppercase X
 2018-06-19 11:54:59 -06:00
zhupengfei
6c4f3257b7
citra-qt: Add build date in about dialog 2018-06-18 21:21:00 +08:00
James Rowe
574824a26c
Merge pull request #3632 from N00byKing/3dtv_botenable 
Add Support for Stereoscopic 3D
 2018-06-17 21:05:15 -06:00
James Rowe
c39dee1569
Merge pull request #3617 from BreadFish64/multiple-game-dirs 
QT: Add support for multiple game directories
 2018-06-17 21:04:24 -06:00
N00byKing
74367203cf emu_window: Adapt Touchscreen to 3D Settings 2018-06-17 14:00:47 +02:00
James
d184a3a1ee Update cpp-httplib for gzip + chunked encoding fixes 2018-06-14 16:00:07 +10:00
Daniel Lim Wee Soong
f0ea96f144
Merge branch 'master' into core-macros-1 2018-06-11 22:30:21 +08:00
James Rowe
cf9bfe0690
Merge pull request #3787 from wwylele/shader-jit-state 
shader/jit: preserve integer & condition register across invocation
 2018-06-09 18:38:05 -06:00
James Rowe
2dac1a9590
Merge pull request #3788 from wwylele/shader-jit-breakc 
shader/jit: implement breakc
 2018-06-09 18:36:46 -06:00
James Rowe
6811eda2b9
Merge pull request #3764 from zhaowenlan1779/camera-flip 
camera: camera refinement
 2018-06-09 14:02:50 -06:00
James Rowe
a5cf5b56bd
Merge pull request #3826 from Steveice10/master 
boss: Return buff_size in parameter 2 of ReceiveProperty.
 2018-06-09 13:34:03 -06:00
James Rowe
ad81bca8dd
Merge pull request #3819 from zhaowenlan1779/game-list-refix 
game_list: fix system title display
 2018-06-09 13:32:28 -06:00
Daniel Lim Wee Soong
4d2cbf271c Fix wrongly replaced arguments 2018-06-09 16:35:37 +08:00
Steveice10
e24fb768e3 boss: Return buff_size in parameter 2 of ReceiveProperty. 2018-06-08 18:12:35 -07:00
Daniel Lim Wee Soong
ac4d85ca16 core/telemetry_session: Replace logging macros 2018-06-07 23:07:33 +08:00
Daniel Lim Wee Soong
e633d744eb core/memory: Replace logging macros 2018-06-07 23:07:15 +08:00
Daniel Lim Wee Soong
2865d23064 core/frontend: Replace logging macros 2018-06-07 23:07:02 +08:00
Daniel Lim Wee Soong
d81cacfb9e core/file_sys: Replace logging macros 2018-06-07 23:06:44 +08:00
Daniel Lim Wee Soong
bef6c6d174 core/core_timing: Replace logging macros 2018-06-07 23:06:26 +08:00
Daniel Lim Wee Soong
f407917eb7 core/core: Replace logging macros 2018-06-07 23:06:03 +08:00
zhupengfei
cb52033133
game_list: fix system title display 2018-06-07 18:50:35 +08:00
zhupengfei
3c554153c7
StillImageCamera: fix multiple prompt 2018-06-07 14:57:07 +08:00
zhupengfei
a15e4e80c6
QtMultimediaCamera: fix invalid settings 2018-06-07 14:57:07 +08:00
zhupengfei
7c48160beb
StillImageCamera: move GetFilePath to UI thread 2018-06-07 14:57:06 +08:00
zhupengfei
341c07156a
camera: Single/Double (QtMultimediaCamera) 2018-06-07 14:57:05 +08:00
zhupengfei
3cb91338e9
camera: migrate logging macros 2018-06-07 14:57:05 +08:00
zhupengfei
6e410dcef5
camera: refactor (add qt_camera_base) 2018-06-07 14:57:04 +08:00
zhupengfei
5ebd466869
camera: Add camera flip config 2018-06-07 14:57:03 +08:00
MerryMage
b8c5007153 arm_dyncom_interpreter: Clear exclusive memory state after SVC call 2018-06-03 21:06:57 +01:00
wwylele
b611b2934f UDS: fix RecvBeaconBroadcastData response header 2018-06-02 00:38:54 +03:00
N00byKing
523c52c708 renderer_opengl: Add Universal 3D Layout Adaption 2018-06-01 18:24:26 +02:00
jmorriz124
8c0ede544f 3dtv botenable improved (#1) 
* Fixed crash when right eye isn't available

* Enabled swap screens in stereo views.  Fixed window alignment in stereo
views to handle all screen aspect ratios.

* Minor code cleanup and clang fomat updates.

* Minor cleanup of swapped and aspect ratio code
 2018-06-01 17:05:29 +02:00
N00byKing
d27312b816 shared_page: Remove Get3DSliderstate 2018-06-01 17:05:29 +02:00
N00byKing
594e95084b shared_page: Set 3D Slider 2018-06-01 17:05:09 +02:00
N00byKing
f4894d5677 shared_page: Allow Setting the 3D Slider 
Currently, changing the Option while the Game is running does not work
 2018-06-01 17:05:02 +02:00
N00byKing
2814bbc3da renderer_opengl: Allow usage of Stereoscopic 3D 2018-06-01 17:01:06 +02:00
N00byKing
e4788130e5 citra, citra_qt, settings.h: Add Options for Stereoscopic 3D 2018-06-01 17:01:00 +02:00
wwylele
781912e854 gl_rasterize: implement shadow mapping using image load/store 2018-06-01 14:26:44 +03:00
Weiyi Wang
08b119153d
Merge pull request #3799 from wwylele/sigh 
gl_rasterizer: reset texture state context after every draw
 2018-06-01 14:24:28 +03:00
wwylele
9060e08e49 shader/jit: implement breakc 2018-06-01 13:04:39 +03:00
wwylele
f0ee4c0595 gl_rasterizer: reset texture state context after every draw 2018-06-01 12:05:30 +03:00
James Rowe
7715fd2c19
Merge pull request #3750 from wwylele/cube-watcher-fix 
gl_rasterizer_cache: add missing watcher invalidation
 2018-05-31 23:11:39 -06:00
James Rowe
f7f5a54bc3
Merge pull request #3751 from wwylele/shader-warning-shutup 
gl_shader_gen: rearrange function definition to avoid suprious warnings
 2018-05-31 23:10:42 -06:00
James Rowe
87d2866127
Merge pull request #3757 from zhaowenlan1779/game-list-fix 
citra_qt: Improve Game List Item display
 2018-05-31 23:10:02 -06:00
James Rowe
489d5a3da9
Merge pull request #3769 from Kloen/dark-theme-updates 
citra-qt: Update Dark theme to latest version
 2018-05-31 22:45:54 -06:00
James Rowe
174241ff90
Merge pull request #3800 from liushuyu/master 
citra: correct regex for matching nickname
 2018-05-31 22:14:39 -06:00
James Rowe
04a9145dfc
Merge pull request #3776 from darkf/cubeb-sink2 
Implement a Cubeb audio sink
 2018-05-31 22:13:12 -06:00
darkf
04139e26bd cubeb_sink: Skip devices without a name 
Previously this would crash.
 2018-05-31 21:01:48 -05:00
darkf
ce6d9e2e28 externals: Don't build cubeb with tests 2018-05-31 21:01:48 -05:00
darkf
35c43aa293 audio_core: Only include cubeb if it's available 2018-05-31 21:01:48 -05:00
darkf
af73dd45f0 audio_core: Implement a cubeb audio sink 2018-05-31 21:01:48 -05:00
liushuyu
c0f352bc4e
citra: correct regex for matching nickname 2018-05-31 19:38:12 -06:00
James Rowe
72f9142bb1
Merge pull request #3746 from wwylele/ndm-new-framework 
Service/NDM: convert to ServiceFramework
 2018-05-29 23:54:21 -06:00
James Rowe
e63c374ff0
Merge pull request #3714 from wwylele/primitive-restart-guard 
video_core/command_processor: correctly handles 0xFFFF index as a normal index
 2018-05-29 23:22:00 -06:00
James Rowe
aa95604928
Merge pull request #3652 from N00byKing/3dtv_crashfix 
gsp_gpu, shared_page: Change 3D LED State on SetLedForceOff
 2018-05-29 22:43:52 -06:00
Valentin Vanelslande
90bcb26c3b citra_qt: Add Continue/Pause & Toggle Speed Limit hotkeys 2018-05-28 16:36:56 -05:00
Markus Wick
caba02d42a gl_rasterizer: Don't flip the texture bindings. 
The state object isn't used anywhere else, so there
is no need to revert the state.
And the comment is just wrong: It doesn't matter
which textures are bound on framebuffer binding, it
only matters at draw time. And we reset all bindings
before the draw call. So let's use gl_state as it is
designed to avoid flipping states.
 2018-05-28 21:04:59 +02:00
wwylele
874cb42e70 shader/jit: preserve integer & condition register across invocation 2018-05-28 14:41:47 +03:00
wwylele
549abe556b Service/NDM: convert to ServiceFramework 2018-05-28 11:28:13 +03:00
BreadFish64
30c6c37d6c fix jrowes lazy sorting 2018-05-26 15:38:06 -05:00
BreadFish64
31a9fdb00b fix preffered game 2018-05-26 15:38:06 -05:00
BreadFish64
1a57f9488f citra_qt: support multiple game directories 2018-05-26 15:38:06 -05:00
Nico Bosshard
88ebd844e5 Add search filter support for multiple game directories 2018-05-26 15:38:05 -05:00
Weiyi Wang
09982c3386
Merge pull request #3732 from ccawley2011/fix-arm 
Fix compilation on ARM
 2018-05-26 20:14:55 +03:00
zhupengfei
9504aa19d5
game_list: rewrite format 2018-05-26 22:27:59 +08:00
Weiyi Wang
ba4a0525bf
Merge pull request #3724 from degasus/scissor 
gl_rasterizer: Remove redundant scissor state change.
 2018-05-25 20:35:41 +03:00
Logan B
b5934237fa
Fix build 2018-05-25 20:28:15 +12:00
zhupengfei
e5c8b9f0a2
game_list: append filename after program ID 2018-05-23 21:36:10 +08:00
Kloen
15e2be85b5 citra-qt: Change link colors to a more readable one when using the dark theme 2018-05-23 02:51:19 +02:00
James
29551c187a Add missing std::string import in text_formatter 2018-05-19 21:31:09 +10:00
zhupengfei
3b18faa163
citra_qt: Improve Game List Item display 2018-05-19 17:21:26 +08:00
Christoph
3bf924cd20 Camera translation (#3747) 
* citra_qt: correct spelling in configuration

* citra_qt/camera: Changed the order of the translation

The translation may not correspond to "couln't load" and "the camera", so create two cases which can get translated individually.
Also add a space after "the camera".

* citra_qt/camera: use the same syntax for the filter in "still_image_camera.cpp" as in "configure_camera.cpp"

* citra_qt/camera: the config should only get added if it's not empty
 2018-05-19 12:03:06 +03:00
wwylele
92a1252835 gl_shader_gen: rearrange function definition to avoid suprious warnings 2018-05-19 00:36:33 +03:00