mirrors/yuzu
2
1
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-07-04 23:31:19 +01:00
Code Issues Releases Activity
23320 commits 2 branches 0 tags 150 MiB
Commit graph

20541 commits

Author SHA1 Message Date
Mai
f3b532d091
Merge pull request #9739 from liamwhite/old-gcc-fix 
kernel: fix compilation with older gcc
 2023-02-07 22:10:35 -05:00
Behunin
8551ac6008 Remove OnCommandListEndCommand 
Call rasterizer->ReleaseFences() directly
 2023-02-07 17:21:17 -07:00
Liam
2415d37ea2 kernel/svc: switch to generated wrappers 2023-02-06 23:57:44 -05:00
liamwhite
1f3e8d633a
Merge pull request #4949 from Morph1984/hidpi-temp-fix 
main: Enable High DPI fixes for Qt >= 5.14
 2023-02-06 23:20:49 -05:00
bunnei
ecbf74b87a
Merge pull request #9644 from SaiKai/volume_quicksetting 
add volume quicksetting with volume slider
 2023-02-06 17:10:44 -08:00
Liam
82c2a3da9f kernel: fix compilation with older gcc 2023-02-06 13:14:27 -05:00
Matías Locatti
69eaad18a5
Update yuzu_cmd's default_ini.h 
Rename FSR, add missing resolution multipliers, and SMAA
 2023-02-06 06:01:51 -03:00
Kelebek1
8ae2a664d2 Remove fake vertex bindings when dynamic state is enabled 2023-02-05 22:28:03 +00:00
Liam
92eb091ddb kernel/svc: Split implementations into separate files 2023-02-04 22:37:43 -05:00
bunnei
a64fc3ee77
Merge pull request #9720 from SoRadGaming/discordPresenceUpdate 
Game Image with Discord RPC
 2023-02-04 18:37:21 -08:00
Sorab
923c17f1ae Add Game Icon for Discord RPC 
Connected to Yuzu Compatibility Page
 2023-02-05 12:40:57 +11:00
liamwhite
f5ed51bdf3
Merge pull request #9730 from german77/cmd_arg 
yuzu_cmd: Order arguments alphabetically and port arguments from Qt
 2023-02-04 15:01:17 -05:00
liamwhite
236b54376d
Merge pull request #9729 from german77/sdl_input 
yuzu_cmd: Fix touch and controller input
 2023-02-04 15:01:07 -05:00
german77
3cd0b816cc yuzu_cmd: Order arguments alphabetically and port arguments from Qt 2023-02-04 11:33:29 -06:00
german77
ebca59b8e9 yuzu_cmd: Fix mismatching controller input 2023-02-04 11:05:57 -06:00
german77
424643f9af yuzu_cmd: Fix touch input 2023-02-04 10:31:12 -06:00
ameerj
4678f53463 shader_recompiler/value.h: Remove lingering references to S32 2023-02-04 00:13:47 -05:00
bunnei
5aca9386cf
Merge pull request #9717 from german77/less_is_better 
input_common: Simplify stick from button
 2023-02-03 16:09:29 -08:00
Jonas Gutenschwager
2a491f7aaa
remove disambiguation argument from mute text 
Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com>
 2023-02-04 00:00:20 +01:00
ameerj
979e4d9950 fsp_srv: Copy HLE Read Buffer for OutputAccessLogToSdCard 2023-02-03 00:12:16 -05:00
ameerj
2d2522693e Revert "Merge pull request #9718 from yuzu-emu/revert-9508-hle-ipc-buffer-span" 
This reverts commit 25fc5c0e11, reversing
changes made to af20e25081.
 2023-02-03 00:08:45 -05:00
Mai
9083ad816f
Merge pull request #9713 from unfamiliarplace/master 
Added 'Hide empty rooms' toggle to lobby
 2023-02-02 23:54:48 -05:00
bunnei
25fc5c0e11
Merge pull request #9718 from yuzu-emu/revert-9508-hle-ipc-buffer-span 
Revert "hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer"
 2023-02-02 19:04:50 -08:00
bunnei
af20e25081
Merge pull request #9704 from liamwhite/das 
kernel: add KDeviceAddressSpace
 2023-02-02 19:00:23 -08:00
