ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,381 Commits 104 Branches 28 Tags 172 MiB
Commit Graph

2797 Commits

Author SHA1 Message Date
Connor McLaughlin 6bf37f51be Android: Add controller interface class 2020-12-29 22:49:52 +10:00
Connor McLaughlin 0945744f9b FrontendCommon: Add DInput controller interface 
Still needs force feedback/vibration support.
 2020-12-29 22:49:52 +10:00
Connor McLaughlin a3e4c61a0b CommonHostInterface: Add a method to get top-level window handle 2020-12-29 22:49:52 +10:00
Connor McLaughlin a894b295b6 CPU/CodeCache: Fix assertion failure when patching in double branch 2020-12-29 22:49:52 +10:00
Connor McLaughlin b38e4b8ba7
Merge pull request #1341 from ggrtk/hostdisplay-fixes 
HostDisplay: Fix some scaling issues
 2020-12-29 22:49:29 +10:00
Connor McLaughlin 6f22d5c151
Merge pull request #1333 from andercard0/patch-55 
Atualização Português do Brasil
 2020-12-29 22:48:25 +10:00
Connor McLaughlin 4fdedf5f14
Merge pull request #1340 from zkdpower/master 
Update Simple-Chinese language file to latest
 2020-12-29 22:48:12 +10:00
Albert Liu 1c1ca45e4e VulkanHostDisplay: Fix post shader uniform buffer 2020-12-29 01:33:41 -08:00
Albert Liu 11fbf26045 HostDisplay: Use floats internally for draw rectangle calculation 2020-12-29 01:33:41 -08:00
Albert Liu e0f3a4f17b HostDisplay: Calculate draw rectangle in terms of horizontal scale 2020-12-29 01:33:40 -08:00
Albert Liu b824844043 HostDisplay: Fix framebuffer screenshot scaling 2020-12-29 01:33:40 -08:00
zkdpower 489169c8ce
Update Simple-Chinese language file to latest 
Update Simple-Chinese language file to latest
 2020-12-29 09:41:10 +08:00
Anderson_Cardoso acaa13aba0
Atualização Português do Brasil 2020-12-28 15:19:57 -03:00
Connor McLaughlin a48add94f8
Merge pull request #1332 from ggrtk/ps2-bios-size 
Update BIOS image handling
 2020-12-29 02:19:13 +10:00
Connor McLaughlin fa7442fddb Qt: Fix mouse-cursor-in-fullscreen regression 2020-12-29 02:00:31 +10:00
Connor McLaughlin fcec112613
Merge pull request #1329 from RaydenX93/master 
Italian Translation Update - PC
 2020-12-28 11:56:49 +10:00
Albert Liu d9096ca12d BIOS: Prevent patching incompatible BIOSes 2020-12-27 16:14:28 -08:00
Albert Liu 0e2276fc7a BIOS: Add support for loading PS2 BIOSes 2020-12-27 15:32:41 -08:00
Albert Liu 4db29f9399 HostInterface: Check all console regions when looking for any BIOS 2020-12-27 15:32:41 -08:00
RaydenX93 7f57d678bd Update duckstation-qt_it.ts 2020-12-27 17:52:44 +01:00
PugsyMAME 90073ac1d0
Cheat Manager Memory Scanner improvements 
Updated Memory Scanner to use sized hexadecimal in results and manual watches.
Enforced Halfword,Word address settings so that it's a valid word or halfword that is being watched.
 2020-12-27 16:12:10 +00:00
Connor McLaughlin f9ac25f2b8 CDROM: Actually fix playing tracks 10+ 2020-12-28 01:40:38 +10:00
Connor McLaughlin c04d6f9ef8 CDROM: Play command track should be BCD 
Fixes tracks >= 10 in BIOS CD player, maybe games?
 2020-12-28 01:17:41 +10:00
Connor McLaughlin 8bb5ff47eb PlaystationMouse: Add option to use relative mode 2020-12-28 00:37:04 +10:00
Connor McLaughlin ca42d027ac Qt: Implement relative mouse mode 2020-12-28 00:37:04 +10:00
Connor McLaughlin 114d4a2c1d
Merge pull request #1325 from PugsyMAME/master 
Fixed Pattern found address in Debugger Search
 2020-12-28 00:36:45 +10:00
