birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,098 Commits 3 Branches 3 Tags
f4d68a0b0d9516007daa89628f6b2cb05d1ca1e2
Commit Graph

12098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Jillich f4d68a0b0d EMotion FX: Limiting max values for playspeed, blend-in and blend-out times for the simple motion component (#7720) 
GHI #5976 described that for really large numbers the edit field randomly changed digits. This does not happen on the latest version anymore and most likely was caused by a floating point issue that the editor team fixed. We're limiting the maximum values now additionally as in case such large numbers are needed, something is wrong with the global time scale.

Resolves #5976

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2022-02-18 09:19:47 +01:00
Luis Sempé c0299f0ad7 Merge pull request #7733 from aws-lumberyard-dev/scripting/error_format 
Removed carriage return from errors
 2022-02-17 17:22:39 -08:00
Luis Sempé 999fb76163 Merge pull request #7628 from aws-lumberyard-dev/scripting/translation_error 
Fixed ambiguous translation key when a property and a method share the same name
 2022-02-17 16:11:25 -08:00
Luis Sempé 44187d50ee Merge pull request #7730 from aws-lumberyard-dev/scripting/script_events 
Fixed Script Event registration going to the incorrect Behavior Context
 2022-02-17 16:10:26 -08:00
Danilo Aimini 6fe2664b68 Focus Mode | Make Ctrl+S shortcut contextual to Prefab Focus (#7649) 
* Change the Ctrl+S flow to save the currently focused prefab instead of the root.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Ensure the Outliner is refreshed on save

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Rename ExecuteClosePrefabDialog to be more accurate (the function also does the saving, it's not just creating the dialog).

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor changes to labeling.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Adjust labeling to reflect changes in behavior.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Revert labeling changes

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Additional checks to guarantee the system works in test mode

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Additional check to prevent crashes when the editor somehow triggers save during automated tests.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Simplify checks

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Update preferences and dialog labels to reflect new behavior.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-17 15:26:10 -08:00
Danilo Aimini 322a6c495a Focus Mode | Improvements to GetFocusedEntities (#7708) 
* Ensure that the system works at startup and after Clear. Ensure the invalid entityId is not added to the list.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Return a const reference to the list of entities in FocusModeInterface

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix SetFocusRoot to trigger notifications appropriately

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Optimize the entity removal via swap and pop, since we don't care about the order.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Introduce additional check to prevent possibly adding the same entity to the list twice.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix mock after API changes

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Typo.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fixed logic that needed to be updated when the code was moved.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-17 14:53:01 -08:00
Alex Peterson aa2ba82cea Fixing LyShine dependency in gem.json (#7728) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2022-02-17 14:01:20 -08:00
Scott Romero a20f48915e [development] Profiler gem cleanup (#7533) 
Consolidated the contents of CpuProfilerImp.h into CpuProfiler.h
Renamed CpuProfilerImpl.cpp to CpuProfiler.cpp
Collapsed the CpuProfilerImpl class into the intermediary CpuProfiler interface class, removing that interface type
Replaced all calls to the old CpuProfiler interface with AZ::Debug::ProfilerSystemInterface
Added accessor to see if a continuous capture is in progress to AZ::Debug::ProfilerRequests

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2022-02-17 14:00:49 -08:00
Vincent Liu 2589cb20e5 Add required support for GameLift TLS certificate (#7564) 
* Add required support for GameLift TLS certificate
* Update based on feedback
 2022-02-17 13:44:44 -08:00
lsemp3d f346cf8f31 Removed carriage return from errors 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2022-02-17 13:31:35 -08:00
Jeremy Ong bc2589f3e8 Merge pull request #7529 from yaakuro/yaakuro-development-patch-7 
Remove redundant ProgramVariant tag because it got deprecated.
 2022-02-17 14:21:19 -07:00
Chris Galvan 9618078784 Merge pull request #7724 from aws-lumberyard-dev/cgalvan/ImageGradientHandleUnsupportedFormat 
Added error handling for unsupported pixel formats on an image gradient
 2022-02-17 14:21:43 -06:00
lsemp3d 1ed513d782 Fixed Script Event registration going to the incorrect Behavior Context 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2022-02-17 11:37:20 -08:00
Thomas Poulet a3e33f0c4f Add a debug message to renderdoc cmake like for PIX (#7715) 
Signed-off-by: Bindless-Chicken <1039134+Bindless-Chicken@users.noreply.github.com>
 2022-02-17 11:07:51 -08:00
Scott Romero 18fcdcd4f4 [development] added option to control update frequency in profiler visualizer (#7705) 
resolves #4365

Increased the initial profiler ImGui window size
Updated thread render order so the main thread is always on top

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2022-02-17 11:05:45 -08:00
amzn-mike ac79420da7 Fixed missing include (#7648) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2022-02-17 10:48:55 -08:00
Allen Jackson 85ffa6711b {lyn10335} closing and disconnecting during AssetProcessorServerUnitTest (#7656) 
Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2022-02-17 12:19:31 -06:00
puvvadar 7dccb15fb7 Merge pull request #7609 from aws-lumberyard-dev/math_string_converters 
[Impactful Change] Consolidate to_string implementations for math classes and add bool to_string
 2022-02-17 09:40:06 -08:00
Ken Pruiksma e8b7bba0f2 Adding support for blending the terain detail material with the macro material. (#7557) 
* Adding support for blending the terain detail material with the macro material. Also includes several bug fixes
- The detail materail manager wasn't querying for default terrain region materials when it initializes, so it was missing some creation events that it would later get destruction events for and explode.
- Change the way the default material weights against other surface weights to avoid some discontinuities
- Fixed an issue where a default material id wouldn't initialize as invalid.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Several improvements and bug fixes
- Adding explicit creation / destruction events for material regions.
- Material regions will no longer try to "hide" when they don't have any materials
- Default detail materials will now only be used in areas where there are no other material assignments
- Fixed a bug where materials might not show up on surfaces when they were assigned to multiple regions or surface tags.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Simplified loop that assigns materials based on surface tags. Slightly simplified shader code regarding detail material id coordinates.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixes from PR review

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Making sure region changed doesn't get announced in the case where the old and new regions are both invalid.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2022-02-17 11:06:24 -06:00
Chris Galvan 3207e909f7 Added error handling for unsupported pixel formats on an image gradient 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-02-17 10:54:43 -06:00
Qing Tao 846e2736a5 [new] ATOM-17253 Using AtomTressFX gem as an example to inject hair passes to main pipeline at run-time (#7661) 
* Change AtomTressFX passes to write to exsiting DepthLinear buffer instead of creating a new one as output.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>

* Added new api in RPI to apply render pipeline changes from FP

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>

* Update AtomTressFX gem to create hair parent pass at runtime

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>

* Change Scene::ApplyRenderPipelineChange() to TryApplyRenderPIpelineChanges().
Have TryApplyRenderPIpelineChanges() called automatically when a render pipeline is added to a Scene.
Re-apply the render pipeline change when RenderPipeline got recreated (Pass hot-reloading support)
Add AddPassBefore() and AddPassAfter() function to RenderPIpeline class.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 2022-02-17 08:50:50 -08:00
jromnoa ca3018155e Merge pull request #7709 from aws-lumberyard-dev/Atom/jromnoa/AllowDescriptorHeapCompaction-set-true-for-AR 
Sets AllowDescriptorHeapCompaction to true so the nightly GPU run won't time out
 2022-02-17 07:38:32 -08:00
Chris Galvan c4dce0da95 Merge pull request #7702 from aws-lumberyard-dev/cgalvan/FixedSetImageAssetPathAPI 
Updated SetImageAssetPath on image gradient to be more robust
 2022-02-17 09:23:52 -06:00
John Jones-Steele e57b854fca Cleaned up issues with multiple components ? button (#6555) 
* Cleaned up issues with multiple components ? button

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Commit for merge

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Commit before merge

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* WIP

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Before merge from development

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Updated all HelpURL

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2022-02-17 09:04:01 +00:00
Benjamin Jillich c9432dc5e0 EMotion FX: Ported skeleton rendering to debug display and fixed depth testing for debug rendering (#7682) 
* Ported line-based and solid skeleton rendering to debug display.
* Disabled depth testing for skeleton rendering so that we can see the skeleton through the solid mesh.
* Remembering the previous render flags and setting them back afterwards.
* Enabled depth testing for emfx debug, vertex & face normals, tangents and wireframe. We don't want to see them through the solid mesh to avoid visual clutter.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2022-02-17 09:14:24 +01:00
jromnoa 949ce436bb sets AllowDescriptorHeapCompaction to true instead of false so AR doesn't time out 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2022-02-16 18:14:40 -08:00
puvvadar 781769b012 Clang format MathStringConversions.h 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2022-02-16 15:31:58 -08:00
Chris Galvan 3f2aa7470a Merge pull request #7679 from aws-lumberyard-dev/cgalvan/RemovedGradientImageBuilder 
Removed unused Gradient Signal image builder and image processing component
 2022-02-16 16:40:24 -06:00
Chris Galvan 47643e650a Updated image gradient automated test to use new API 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-02-16 16:11:08 -06:00
Chris Galvan 506c5ec0a8 Fixed SetImageAssetPath API on image gradient 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-02-16 16:09:40 -06:00
Chris Galvan 577767acc9 Merge pull request #7694 from aws-lumberyard-dev/TerrainBuildFix 
Fix build error due to const qualifiers not matching
 2022-02-16 16:00:41 -06:00
Zack 0c43559169 Checksum of deb package needs to be recomputed after signing (#7543) 
Reported-by: xaque xaque@duck.com

Signed-off-by: Mike Chang <changml@amazon.com>
 2022-02-16 11:40:19 -08:00
Guthrie Adams 7f16cd1643 Merge pull request #7677 from aws-lumberyard-dev/Atom/guthadam/atom_tools_move_document_reflection_into_classes 
Atom Tools: Moving behavior context reflection into respective classes
 2022-02-16 13:39:36 -06:00
amzn-sj a6958e8166 Fix build error due to const qualifiers not matching 
Signed-off-by: amzn-sj <srikkant@amazon.com>
 2022-02-16 11:28:07 -08:00
jromnoa 8a1d63bab0 Merge pull request #7663 from aws-lumberyard-dev/Atom/jromnoa/move-benchmark-test-metrics-to-new-suite 
Move benchmark test metrics to their own suite outside of the GPU suite.
 2022-02-16 11:01:37 -08:00
Scott Romero d119501760 [development] fixes for targeting macOS Monterey (12.x) (#7666) 
Targeting macOS 12.x fails to compile due to some named constants being deprecated and replaced

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2022-02-16 10:37:36 -08:00
dmcdiarmid-ly b9fd9a43c6 Merge pull request #7669 from aws-lumberyard-dev/Atom/dmcdiar/LYN-10373 
MaterialEditor fix for MSAA state
 2022-02-16 11:32:51 -07:00
amzn-sj fef53bf4be Update ProcessFromListOfVector2 API functions to use bulk queries. (#7658) 2022-02-16 10:08:17 -08:00
Nicholas Van Sickle 26566a06d2 Merge pull request #7565 from aws-lumberyard-dev/nvsickle/DomPrefixTree 
Add DomPrefixTree, a DOM path => value lookup structure
 2022-02-16 11:50:43 -05:00
Roman f72c7da4a3 Change rotation camera to use RMB, and add orbit rotation camera using LMB + alt (#7610) 
* Change rotation camera to use RMB, and add orbit rotation camera using LMB + Alt

Signed-off-by: rhhong <rhhong@amazon.com>

* add lookScrollCamera

Signed-off-by: rhhong <rhhong@amazon.com>
 2022-02-16 08:38:51 -08:00
lumberyard-employee-dm ba48ef3949 GCC Build fix. (#7659) 
GCC doesn't accept accessing member variables inside the noexcept expression of a member function.

GCC also requires that template specializations for an inner template be outside of all classes.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2022-02-16 10:06:00 -06:00
Chris Galvan 18631b1a30 Merge pull request #7563 from aws-lumberyard-dev/jckand/ImageGradientTests 
Adding new Image Gradient test to validate surface modification
 2022-02-16 10:02:30 -06:00
Chris Galvan b2c7cf4452 Moved GetValueFromImageAsset from ImageAsset to ImageGradientComponent 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2022-02-16 09:53:06 -06:00
Benjamin Jillich a9d2ea660c EMotion FX: Colliders now also render without the collider plugins #7643 
* Colliders only rendered in case the given plugin was active, no matter if they were enabled or not in the 3D viewport which was confusing for users. Colliders as well as ragdoll debug draw now renders independently of the plugins.
* Added debug rendering for colliders and ragdoll joint limits to the Atom debug draw class
* Automatically clear selection when closing skeleton outliner

Resolves #5982
Resolves #5980

Signed-off-by: Benjamin Jillich jillich@amazon.com
 2022-02-16 16:43:28 +01:00
Chris Galvan 283fe216dc Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/RemovedGradientImageBuilder 2022-02-16 09:21:03 -06:00
Guthrie Adams ce754d31e5 Atom Tools: Moving behavior context reflection into respective classes 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2022-02-16 09:19:12 -06:00
Chris Galvan c2d6ba0c69 Merge pull request #7625 from aws-lumberyard-dev/cgalvan/AddSupportForUNORM_SRGB 
Added support for several UNORM_SRGB formats
 2022-02-16 09:18:34 -06:00
Mike Balfour 0e328afcdd Optimize surface providers (#7631) 
* Add comparison operators to SurfaceTagWeight.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Changed AddSurfaceTagWeight to always combine weights.
This simplifies the API a bit and defines the behavior if someone ever tries to add a duplicate tag.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Added benchmarks for measuring the performance-critical APIs.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Changed SurfaceTagWeights to a fixed_vector.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Add inPosition to AddSurfacePoint.
This will be used to detect which input the surface point is associated with.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Add inPositionIndex to the appropriate APIs.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Switched Gradient Surface benchmarks to use actual surface components.
The gradient unit tests and benchmarks were previously using a mock surface data system, which led to misleading benchmark results. Now, the actual SurfaceData system gets constructed, and the tests use a mock provider, but the benchmarks use actual shape providers for more realistic benchmarking.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed unit tests to have better query ranges.
Half of each previous range was querying outside the surface provider's data.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* First attempt at removing SurfacePointLists.
This currently runs significantly slower than the previous code but passes the unit tests.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Another attempt at optimization.
This one runs faster than the previous, but still slow.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fix the cmake dependency so that the gradient tests rebuild SurfaceData.dll when run.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Switch SurfaceAltitudeGradient over to the new bulk API.
Also, optimized the non-bulk API by having it reuse the SurfacePointList to avoid the repeated allocation / deallocation cost.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Switched to using an indirect index so that all allocations are consecutive in our reserved buffer.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Switched back to SurfaceTagWeight again.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Added runtime dependency to LmbrCentral for unit tests.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Switched code over to use the full EnumeratePoints in most cases.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Added knowledge of max surface point creation into the system.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Add generic GetSurfacePointsFromList API implementation for surface providers.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed implementation to use the correct maximum number of input points based on the surface providers being queried.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fix out-of-bounds references on empty lists.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fix memory allocation that caused benchmark runs to crash.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Starting to clean up the API.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Move SurfacePointList into separate files for easier maintainability.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed bug where too many points were filtered out due to using the position Z as a part of the AABB check.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Made FilterPoints an internal part of SurfacePointList so we can choose when and how to perform the filtering.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Final cleanup / comments.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Added includes for non-unity builds.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Optimized GetValues() implementations.
Also consolidated GetValue() and GetValues() down to a single implementation under the covers for easier maintenance.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Changed how unit tests initialize the mock lists to try and fix the linux errors.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Switch to explicit span declarations to help ensure this works with linux.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed compile error.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Make the bulk terrain APIs take in const Vector instead of non-const.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Optimize the surface data providers for bulk queries.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2022-02-16 09:17:01 -06:00
Benjamin Jillich 1413977aca Animation Editor: Motion event colors aren't in sync with the event presets (#7582) 
The motion events in the timeview had the wrong colors assigned as they weren't correctly mapped to the given event presets.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2022-02-16 16:07:33 +01:00
dmcdiarmid-ly e94d832e67 Set MSAA state in MaterialEditor startup 
Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com>
 2022-02-16 02:12:30 -07:00