Luke Sawczak
54ab154696 added 'Hide empty rooms' toggle to lobby 
fixed typo

fixed typo

fixed typo

clang
 2023-02-02 18:46:28 -06:00
liamwhite
b01698775b
Revert "hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer" 2023-02-02 15:53:28 -05:00
Narr the Reg
2f2e88c3fb input_common: Simplify stick from button 2023-02-02 10:13:27 -06:00
liamwhite
8a33f8bd30
Merge pull request #9708 from ameerj/gl-context-flush 
gl_shader_cache: Force context flush when loading disk shader cache
 2023-02-01 22:38:13 -05:00
liamwhite
a9a860a4f7
Merge pull request #9703 from ameerj/txq-ms 
shaders: Fix TXQ with MSAA textures
 2023-02-01 22:38:00 -05:00
Liam
7d1c3a3f59 kernel: add KDeviceAddressSpace 2023-02-01 17:18:21 -05:00
bunnei
92c5ab33b7
Merge pull request #9696 from german77/please_forgive_me_for_this_sin 
input_common: Implement turbo buttons
 2023-02-01 12:08:34 -08:00
german77
ce1895497d yuzu: config: Draw turbo buttons with a different color 2023-02-01 12:42:06 -06:00
german77
75e81885b0 input_common: Implement turbo buttons 2023-02-01 12:42:05 -06:00
bunnei
de28cd0c2d
Merge pull request #9697 from liamwhite/kcap 
kernel: add KCapabilities
 2023-01-31 10:51:10 -08:00
bunnei
ed4a88bd93
Merge pull request #9508 from ameerj/hle-ipc-buffer-span 
hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer
 2023-01-30 12:17:09 -08:00
liamwhite
e74660673b
Merge pull request #9701 from german77/common_protocol 
input_common: joycon: Remove Magic numbers from common protocol
 2023-01-30 09:02:12 -05:00
liamwhite
9de88cb5a7
Merge pull request #9631 from vonchenplus/vulkan_clear 
video_core: Implement vulkan clear specified channel
 2023-01-30 09:01:55 -05:00
Liam
67a8740af6 kernel: add KCapabilities 2023-01-29 22:08:28 -05:00
ameerj
720ff38097 gl_compute_pipeline: Force context flush when loading shader cache 2023-01-29 21:32:12 -05:00
Narr the Reg
c318a4c80b input_common: joycon: Remove Magic numbers from common protocol 2023-01-29 20:12:58 -06:00
ameerj
01eeda74a6 gl_graphics_pipeline: Force context flush when loading shader cache 2023-01-29 20:26:49 -05:00
Narr the Reg
11fea5deea input_common: joycon: Fill missing enum data 2023-01-29 19:11:46 -06:00
Levi Behunin
d5fc56db4b Move to Clang Format 15 
Depends on https://github.com/yuzu-emu/build-environments/pull/69

clang-15 primary run
 2023-01-29 17:49:42 -07:00
ameerj
a63e17566a spirv: Fix TXQ with MSAA textures 2023-01-29 13:47:30 -05:00
ameerj
a1d8306bfd emit_glasm_image: Fix TXQ with MSAA textures 2023-01-29 13:42:34 -05:00
ameerj
08feba2b56 emit_glsl_image: Implement TXQ with MSAA textures 
Also fixes for texture buffers, which do not have mips eithers.
 2023-01-29 13:31:47 -05:00
liamwhite
3aab574521
Merge pull request #9699 from ameerj/texture-pass-desc 
texture_pass: Fix texture descriptors comparisons
 2023-01-29 12:27:41 -05:00
liamwhite
149271923c
Merge pull request #9698 from ameerj/texture-pass-handle 
texture_pass: Refactor texture handle retrieval
 2023-01-29 12:27:33 -05:00
liamwhite
208e635f37
Merge pull request #9694 from ameerj/txq-mips 
shader_recompiler: TXQ: Skip QueryLevels when possible
 2023-01-29 12:27:26 -05:00
liamwhite
d960723dc9
Merge pull request #9684 from liamwhite/read-the-spec 
polyfill_thread: satisfy execution ordering requirements of stop_callback
 2023-01-29 09:35:42 -05:00
