Henrik Rydgård
de10c1c1c6
Temporarily remove the VSync setting from the Mac menu (it's not quite working right)
2023-04-28 14:58:05 +02:00
Henrik Rydgård
26758f7934
Set CFBundleExecutable in Info.plist without path
2023-04-28 14:58:05 +02:00
Serena
f87bfda8d3
fix open in folder on macOS, avoid spawning the open command to open URLs ( #17342 )
...
* fix open in folder on macOS, avoid spawning the open command to open URLs
* fix indent
* goober alert
* no more goober
* fix compiler failing on linux
2023-04-27 13:32:41 +00:00
Henrik Rydgård
1ba4ca3a09
Assorted Mac menu localization fixes
2023-04-27 13:38:28 +02:00
Henrik Rydgård
13c857210e
Address feedback
2023-04-26 10:39:33 +02:00
Henrik Rydgård
eeaeb8b7cc
Add "Open Memory Stick" to File menu on Mac
2023-04-26 10:18:04 +02:00
Henrik Rydgård
0f107e102e
SDL: Enable precise (smooth touchpad) scrolling.
...
Made possible by #17329
2023-04-25 18:56:48 +02:00
Henrik Rydgård
6332e61e26
Fix Gold filenames, more gold prep for mac
2023-04-25 18:17:01 +02:00
Henrik Rydgård
108c8cd26a
Remove hardened requirement on the development code signing
...
When we do real releases, we override this signing anyway.
2023-04-25 16:34:00 +02:00
Henrik Rydgård
b125040944
git-version hack
2023-04-25 11:45:25 +02:00
Henrik Rydgård
dc6c30a825
rpath work
2023-04-25 11:45:25 +02:00
Henrik Rydgård
5d028cb004
Upgrade SDL for Mac
...
This removes the option to use system SDL, which seems like a trap.
Also simplifies the macbundle.sh script accordingly.
Buildfix
Buildfix fix
Moar buildfix
2023-04-25 11:45:20 +02:00
Henrik Rydgård
a040985af0
macOS: Add new macOS directory, and an Entitlements.plist file. Part of notarization work.
2023-04-24 10:51:35 +02:00
Serena
0830eb51fc
Native 'About' panel
2023-04-23 22:12:15 +03:00
Serena
bd3ae4b074
Escape string stuff, com -> org
2023-04-23 15:54:01 +03:00
Serena
a71ec1acdf
Recognize openable types in Info.plist, debug menu in top bar
2023-04-22 18:11:06 +03:00
Henrik Rydgård
d782a49229
Enable building a gold version for mac.
2023-04-19 15:06:02 +02:00
haoruiwang
7cbb7a09e5
[what][style][gpu] some coding style refine
2023-04-18 19:18:38 +08:00
ahmedmoselhi
b3c8274a80
fix build error: duplicate case value: 'SDL_SYSWM_X11' and 'WINDOWSYSTEM_DISPLAY' both equal '2'
2023-04-11 16:17:12 +02:00
Henrik Rydgård
0b6e877ac0
MacOS buildfix
2023-04-07 10:56:50 +02:00
Henrik Rydgård
019a9e2923
MacOS build fixes
2023-04-07 10:35:01 +02:00
Henrik Rydgård
38f4cc4cc9
Make reverse mapping lookup work for the simple PSP buttons.
2023-03-31 11:05:29 +02:00
Henrik Rydgård
177a6821ee
Merge branch 'serena/macos-bar-menu-items'
2023-03-28 21:54:14 +02:00
Serena
67896bf885
Switch to boot
2023-03-28 21:44:12 +03:00
Henrik Rydgård
c578b91779
Make clipboard copies threadsafe. Don't forget to reset update flag
2023-03-28 16:11:18 +02:00
Henrik Rydgård
8c7ae8836f
SDL: Save/load window dimensions
2023-03-28 16:05:33 +02:00
Henrik Rydgård
0b156e734b
Pass w and h into the SDL graphics contexts
2023-03-28 16:05:33 +02:00
Henrik Rydgård
57362b9199
SDL: Save window position
2023-03-28 16:05:30 +02:00
Henrik Rydgård
3ff87f5959
SDL: Small refactor, support window title changes
2023-03-28 16:05:30 +02:00
Henrik Rydgård
a5fdf3d05b
Add samplerate argument to NativeMix
2023-03-24 14:48:53 +01:00
Serena
ea4e294faa
fix openSystemFileBrowser
2023-03-23 23:28:57 +03:00
Serena
84849d9d32
fixes
2023-03-23 22:09:01 +03:00
Serena
645407fa74
Merge branch 'master' into serena/macos-bar-menu-items
2023-03-23 21:27:42 +03:00
Henrik Rydgård
b440e28e38
Remove System_SendMessage!
...
iOS, Qt buildfixes
2023-03-22 23:52:51 +01:00
Henrik Rydgård
4c99712b60
And "immersive", "audio_resetDevice"
2023-03-22 23:52:38 +01:00
Henrik Rydgård
5a55fd5fd3
And replace "graphics_restart", "toggle_fullscreen", etc
2023-03-22 23:52:15 +01:00
Henrik Rydgård
410b35fba3
Get rid of "finish" and "setclipboardtext" messages, replace with requests.
2023-03-22 22:17:26 +01:00
Henrik Rydgård
dfa06c4e77
SDL buildfix, fix file/folder browsers on Darwin
2023-03-22 19:25:35 +01:00
Henrik Rydgård
b7350f3cbf
Fix folder browser on Android and Windows
2023-03-22 19:25:35 +01:00
Henrik Rydgård
70f0ac04af
Port the file browser spawned by the Load button to the new request stuff
2023-03-22 15:36:14 +01:00
Henrik Rydgård
de064e210e
Replace the inputbox queue with a more generic RequestManager.
2023-03-22 12:41:11 +01:00
Henrik Rydgård
06fcc9ccd7
Add System_Notify
2023-03-21 13:37:16 +01:00
Henrik Rydgård
d3955b42bb
Rename some system functions, merge the Launch* ones.
...
android launchurl buildfix
2023-03-21 12:22:59 +01:00
Henrik Rydgård
a9eaa4fdc8
Get rid of an ifdef
2023-03-21 10:24:36 +01:00
Henrik Rydgård
3b39e9e068
Turn the VFS into a class, to be able to reuse it for other purposes.
2023-03-06 16:42:47 +01:00
Henrik Rydgård
3aa0a9e17b
Fix blackscreen, better debug print of display parameters
2023-02-27 15:21:58 +01:00
Henrik Rydgård
8b431b39ba
Wrap the display globals in a struct ( #16998 )
...
* Wrap the display globals in a struct
Makes it easier to search/replace these, for future refactorings.
* Some renaming
* Qt buildfix, also fix the Qt build on Mac (got broken with battery changes)
* Attempt at buildfixing ios
* UWP buildfix
2023-02-25 13:09:44 +01:00
Serena
6b0cec2ae0
i forgot this
2023-02-14 19:11:44 +03:00
Serena
c64aa9d19a
address concerns
2023-02-14 19:11:32 +03:00
ZiHan Huang
2865310bca
vulkan: Add the function realization of arm device to kms vulkan
...
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com>
2023-02-07 14:23:55 +08:00
Serena
070194ef92
fix on other platforms
2023-02-06 22:34:27 +03:00
Serena
6d474ac59d
macOS bar button items
2023-02-06 22:17:27 +03:00
Henrik Rydgård
ce40744cdd
Merge pull request #16874 from SerenaKit/serena/darwin-browse-button
...
Browse button on Darwin platforms, rename some classes/functions
2023-02-01 17:21:53 +01:00
Serena
482e989cd7
convert to System_SendMessage insanity
2023-02-01 19:03:12 +03:00
Henrik Rydgård
c8dce81ff0
Merge pull request #16156 from hrydgard/opengl-thread-refactor
...
OpenGL threading refactor
2023-01-31 11:14:01 +01:00
Henrik Rydgård
b97749d623
Assorted initialization cleanup and similar, found by valgrind and warnings
2023-01-30 18:31:49 +01:00
Henrik Rydgård
cb16f193ec
Fix the problem. Still need to leave the loop with SDL even if we supply a swap function.
2023-01-30 15:45:05 +01:00
Henrik Rydgård
b62572a78f
Refactor the framedata/GPU thread management.
2023-01-30 11:49:31 +01:00
Henrik Rydgård
ece6edfe83
SDL audio: Let's try 256 for fmt.samples. See issue #12705
2023-01-17 11:45:35 +01:00
Henrik Rydgård
7fcd8a254f
Merge pull request #16506 from xuzhen/master
...
Fix the Qt/SDL window icon path
2022-12-09 11:56:35 +01:00
iota97
d5d0e2c920
Fix SDL fullscreen
2022-12-09 09:28:28 +01:00
Xu Zhen
abb4aa92f1
Fix window icon path
2022-12-06 23:17:35 +08:00
Henrik Rydgård
4af4b0dddc
Merge pull request #16255 from catsout/fix-gl-wayalnd
...
SDL: fix glew on wayland by ignore glx
2022-10-18 15:42:08 +02:00
catsout
83fccd0835
SDL: fix glew on wayland by ignore glx
...
glXGetProcAddress works on wayland if linking with x11.
As long as we don't use glx related funcs,
no_glx_error can be ignored.
SDL should handle the no_glx_error brefore glewInit.
Glew is only used to init gl funcs.
related:
https://github.com/nigels-com/glew/issues/172
2022-10-18 20:49:27 +08:00
catsout
b0ceeede79
Vulkan: fix wayland swapchain size 1x1
...
From Vulkan spec,
surfaceCapabilities.currentExtent can be 0xFFFFFFFF(-1)
Define a callback to get drawsize from window creator
relate:
https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkSurfaceCapabilitiesKHR.html
https://github.com/KhronosGroup/Vulkan-Docs/issues/590#issuecomment-347932321
2022-10-15 19:02:42 +08:00
Henrik Rydgård
b0cf97cf4d
Touchpad/mousewheel scrolling acted very weirdly on Mac due to 0 deltas. Make it work better.
...
Ignoring the 0 deltas helps a lot for the feel, even though it still isn't that smooth feel yet.
2022-10-11 14:00:46 +02:00
Henrik Rydgård
6f703128ec
Experimentally revert "Delete some misguided FPU control code, that we definitely don't want"
...
This reverts commit d52d383c22
.
2022-10-10 18:35:29 +02:00
Henrik Rydgård
d52d383c22
Delete some misguided FPU control code, that we definitely don't want
2022-10-10 10:46:51 +02:00
Henrik Rydgård
242efba6f7
Remove splitSubmit setting. Now we submit init commands before the acquire.
2022-09-17 01:07:30 +02:00
fp64
5b6a14edeb
Add a newline to "Leaving main" message.
...
Also implement SYSPROP_DISPLAY_XRES/SYSPROP_DISPLAY_YRES for SDL.
Also fix couple of warnings.
2022-08-16 18:29:14 -04:00
Henrik Rydgård
a831cab14c
Remove unmotivated check preventing texture ini creation on mobile. ( #15647 )
...
* Remove unmotivated check preventing texture ini creation on mobile.
Fixes #15644
* Show a "toast" message on platforms that don't support opening a text editor, when you try to create/open a texture ini file.
* Avoid the need to ifdef around calls to SystemToast
* UWP buildfix (and some warning fixes).
And possibly libretro fix
* Rename for a bit more consistency
2022-07-10 22:34:44 +02:00
Unknown W. Brackets
536c050943
Core: Track names of connected pad devices.
...
Rather than just that it's a pad. This tries to get the identifier if
possible.
2022-07-04 19:14:04 -07:00
Unknown W. Brackets
3edf6ab0fa
Config: Don't save --fullscreen unless changed.
...
This makes --fullscreen and --windowed temporary by using a separate
setting. If the setting is changed explicitly, it begins saving it again.
2022-05-28 15:47:12 -07:00
Henrik Rydgård
0eea0acf13
Merge pull request #15468 from unknownbrackets/switch-merge
...
Cleanup Switch ignoring of Vulkan
2022-04-08 14:48:04 +02:00
Unknown W. Brackets
170441313c
Net: Ignore SIGPIPE errors on POSIX systems.
...
This should work on BSD/macOS/Linux/iOS/similar.
2022-04-03 06:57:45 -07:00
Unknown W. Brackets
b71f17586e
Switch: Avoid loading Vulkan.
2022-04-02 16:34:13 -07:00
Unknown W. Brackets
2479d52202
Global: Reduce includes of common headers.
...
In many places, string, map, or Common.h were included but not needed.
2022-01-30 16:35:33 -08:00
Cameron Cawley
26203552b4
Use System_GetPropertyInt to report the keyboard layout
2022-01-10 00:11:08 +00:00
Unknown W. Brackets
7e578b31f5
Build: Remove old-style android/assets/.
...
We now read everything directly from assets/, so there's no need for
outdated duplicates.
Also cleanup some outdated files/instructions.
2021-12-11 09:01:15 -08:00
Unknown W. Brackets
f8e50b1dc7
SDL: Respect inflight frames setting in GL.
2021-11-27 06:57:26 -08:00
vit9696
1066224b6f
SDL: Read assets from Resources on macOS like on iOS
...
closes #15041
2021-11-06 09:22:08 +03:00
Unknown W. Brackets
690c6b6765
macOS: Correct open memstick with space.
2021-10-19 21:26:37 -07:00
Unknown W. Brackets
8d29aa6590
Windows: Switch to preferred file selection method.
...
It seems like the previous may not support long paths.
2021-10-19 10:01:27 -07:00
Unknown W. Brackets
08a55d19d5
macOS: Allow opening game folder.
2021-10-19 10:01:27 -07:00
vit9696
82249ce9a7
Update SDL and try faster commit history fetch
2021-09-17 00:33:11 +03:00
vit9696
e1cb1c9a67
Switch to submodules and fix release version generation
2021-09-16 10:40:39 +03:00
vit9696
5fc7344271
Drop bundled SDL2 for macOS
2021-09-16 10:17:59 +03:00
vit9696
14c2231500
Add FAT support for macOS with automatic GitHub releases
...
closes #11799
closes #13708
closes #14815
2021-09-13 02:01:22 +03:00
Yifan Gu
633a6f612b
Refactor and unify analog input settings
2021-07-05 12:38:46 +02:00
Unknown W. Brackets
af3d699d5e
SDL: Ignore commas in joystick names.
...
Otherwise default mapping will break and parse wrong.
2021-05-21 09:13:15 -07:00
Henrik Rydgård
f4a6d291e1
Common: Capitalize setCurrentThreadName().
2021-04-30 23:02:36 -07:00
Henrik Rydgård
6a3856674c
SDL: Fix use after free on shutdown
2021-03-11 23:13:57 +01:00
Unknown W. Brackets
13ec384dbe
Build: Explicitly include ppsspp_config.h.
...
This adds it to all files that use it. Not all our builds include the
file.
2021-03-02 21:04:03 -08:00
Henrik Rydgård
bd7b283399
Add iOS version detection, turn off JIT on bootup if >= 14.3.
2021-02-22 09:16:51 +01:00
Unknown W. Brackets
8f452fee23
SDL: Init profiler on SDL/Qt.
2021-02-18 22:59:56 -08:00
Henrik Rydgård
6d0315eaf9
Fix copy/paste typo causing crash getting tempdirs if an env var had no value
2021-01-10 20:33:17 +01:00
Unknown W. Brackets
eee529c6c9
UI: Cleanup Windows header in MainScreen.cpp.
...
Better to have this come from System, probably. It's mainly for Windows
anyway, to alert people their save data isn't permanent.
2021-01-09 14:45:49 -08:00
Henrik Rydgård
1c753e4a22
Use hacky methods to retrieve SD card directory if available.
...
This will disappear in future Android versions but can be useful for
older devices.
Fixes (or at least tries to) #10199 , at least for some devices.
Might help #13827 ?
Tested on Pocophone F1.
2021-01-07 00:55:35 +01:00
Henrik Rydgård
f0ea814107
Merge pull request #13515 from dos1/touch
...
SDL: Implement multitouch support
2020-10-06 20:47:11 +02:00
Henrik Rydgård
44a93f98ed
SDL: Apply patch from issue #13516 , fixing issue with Wacom tablets with readonly flags set.
2020-10-06 16:58:32 +02:00
Sebastian Krzyszkowiak
99d0df0784
SDL: Implement multitouch support
...
Pass proper touch events instead of merely emulating a mouse. Also,
disable SDL's built-in mouse emulation (added in SDL 2.0.10).
Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
2020-10-06 04:51:36 +02:00
Henrik Rydgård
0e3a84b4a8
Move most GPU things to Common.
...
It works after the move, on Windows and Android at least.
Deletes the D3DX9 shader compiler loader, which was not used.
2020-10-04 23:39:02 +02:00
Henrik Rydgård
4f43cff5ca
Move fileutil, net, image loaders, ui to Common. ( #13506 )
...
* Move and rename file_util/fd_util to Common/File/FileUtil and DirListing
Let's also move net while we're at it.
Move the ZIM/PNG loaders over to Common.
Move the UI framework into Common
iOS buildfix
* Buildfix
* Buildfixes
* Apple buildfix
* This typo again..
* UWP buildfix
* Fix build of PPSSPPQt, such as it is (it's not in good condition...)
* Guess what? Another buildfix.
2020-10-04 20:48:47 +02:00
Henrik Rydgård
f01ba6dc84
Move NativeApp.h to Common/System, split into NativeApp.h and System.h
...
Buildfix
2020-10-04 11:42:16 +02:00
Henrik Rydgård
b7edf75437
Move Display.cpp/h to Common.
2020-10-04 11:42:16 +02:00
Henrik Rydgård
9e41fafd0d
Move math and some file and data conversion files out from native to Common.
...
Buildfixing
Move some file util files
Buildfix
Move KeyMap.cpp/h to Core where they belong better.
libretro buildfix attempt
Move ini_file
More buildfixes
2020-10-04 09:12:46 +02:00
Henrik Rydgård
ff8148dd92
Move native/util, native/data and native/i18 to Common/Data.
...
Also move colorutil.cpp/h
linking build fix experiment
Delete a bunch of unused CMakeLists.txt files
CMakeLists.txt linking fix
Don't include NativeApp.h from any headers.
Android.mk buildfix
Half of the UWP fix
Buildfix
Minor project file cleanup
Buildfixes
Guess what? More buildfixes!
2020-10-04 07:28:29 +02:00
Henrik Rydgård
342ed97291
Move input utilities from native to Common/Input.
2020-10-01 09:42:32 +02:00
Henrik Rydgård
15382d5f94
Move threading utils from native to Common
2020-10-01 09:27:25 +02:00
Henrik Rydgård
0d3a5a27aa
Merge pull request #13485 from unknownbrackets/minor
...
Adjust locale parsing for Ubuntu and fix memory assert
2020-09-27 23:31:26 +02:00
Unknown W. Brackets
ab953603d8
SDL: Adjust locale parsing for Ubuntu.
...
Technically, the format of this value is unspecified, but we are just
trying to guess the user's locale.
See #13042 .
2020-09-27 12:55:02 -07:00
Henrik Rydgård
054acf768c
Don't cache time in a variable.
...
A little weirdness in the code that has stuck around for a long, long
time. It's really not necessary and mostly just confusing.
2020-09-24 23:52:43 +02:00
Henrik Rydgård
5d64fc5ff1
Switch to PPSSPP's assert functions (don't use the system's)
2020-08-16 10:01:10 +02:00
Henrik Rydgård
ccc0331279
Move timeutil to Common. (Experiment to see how much work it is to move these).
2020-08-15 20:53:08 +02:00
Henrik Rydgård
80e0f85332
Getting really close to getting rid of base/logging.h now.
...
Qt buildfix
2020-08-15 19:09:01 +02:00
Henrik Rydgård
b22083e7a6
Even more base/logging.h removal and fixes
2020-08-15 19:09:01 +02:00
Henrik Rydgård
c41f875df4
Remove base/logging.h in a whole lot more places.
2020-08-15 19:09:00 +02:00
Henrik Rydgård
14532847c7
Fix some minor issues found by address-sanitizer on Linux
2020-08-11 22:28:36 +02:00
Henrik Rydgård
6560192d8e
Support full VSync control in SDL OpenGL.
...
(Not yet Qt).
Forgot about iOS
SDL headless buildfix
Additional iOS buildfix
2020-07-19 12:07:16 +02:00
Henrik Rydgård
49d9caeb0d
SDL: Avoid destroying the surface on resize.
2020-07-18 20:40:20 +02:00
Henrik Rydgård
697c3b8b36
Cleanup log output on swapchain/surface recreation.
2020-07-18 20:35:39 +02:00
Henrik Rydgård
3691cc990f
Merge pull request #13052 from hrydgard/sdl-resize-fixes
...
Partly clean up SDL resize code, should help #11974
2020-06-24 01:36:38 +02:00
Henrik Rydgård
f9cef5b6b2
Partly clean up SDL resize code, should help #11974
2020-06-24 01:06:01 +02:00
Henrik Rydgård
7180c2a4c2
Enable Vulkan validation in SDL debug builds
2020-06-23 21:57:02 +02:00
Henrik Rydgård
8b98047502
Finish the Linux part of this change
2020-06-22 00:54:51 +02:00
Henrik Rydgård
3d743a5ae7
Buildfixes
2020-06-22 00:01:31 +02:00
Henrik Rydgård
6532c345c8
Simplify the validation interface code, bugfixes
2020-06-21 23:04:51 +02:00
Unknown W. Brackets
b46bf8e4e7
SDL: Try to continue if EGL init fails.
...
Probably we should just stop using EGL on SDL2, but I'm not sure if
that's making things work for some users. But if EGL init fails, try
to avoid a segfault and skip EGL.
Should help #12474 .
2020-05-23 16:26:47 -07:00
Henrik Rydgård
2b605f1370
Merge pull request #11876 from AreaScout/master
...
Fix: touchscreen evens on upcomming SDL2 versions which includes the …
2020-05-17 18:35:39 +02:00
Henrik Rydgård
3f74ffbdf5
Reduce the SDL audio buffer size, 2048 is a bit excessive. Port the changes to the Qt SDL code.
2020-05-17 11:50:34 +02:00
Henrik Rydgård
06c22497b7
SDL: If we get an audio device with a different freq than 44100, that's actually OK.
2020-05-17 10:21:02 +02:00
Henrik Rydgård
b6a051dd49
Fix comment
2020-05-16 19:47:12 +02:00
Henrik Rydgård
caf8e5496d
SDL: Show the actually used sample rate in system info.
...
Right now it'll always be the requested 44100 though anyway.
2020-05-16 17:46:21 +02:00
Florin9doi
bc948b9b94
iOS/macOS : set bundle version
2020-05-01 21:36:55 +03:00
AreaScout
e673d74646
Fix: touchscreen evens on upcomming SDL2 versions which includes the same functionality but inside the library
2020-04-27 10:31:21 +00:00
Unknown W. Brackets
fd0bf21215
Windows: Prevent applying -1 as inset space.
2020-04-05 17:06:36 -07:00
M4xw
fe32ad88fb
Core: Add some libnx calls for Switch.
2020-03-15 07:56:38 -07:00
Henrik Rydgård
875d53a485
Merge pull request #12612 from iota97/sdl-mouse
...
SDL analog mouse input
2020-03-05 17:23:08 +01:00
iota97
80effb6b68
Let's wait 5 frames
2020-03-05 16:36:26 +01:00
iota97
b8ce079829
Fix wheel up/down and additional mouse button
2020-03-05 15:57:45 +01:00
Unknown W. Brackets
cb1b7b1e43
Core: Bring over some file related Switch changes.
...
Reducing the distance from the Switch port code.
2020-03-03 22:53:03 -08:00
iota97
b0307301e3
Better smoothing and added missing break on MOUSE_WHEEL
2020-03-03 17:17:58 +01:00
iota97
fc1b83fd93
Fixes
2020-02-04 09:54:01 +01:00
iota97
3248d58c4d
Switch mode only if needed
2020-02-04 07:47:02 +01:00
iota97
4b28482479
SDL analog mouse input
2020-02-04 05:11:07 +01:00
李通洲
55bb58e13e
NativeApp: add System_GetPropertyFloat all the places
2020-02-04 09:20:34 +08:00
Florin9doi
c824fabd53
Update macOS system name
2020-01-25 16:54:45 +02:00
Henrik Rydgård
1d6d66ac43
Merge pull request #12582 from Florin9doi/sdl_app_icon
...
SDL app icon
2020-01-24 15:27:10 +01:00
李通洲
a34d35d705
Add support for iOS ( completely untested )
2020-01-20 14:43:08 +08:00
李通洲
7cd60549dd
Initial support for vulkan on macOS ( MoltenVK )
2020-01-20 14:42:40 +08:00