Connor McLaughlin 157532b0fe
Merge pull request #1320 from andercard0/patch-54 
Atualização Português do Brasil
 2020-12-28 00:36:20 +10:00
PugsyMAME 67f6bd2bcb
Fixed Pattern found address in Debugger Search 
"Pattern found at 0x%1" was passing a decimal value to %1 instead of a hexadecimal one
 2020-12-27 11:20:26 +00:00
Albert Liu d7e8b5a4c2 Qt: Update Japanese translation by mikakunin 2020-12-27 00:57:55 -08:00
Albert Liu 46239e3d09 Qt/CheatManagerDialog: Fix lupdate warning 2020-12-27 00:57:55 -08:00
Albert Liu 2a1bf9925a Qt: Make Auto (Game Native) aspect ratio string translatable 2020-12-27 00:57:55 -08:00
Anderson_Cardoso ab2198be28
Atualização Português do Brasil 2020-12-26 14:01:24 -03:00
Connor McLaughlin f181b45760 libretro: Build fix 2020-12-27 02:41:43 +10:00
Connor McLaughlin 80fb30b564 Qt: Add Boot and Debug option to context menu 2020-12-27 00:54:53 +10:00
Connor McLaughlin 29469077ee Qt: Force display to render after boot 
Fixes menu showing through when starting paused.
 2020-12-27 00:54:53 +10:00
Connor McLaughlin cbcbb675d6 System: Fix pause on start 2020-12-27 00:54:53 +10:00
Connor McLaughlin 3cd3d1c09d Qt: Fix opening debugger when system already paused 2020-12-27 00:54:53 +10:00
Connor McLaughlin dc46d52029 FrontendCommon: Remove unnecessary #ifndef LIBRETRO macros 
These were only needed because of ancient compilers on the libretro
buildbot, it still compiles fine with these fields on the latest
compilers.
 2020-12-27 00:54:53 +10:00
Connor McLaughlin 702ed21207 HostDisplay: Add threaded presentation for Vulkan renderer 
Can add a significant speedup for fast forward. Automatically disabled
when vsync is enabled.
 2020-12-27 00:54:53 +10:00
Connor McLaughlin 68dc052432 Bus: Don't leak shared memory when starting->stopping->starting 2020-12-27 00:50:08 +10:00
Connor McLaughlin 91995c92db Qt/Debugger: Use Bus helper functions for getting region pointers 2020-12-27 00:50:08 +10:00
Connor McLaughlin d74d27163c Common/MemoryArena: Add destroy/valid methods 2020-12-27 00:50:08 +10:00
Connor McLaughlin e71f6aa80a GPU/HW: Improve round-trip accuracy of RGBA5551->RGBA8 
Fixes smudging in some games with true colour rendering enabled.
 2020-12-27 00:50:08 +10:00
Connor McLaughlin 84181e2a1d CheatS: Support importing/parsing EPSXe cheat files 2020-12-27 00:45:34 +10:00
Connor McLaughlin cc9c3ea41f Cheats: Fix assertions tripping on unicode characters 2020-12-27 00:45:34 +10:00
Connor McLaughlin aa65280ec3 Qt: Fix typo in advanced settings 2020-12-27 00:45:34 +10:00
Connor McLaughlin 7532d5d09a
Merge pull request #1306 from andercard0/patch-52 
Atualização Português do Brasil
 2020-12-27 00:45:04 +10:00
Connor McLaughlin 9c36c9dbdb
Merge pull request #1312 from ggrtk/memorycardimage-fix 
MemoryCardImage: Fix multi-block file reads
 2020-12-27 00:44:41 +10:00