bunnei
9170387e71
Merge pull request #9689 from german77/joycon-calibration 
input_common: joycon: Remove magic numbers from calibration protocol
 2023-01-29 02:43:14 -08:00
bunnei
a3aedcce65
Merge pull request #9691 from ameerj/msaa-texcache 
texture_cache: Fix tracking of MSAA image views
 2023-01-28 23:47:45 -08:00
liamwhite
236f591bde
Merge pull request #9690 from german77/whoops 
yuzu: config: Avoid reading deleted object
 2023-01-28 22:28:38 -05:00
ameerj
0d820f2dab texture_pass: Fix texture descriptors comparisons 2023-01-28 21:23:52 -05:00
ameerj
9bb429999e texture_pass: Refactor texture handle retrieval 2023-01-28 21:11:38 -05:00
bunnei
40e7d78179
Merge pull request #9687 from ameerj/ogl-shader-ms 
glasm, glsl: Implement multisampled Image Fetch
 2023-01-28 16:32:11 -08:00
bunnei
159aab9a97
Merge pull request #9682 from ameerj/shader-s32 
shader_recompiler: Remove S32 IR type
 2023-01-28 14:00:11 -08:00
ameerj
2c2e019a44 shader_recompiler: TXQ: Skip QueryLevels when possible 2023-01-28 16:25:18 -05:00
ameerj
c0cedbae94 emit_glsl_image: Fix ImageFetch for MSAA textures 2023-01-28 14:39:27 -05:00
Narr the Reg
e84a441d75 yuzu: config: Avoid reading deleted object 2023-01-28 12:50:27 -06:00
liamwhite
cd138540e2
Merge pull request #9661 from SoRadGaming/LDNhostnameSupport 
LDN hostname support in direct connect
 2023-01-28 12:09:57 -05:00
SoRadGaming
ad712926d6 LDN Hostname Support in Direct Connect 
- Added IPv6 & Namespace support in direct connection Regex
- Updated Tooltip for Direct Connect UI
- Removed Dropdown Connection Type in Direct Connect
 2023-01-28 18:33:21 +11:00
ameerj
c2fb7b64ce texture_cache: Adjust image view sizes by MSAA samples 2023-01-28 00:15:29 -05:00
FengChen
818631a412 video_core: Implement vulkan clear specified channel 2023-01-28 12:53:05 +08:00
Liam
619c0e70f0 polyfill_thread: satisfy execution ordering requirements of stop_callback 2023-01-27 21:34:49 -05:00
bunnei
2efe42fc93
Merge pull request #9677 from Morph1984/sleep-one 
polyfill_thread: Implement StoppableTimedWait
 2023-01-27 18:28:03 -08:00
Narr the Reg
4e29afefc4 input_common: joycon: Replace ReadSPI vector with span 2023-01-27 18:45:25 -06:00
liamwhite
6fa86989f1
Merge pull request #9539 from Wollnashorn/opengl-fsr 
video_core/opengl: Added FSR upscaling filter to the OpenGL renderer
 2023-01-27 19:28:35 -05:00
Narr the Reg
8647c72778 input_common: joycon: Remove magic numbers from calibration protocol 2023-01-27 17:12:04 -06:00
bunnei
32b2a72e7b
Merge pull request #9666 from liamwhite/wait-for-me 
kernel: fix incorrect locking order in suspension
 2023-01-27 15:06:09 -08:00
ameerj
0f795603fc glasm: Add MS sampler types 2023-01-27 02:09:18 -05:00
ameerj
5710e90150 glsl: Add MS sampler types 2023-01-27 02:09:17 -05:00
Liam
e9e1e7aa3a kernel: unbreak min/max template deduction on Apple Clang 2023-01-26 17:43:37 -05:00
Wollnashorn
c4a49eb1dd video_core/opengl: Add FSR upscaling filter to the OpenGL renderer 2023-01-26 21:43:33 +01:00
bunnei
7d0a77a825
Merge pull request #9683 from german77/high_power_joycon 
input_common: Implement SetLowPowerMode and TriggersElapsed
 2023-01-26 10:56:31 -08:00
Narr the Reg
49707916db input_common: Implement SetLowPowerMode and TriggersElapsed for the joycon driver 2023-01-26 11:21:04 -06:00
bunnei
5669692b4e
Merge pull request #9670 from merryhime/revert-af5ecb0b15d4449f58434e70eed835cf71fc5527 
Revert "MemoryManager: use fastmem directly."
 2023-01-25 22:28:55 -08:00
bunnei
58ba508e9a
Merge pull request #9652 from liamwhite/ms 
spirv: fix multisampled image fetch
 2023-01-25 22:28:18 -08:00
bunnei
2158ccda3b
Merge pull request #9604 from liamwhite/pt 
kernel: KPageTable: update
 2023-01-25 22:27:48 -08:00
ameerj
93cc6e4d99 shader_recompiler: Remove S32 IR type 
The frontend IR opcodes do not distinguish between signed and unsigned integer types.

Fixes broken shaders when IR validation/graphics debugging is enabled for shaders that used BitCastS32F32
 2023-01-25 22:03:15 -05:00
Morph
ad6cec71ec main: Convert to device independent coordinates for scaling 
devicePixelRatioF() returns the scaling ratio when high dpi scaling is enabled.
When high dpi scaling is enabled, the raw screen coordinate system is scaled to device independent coordinates.
 2023-01-25 21:16:05 -05:00
Morph
5be85c556e main: Use passthrough scaling for non-windows OSes 
They should be better than windows when handling fractional scaling ratios.
 2023-01-25 21:16:04 -05:00
Morph
6a1b089a50 main: Enable High DPI fixes for Qt >= 5.14 
This uses Qt's new high DPI application attributes for scaling the current window.
However, these aren't perfect as scaling with non integer scales will cause artifacts in UI, icons and other elements.
Therefore, we use a heuristic to select an appropriate integer scale value depending on the current screen resolution and applies this to the application.
 2023-01-25 21:16:04 -05:00
Morph
b6e5a6bda8 main: Only set AA_DisableWindowContextHelpButton below Qt6 
This is fortunately disabled by default on Qt6, so we just have to check whether we are compiling with Qt6 or not.
 2023-01-25 18:45:22 -05:00
liamwhite
0d1a9a12c9
Merge pull request #9675 from Morph1984/ini-concat 
default_ini: Split and concatenate the config string literal
 2023-01-25 17:57:09 -05:00
liamwhite
4ec50dfd4f
Merge pull request #9668 from Morph1984/qt-why-is-this-not-the-default 
main: Globally disable the "?" button on dialogs
 2023-01-25 17:56:58 -05:00
liamwhite
abda68f3a4
Merge pull request #9676 from german77/revert-stick-range 
Revert #9617 and fix it on input_common
 2023-01-25 17:56:47 -05:00
Morph
c55147b24a input_common: Make use of StoppableTimedWait 2023-01-25 16:43:04 -05:00
Morph
9b0563fa87 polyfill_thread: Implement StoppableTimedWait 
StoppableTimedWait allows for a timed wait to be stopped immediately after a stop is requested.
This is useful in cases where long duration thread sleeps are needed and allows for immediate joining of waiting threads after a stop is requested.

Co-Authored-By: liamwhite <liamwhite@users.noreply.github.com>
 2023-01-25 16:43:04 -05:00
Jan Beich
20c7084892 input_common: add missing header for libc++ after 340f15d1fa 
src/input_common/drivers/joycon.cpp:187:26: error: no member named 'find_if' in namespace 'std::ranges'
            std::ranges::find_if(left_joycons, [](auto& device) { return !device->IsConnected(); });
            ~~~~~~~~~~~~~^