PugsyMAME 31423ef697
Changed debugger "Enter memory address" to accept hex only (#1317) 
* Changed debugger "Enter memory address" to accept hex only

The "Enter memory address" prompt by default expects a decimal address unless it's preceded by 0x. Or it expects an number starting with 0 is an octal.
The disassembly address should be hexadecimal regardless as that is how it it displays the address.
Also changed it so that it changes any address entered to be divisible by 4 as there was an observed issue that would cause the disassembly addresses to get locked to a address that was not divisible by 4

* Translation updates for Debugger memory address change

Updated the three translation files that mentioned the original "Invalid address. It should be in hex" string.

* Changed debugger "Enter memory address" to accept hex only

UPDATE TO PR #1316
The "Enter memory address" prompt by default expects a decimal address unless it's preceded by 0x. Or it expects an number starting with 0 is an octal.
The disassembly address should be hexadecimal regardless as that is how it it displays the address.
Also changed it so that it changes any breakpoint or disassembly address entered to be divisible by 4 as there was an observed issue that would cause the disassembly addresses to get locked to a address that was not divisible by 4 and a breakpoint address that is not divisible by 4 would never be hit.
 2020-12-27 00:43:43 +10:00
Albert Liu 12bc7a7805 MemoryCardImage: Fix multi-block file reads 2020-12-25 20:01:21 -08:00
Anderson_Cardoso bc9da28f31
Atualização Português do Brasil 2020-12-25 15:20:29 -03:00
Connor McLaughlin a69474ea97 TextureReplacements: Use x86 dispatch for xxhash 2020-12-26 00:47:24 +10:00
Connor McLaughlin af3b2b0e15 Build: Fix xxhash on non-Windows 2020-12-26 00:47:24 +10:00
Connor McLaughlin b755798c2a Qt: Update French translation 2020-12-26 00:47:03 +10:00
Connor McLaughlin d187c8b08d GPU/HW: Fix a potential case where depth isn't cleared on viewport change 2020-12-26 00:47:03 +10:00
Connor McLaughlin a385573672 Qt: Add texture replacement options to advanced settings 2020-12-26 00:47:03 +10:00
Connor McLaughlin 41b803ed2b FrontendCommon: Add a hotkey to reload texture replacements 2020-12-26 00:47:03 +10:00
Connor McLaughlin 8db961042a GPU: Support replacing VRAM writes with new textures 2020-12-26 00:47:03 +10:00
Connor McLaughlin a66f14b5c3 Vulkan/Texture: Add UpdateFromBuffer method 2020-12-26 00:47:03 +10:00
Connor McLaughlin ebaad0f35a Common/GL: Add replace method to texture 2020-12-26 00:47:03 +10:00
Connor McLaughlin ecbfff3c60 HostDisplay: Fix incorrect extension check for other formats 2020-12-26 00:47:03 +10:00
Connor McLaughlin f6c0156eea Common/Image: Add save helpers, fix errors 2020-12-26 00:47:03 +10:00
Connor McLaughlin 6de53054c1 Qt: Move blit swap chain option to display settings 2020-12-26 00:47:02 +10:00
Michael Forney 4bca193ee1 FileSystem: Include <limits.h> for PATH_MAX 2020-12-26 00:47:02 +10:00
Michael Forney 7a40a843d4 Common/FileSystem: Fix misspelling of 'separator' 2020-12-26 00:47:02 +10:00
Michael Forney d0398c8a83 Common/FileSystem: Fix canonicalization of paths beginning with `./` 
If we don't skip past the following separator when the destination
is empty, then `./file` gets canonicalized as `/file`.

Also, consider the case where we end up with an empty string (for
example, from `foo/..`). Canonicalize this as `.`.
 2020-12-26 00:47:02 +10:00
Michael Forney 64c0ca14a3 System: Fix some bugs in GetTitleForPath 
The previous implementation had a few issues in certain edge cases:
- If the path contained no '/' or '\', then the string_view constructor
  is called with a count that exceeds the length of the string
  (effectively `title_end - (char *)0`, which is undefined behavior,
  at least in C).
- If the only '/' was the filesystem root, the last character of
  the title was truncated, and the '/' remained. For example,
  "/title.bin" resulted in "/titl".
- At least in C, it is undefined behavior to use the the < operator
  with a null pointer, which is done in std::max if the path did
  not have both '/' and '\'.

The first issue results in a std::bad_alloc exception on my machine.
 2020-12-26 00:47:02 +10:00
Connor McLaughlin 3f410ebbac Cheats: Add additional code types from @PugsyMAME 2020-12-26 00:47:02 +10:00
Jean-Baptiste Boric 7dcacc2cda Qt: Implement GDB server 2020-12-26 00:47:02 +10:00
Jean-Baptiste Boric abd2399aaf Core: Implement GDB protocol 2020-12-26 00:47:02 +10:00
Jean-Baptiste Boric 9b40c8ffa6 Settings: Add GDB server settings 2020-12-26 00:47:02 +10:00
Jean-Baptiste Boric 9bd28f39a5 StringUtil: Add base support and hexadecimal functions 2020-12-26 00:47:02 +10:00
Connor McLaughlin fd39f09aa7 scmversion: Second part of beta -> preview 2020-12-25 13:58:50 +10:00
PugsyMAME c0cc0a371b Fixed Slide Code cheat type 
Address increment is a u8 and value increment is a u16. The changes will make this work correctly:-

50000AA4 FFFF
801CC760 0400
which is a example slide code representing:-
801CC760 0400
801CC804 03FF
801CC8A8 03FE
801CC94C 03FD
801CC9F0 03FC
801CCA94 03FB
801CCB38 03FA
801CCBDC 03F9
801CCC80 03F8
801CCD24 03F7
 2020-12-25 13:53:28 +10:00
Connor McLaughlin add6754381 libretro: Remove guncon/mouse/negcon controller types 
These were never supported. Use the standalone version if you want to
use these controller types.
 2020-12-25 13:53:28 +10:00
Connor McLaughlin 7f6fbd6b80
Merge pull request #1289 from andercard0/patch-51 
Atualização Português do Brasil
 2020-12-25 13:51:02 +10:00
Connor McLaughlin 8fcb3d6690
Merge pull request #1297 from zkdpower/master 
Update Simple-Chinese language file to latest
 2020-12-25 13:50:51 +10:00
Albert Liu f63291b8ec CMake: Fix missing translation files 2020-12-24 12:01:33 -08:00
zkdpower 3f22f55338
Update Simple-Chinese language file to latest 
Update Simple-Chinese language file to latest
 2020-12-24 13:05:50 +08:00
Anderson_Cardoso 33fdbe48a5
Atualização Português do Brasil 
Update Pt-Br to the latest.
 2020-12-22 16:51:05 -03:00
Connor McLaughlin 095bc280cb Qt: Fix default value of PGXP depth buffer 2020-12-23 02:26:47 +10:00
Connor McLaughlin ee5ba8d90a
Merge pull request #1284 from zkdpower/master 
Update Simple-Chinese language file to latest
 2020-12-23 01:44:35 +10:00
Connor McLaughlin 4f9a5d0241
Merge pull request #1285 from CookiePLMonster/memcard-slashes-fix 
Memory Card Editor fixes
 2020-12-23 01:44:13 +10:00
zkdpower ce4e9f4f17
Update Simple-Chinese language file to latest 
Update Simple-Chinese language file to latest
 2020-12-22 23:41:05 +08:00
Silent 51eb494340
Memcard Editor: Fix relative shared paths not opening in Memcard Editor by default 2020-12-22 16:39:59 +01:00
Connor McLaughlin 744cfbd924 Frontends: Add PGXP Depth Buffer options 2020-12-23 01:39:49 +10:00
Connor McLaughlin d320d5c830 GameSettings: Add game settings/hotkey for PGXP depth 2020-12-23 01:39:49 +10:00
Connor McLaughlin aa1543271e GPU: Support emulating a depth buffer from PGXP depth values 2020-12-23 01:39:49 +10:00
Connor McLaughlin 9384f3a8e9 Qt/CheatManager: Fix checking groups not updating child nodes 2020-12-23 01:34:32 +10:00
Silent bb528fb15c
Fix inconsistent forward/backward slashes in Memcard Editor 
Memcard Editor looks for an exact string match, so slashes must be
consistent.
 2020-12-22 16:14:22 +01:00
Anderson_Cardoso 19980426fb
Atualização Português do Brasil 
Update language Pt-Br to latest.
 2020-12-21 14:53:52 -03:00
Connor McLaughlin ca84925ff8 HostDisplay: Support screenshotting 16-bit display formats 2020-12-22 03:24:51 +10:00
Albert Liu 189656cbc4 CommonHostInterface: Fully clear controller section before loading profile 2020-12-22 03:24:51 +10:00
Albert Liu a5f04f2a8e CommonHostInterface: Don't save/load input profile rumble for motorless controller types 2020-12-22 03:24:51 +10:00
Connor McLaughlin 7249825c16 Qt: Support multiple updater channels 2020-12-22 03:24:51 +10:00
Connor McLaughlin 14c227a813 scmversion: Fix incorrect tagging after stable/beta split 2020-12-22 03:24:19 +10:00
Connor McLaughlin b24245dd1d GameList: Bump cache list version 
Required due to aspect ratio change.
 2020-12-22 02:16:11 +10:00
Connor McLaughlin d5d9cb623d GPU/Vulkan: Fix possible framebuffer destroy-while-in-use 2020-12-22 00:56:55 +10:00
Connor McLaughlin c0d8e44548
Merge pull request #1263 from andercard0/patch-48 
Atualização Português do Brasil
 2020-12-22 00:53:36 +10:00
Connor McLaughlin 22c15f88dd
Merge pull request #1262 from zkdpower/master 
Update Simple-Chinese language file to latest
 2020-12-22 00:53:19 +10:00
Connor McLaughlin 68557eb843
Merge pull request #1266 from Margen67/ar 
Use proper 21:9 aspect ratio, add 32:9
 2020-12-22 00:52:36 +10:00
shikulja e3c9b75c1a update ru translation 2020-12-21 15:17:05 +03:00
Margen67 b7534015e0 Use proper 21:9 aspect ratio, add 32:9 2020-12-20 19:57:15 -08:00
Anderson_Cardoso 2a1e8047fe
Atualização Português do Brasil 2020-12-19 10:29:39 -03:00
zkdpower 3b9a9a6308
Update Simple-Chinese language file to latest 
Update Simple-Chinese language file to latest
 2020-12-19 17:39:38 +08:00
Connor McLaughlin 6224d0ab89 Qt: Fix crash when switching to cheat list 
Regression from 076a2ca307.
 2020-12-19 19:09:34 +10:00
Connor McLaughlin 44ea51306a Qt: Add open button to memory card editor 2020-12-19 17:02:02 +10:00
Connor McLaughlin 175bc66c91 Qt: Fix some mouse presses at high click rate not registering 2020-12-19 17:02:02 +10:00
Connor McLaughlin 81aad196e8 HostInterface: Add -nocontroller CLI option to disable controller interface 
Can use with buggy drivers where SDL is causing crashes.
 2020-12-19 17:02:01 +10:00
Connor McLaughlin e804fdfdba GPU: Use floating point coordinates for lightgun 2020-12-19 17:02:01 +10:00
Connor McLaughlin 4860313bef NamcoGuncon: Add an option to scale X coordinates 
Fixes what appears to be curvature correction at the edges of the
screen.
 2020-12-19 17:02:01 +10:00
Connor McLaughlin fad3d79895 NamcoGuncon: Add button to shoot offscreen 2020-12-19 17:02:01 +10:00
Connor McLaughlin faa016eaee
Merge pull request #1255 from zkdpower/master 
Update Simple-Chinese language file to latest
 2020-12-19 17:01:44 +10:00
Connor McLaughlin 076a2ca307 Qt/CheatManager: Default to unsigned/hex/halfword 2020-12-19 02:44:46 +10:00
Connor McLaughlin ca61f989fc DMA: Don't panic on invalid device read/write 2020-12-19 02:44:46 +10:00
Connor McLaughlin 7c7145d1c5 MDEC: Handle invalid commands 
Fixes panic in Formula 1.
 2020-12-19 02:44:46 +10:00
Connor McLaughlin 980aa0a8bc Qt/CheatManager: Add manual watch address 2020-12-19 02:44:46 +10:00
Connor McLaughlin a6a0b660d2 GameList: Bump cache version 
This should've happened with the aspect ratio changes.
 2020-12-19 02:44:46 +10:00
zkdpower 9b20f1ffd9
Update Simple-Chinese language file to latest 
Update Simple-Chinese language file to latest
 2020-12-18 16:26:08 +08:00
Connor McLaughlin 9e1987063d System: Add a libcrypt game list, and check serials 
Nag the user if they're missing a sbi file.
 2020-12-18 03:03:22 +10:00
Connor McLaughlin 627008f34c CDImage: Add helper for checking for SBI 2020-12-18 03:03:22 +10:00
Connor McLaughlin 4232ef7bf3 CDImageCue: Try for a file based on the cue filename if bin missing 
Should work around people who have renamed the files but not updated the
cuesheet.
 2020-12-18 03:03:22 +10:00
Connor McLaughlin b3edcc5841 CDROM: Don't reset audio decoder state on file/channel change 
Star Wars Jedi Power Battles sends constant Setfilter commands, while
playing.
 2020-12-18 03:03:21 +10:00
Connor McLaughlin d2c98639a8 Cheats: Add extension 32-bit instructions variants 2020-12-18 03:03:21 +10:00
Anderson_Cardoso feb009ce39
Atualização Português do Brasil 
Updated translation latest.
 2020-12-17 11:38:19 -03:00
Connor McLaughlin 681fccd5e6 Qt: Fix compilation on Qt <5.11 2020-12-17 13:05:17 +10:00
Connor McLaughlin 4b4b97540e Qt: Fix Linux build (again) 2020-12-17 12:54:36 +10:00
Connor McLaughlin 6fdb7fa801 Qt: Fix Linux build 2020-12-17 12:38:32 +10:00
Connor McLaughlin c1f802c397 Qt: Fix OSD messages not rendering in Japanese translation 2020-12-17 12:15:37 +10:00
Connor McLaughlin ea996a0305 Qt: Add debugger UI 2020-12-17 12:15:37 +10:00
Connor McLaughlin 3b23542ec9 CPU: Provide debugger/breakpoint/step functionality 2020-12-17 11:57:47 +10:00
Connor McLaughlin a8af0f7ecb HostInterface: Add debugger message callbacks 2020-12-17 11:57:47 +10:00
Connor McLaughlin fa0f177e51 HostInterface: Move PauseSystem from common to base 2020-12-17 11:57:47 +10:00
Connor McLaughlin e044858953 CPU: Add additional instruction decoder helpers 2020-12-17 11:57:46 +10:00
Connor McLaughlin 9fd1d606d7 Bus: Add memory region access helpers 2020-12-17 11:57:46 +10:00
Connor McLaughlin 6b10a1089c
Merge pull request #1240 from ggrtk/qt-japanese 
Qt: Add Japanese translation by mikakunin
 2020-12-17 11:37:19 +10:00
Connor McLaughlin a4b6df3e7d
Merge pull request #1239 from ggrtk/analog-controller 
AnalogController: Fix config mode 0x4C response
 2020-12-17 11:36:58 +10:00
Connor McLaughlin 9d7b63923a
Merge pull request #1235 from valadaa48/CRTCTicksToSystemTicks_optimization 
Small optimization to GPU::SystemTicksToCRTCTicks
 2020-12-17 11:36:21 +10:00
Connor McLaughlin bd8613b120
Merge pull request #1227 from ggrtk/auto-aspect-ratio 
GPU: Add auto aspect ratio and various fixes
 2020-12-17 11:35:48 +10:00
Albert Liu 4f26150ef1 Qt: Add Japanese translation by mikakunin 2020-12-16 16:11:49 -08:00
Albert Liu b7bccac71d AnalogController: Fix config mode 0x4C response 2020-12-16 15:11:53 -08:00
Connor McLaughlin 30472b853d Qt: Compile fix 2020-12-17 01:26:07 +10:00
Connor McLaughlin 47f0720b93 Controller: Always preserve internal state when loading/resuming 
Fixes analog mode getting disabled when loading state.
 2020-12-17 01:20:06 +10:00
Connor McLaughlin b78a6045fc Qt: Make some async method invokes explicitly queued 2020-12-17 01:20:06 +10:00
Connor McLaughlin 7b6d30a994 GPU/HW: Fix possible VRAM corruption when live switching resolutions 
Mask bit was getting lost based on guest state.
 2020-12-17 01:20:06 +10:00
shikulja cc5df71af9
update ru translation (#1216) 
* update ru translation

added some new lines, fixed small typos

* Update duckstation-qt_ru.ts
 2020-12-17 01:04:35 +10:00
Albert Liu de8f03bd75 GPU: Add auto (game native) aspect ratio 2020-12-16 02:40:33 -08:00
valadaa48 f5f12fd76d Small optimization to GPU::SystemTicksToCRTCTicks 2020-12-15 22:31:34 -05:00
Albert Liu b4fb1e20d8 Settings: Remove unused variables 2020-12-14 19:28:59 -08:00
Albert Liu 2c76ad204a GPU: Fix operator warning 2020-12-14 19:28:59 -08:00