src/input_common/drivers/joycon.cpp:193:54: error: no member named 'find_if' in namespace 'std::ranges'
        const auto unconnected_device = std::ranges::find_if(
                                        ~~~~~~~~~~~~~^
src/input_common/drivers/joycon.cpp:393:51: error: no member named 'find_if' in namespace 'std::ranges'
        const auto matching_device = std::ranges::find_if(
                                     ~~~~~~~~~~~~~^
src/input_common/drivers/joycon.cpp:402:51: error: no member named 'find_if' in namespace 'std::ranges'
        const auto matching_device = std::ranges::find_if(
                                     ~~~~~~~~~~~~~^
 2023-01-25 19:52:56 +00:00
Narr the Reg
cc821bfae1 Revert 9617 and fix it on input_common 2023-01-25 13:52:50 -06:00
Morph
4cdf69c378 default_ini: Split and concatenate the config string literal 
We are dangerously close to MSVC's 16384 character limit for string literals. Breaking this string up and concatenating will allow for more settings to be added in the future.
 2023-01-25 14:06:06 -05:00
Merry
dc7ab4c5d6 Revert "MemoryManager: use fastmem directly." 
This reverts commit af5ecb0b15.
 2023-01-25 10:12:04 +00:00
Morph
cdfb3795af main: Globally disable the "?" button on dialogs 
Sets the AA_DisableWindowContextHelpButton attribute to disable this useless button globally.
 2023-01-25 01:12:50 -05:00
bunnei
44b981fd3e
Merge pull request #9662 from abouvier/cmake-llvm 
cmake: prefer system llvm library
 2023-01-24 11:03:14 -08:00
liamwhite
a68af583ea
Merge pull request #9492 from german77/joycon_release 
Input_common: Implement custom joycon driver v2
 2023-01-24 09:29:37 -05:00
Liam
693cad8e9b kernel: split SetAddressKey into user and kernel variants 2023-01-23 20:31:03 -05:00
Liam
5086380a63 kernel: fix incorrect locking order in suspension 2023-01-23 17:14:41 -05:00
Liam
76a4356e55 spirv: fix multisampled image fetch 2023-01-23 12:03:19 -05:00
Alexandre Bouvier
34b1ea9c19 cmake: prefer system llvm library 2023-01-23 06:23:00 +01:00
liamwhite
f99f618d45
Merge pull request #9555 from abouvier/catch2-update 
tests: update catch2 to 3.0.1
 2023-01-22 18:22:47 -05:00
Liam
31e54c4573 kernel: KPageTable: update 2023-01-22 13:17:29 -05:00
liamwhite
78df1ddce8
Merge pull request #9660 from german77/koreaToTaiwan 
yuzu: Fix language comobox crash
 2023-01-22 13:14:38 -05:00
liamwhite
9184b6ed2b
Merge pull request #9656 from liamwhite/nsight 
nsight_aftermath_tracker: update for latest Aftermath SDK
 2023-01-22 13:14:28 -05:00
liamwhite
ff2bbc8205
Merge pull request #9637 from SaiKai/repeat_shortcuts 
allow volume up/down hotkeys to be repeated
 2023-01-22 13:14:19 -05:00
liamwhite
02ac593257
Merge pull request #9617 from german77/off_by_one 
core: hid: Fix stick minimum range
 2023-01-22 13:14:10 -05:00
liamwhite
9705094a57
Merge pull request #9613 from Kelebek1/demangle 
Add stacktrace symbol demangling
 2023-01-22 13:13:58 -05:00
german77
a436467152 yuzu: Fix language comobox crash 2023-01-22 10:42:59 -06:00
Liam
c6eab71d5c nsight_aftermath_tracker: update for latest Aftermath SDK 2023-01-21 13:01:19 -05:00
bunnei
f78068d7bf
Merge pull request #9611 from liamwhite/patch-1 
debugger: add host fastmem pointer fetch command
 2023-01-20 10:00:33 -08:00
Narr the Reg
d9ee7c3297 core: hid: Make use of SCOPE_EXIT and SCOPE_GUARD where applicable 2023-01-20 00:51:46 -06:00
german77
fafa92cfb8 input_common: Fix joycon mappings 2023-01-20 00:51:46 -06:00
german77
340f15d1fa input_common: Address byte review 2023-01-20 00:51:45 -06:00
bunnei
7d77798f0e
Merge pull request #9640 from german77/why_sdl 
input_common: reset sdl motion if data is invalid
 2023-01-19 18:47:21 -08:00
Narr the Reg
4a307a7b3a core: hid: Only set the polling mode to the correct side 2023-01-19 18:05:23 -06:00
german77
b40aefb39e input_common: Drop Pro controller support from custom driver 2023-01-19 18:05:22 -06:00
german77
d05ea2f3eb input_common: Fix issue where ring and irs are enabled at the same time 2023-01-19 18:05:22 -06:00
Narr the Reg
459fb2b213 input_common: Implement joycon ir camera 2023-01-19 18:05:22 -06:00
german77
5cb437703f yuzu: Add ring controller test button 2023-01-19 18:05:22 -06:00
german77
527dad7097 input_common: Use DriverResult on all engines 2023-01-19 18:05:22 -06:00
german77
e1a3bda4d9 Address review comments 2023-01-19 18:05:22 -06:00
Narr the Reg
1c08d532e0 core: hid: Fix input regressions 2023-01-19 18:05:22 -06:00
german77
6d6b7bdbc3 input_common: Implement joycon nfc 2023-01-19 18:05:21 -06:00
Narr the Reg
6e33731f29 input_common: Add dual joycon support 2023-01-19 18:05:21 -06:00
Narr the Reg
751d36e739 input_common: Add support for joycon ring controller 2023-01-19 18:05:21 -06:00
Narr the Reg
f09a023292 input_common: Add support for joycon input reports 2023-01-19 18:05:21 -06:00
Narr the Reg
5676c2e17f input_common: Use calibration from joycon 2023-01-19 18:05:21 -06:00
Narr the Reg
594b2ade6d input_common: Add support for joycon generic functions 2023-01-19 18:05:21 -06:00
Narr the Reg
6aa6301acd input_common: Add joycon low level functions 2023-01-19 18:05:21 -06:00
Narr the Reg
36d5e0a411 service: hid: Set led pattern and fix color detection 2023-01-19 18:05:20 -06:00
Narr the Reg
ed5fa10e97 core: hid: Enable pulling color data from controllers 2023-01-19 18:05:20 -06:00
Narr the Reg
a4074001fe core: hid: Migrate ring from emulated devices to emulated controller 2023-01-19 18:05:20 -06:00
Narr the Reg
18c9f8eeed yuzu: Update controller colors and button names 2023-01-19 18:05:20 -06:00
Narr the Reg
2d802893e7 input_common: Disable SDL driver with switch controllers 2023-01-19 18:05:20 -06:00
Narr the Reg
d80e6c399b input_common: Initial skeleton for custom joycon driver 2023-01-19 18:05:20 -06:00
liamwhite
475370c8f8
Merge pull request #9556 from vonchenplus/draw_texture 
video_core: Implement maxwell3d draw texture method
 2023-01-19 14:58:53 -05:00
bunnei
9ca3a4758a
Merge pull request #9623 from liamwhite/wp-oops 
memory: fix watchpoint use when fastmem is enabled
 2023-01-19 10:50:21 -08:00
Jonas Gutenschwager
4653effad8 add volume quicksetting with volume slider 2023-01-19 15:13:23 +01:00
Narr the Reg
67c3c65f7b
Merge pull request #9638 from Kelebek1/firmware4 
Demote maxwell3d Firmware4 call log to debug
 2023-01-18 23:15:22 -06:00
bunnei
413df0811d
Merge pull request #9619 from liamwhite/timing-spaghetti 
timing: wait for completion on unregister
 2023-01-18 15:13:38 -08:00
german77
db6cb9cc0a input_common: reset sdl motion if data is invalid 2023-01-18 10:05:55 -06:00
Jonas Gutenschwager
887ed5c0e2 fix format 2023-01-18 15:49:47 +01:00
bunnei
82e2ac6026
Merge pull request #9615 from merryhime/upsample-ob1 
audio_core: Corrective fixes to upsampler
 2023-01-17 23:34:12 -08:00
bunnei
1551f97950
Merge pull request #9608 from liamwhite/fps 
nvnflinger: correct swap interval handling
 2023-01-17 23:13:47 -08:00
Kelebek1
5a106cf11e Demote maxwell3d Firmware4 call log to debug 2023-01-18 01:59:11 +00:00
Jonas Gutenschwager
83754e4789 allow volume up/down hotkeys to be repeated 2023-01-18 00:39:31 +01:00
Feng Chen
9fc7ca1731 Address feedback 2023-01-16 10:27:57 +08:00
Liam
f1a0ce0e70 memory: fix watchpoint use when fastmem is enabled 2023-01-15 10:24:31 -05:00
Liam
0953cdd271 timing: wait for completion on unregister 2023-01-14 15:48:01 -05:00
Kelebek1
42b16bb33a Be careful of mangled out of bounds read 2023-01-14 19:53:55 +00:00