birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,949 Commits 3 Branches 3 Tags
85e9ca4692481d57df8b90abdda689879dca46dc
Commit Graph

8949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Esteban Papp 85e9ca4692 Fixes for clang-12 (#5435) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-09 11:09:22 -08:00
Scott Romero e30b0f51d1 [development] Android compatibility fixes (#5424) 
- Added support for NDK r23
 - Added support for the versioned Android 'cmdline-tools' package which replace the deprecated 'tools' package
 - Updated max Gradle version to latest point release of 7.0 to fix volume query bug during sync in some configurations
 - Updated min Android Gradle plugin version to latest point release of 4.2
 - Fixed issue with Gradle task chaining for some custom copy tasks
 - Replaced use of deprecated 'jcenter' repo with 'mavenCentral' in Android project generator template
 - Increased debug logging around adb calls in Android deployment script
 - Fixed a couple try/except cases that were looking for the wrong exception when invoking adb_* functions
 - Fixed issue where asset cache would get deleted when regenerating an existing Android Gradle project with --overwrite-existing
 - Fixed issues with running Android project generation scripts on Unix systems

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-11-09 10:32:44 -08:00
Chris Galvan 8da65fea0b Merge pull request #5206 from bytes-of-pi/graphmodel_fixgetnodesfromgraph 
Prevent GetNodesFromGraphNodeIDs() from adding null pointers to the l…
 2021-11-09 12:30:59 -06:00
Chris Galvan 5bf0375598 Merge pull request #4776 from pollend/bugfix/resolve-dragging-problem-for-DockTabWidget 
bugfix[Linux]: resolve dragging window with more than one tabbed  (#4658)
 2021-11-09 12:30:33 -06:00
jromnoa 14bce55796 Merge pull request #5420 from aws-lumberyard-dev/Atom/semaster/add_diffuse_probe_grid_p0 
Test Parallel Add P0 test for Diffuse Probe Grid component
 2021-11-09 10:17:05 -08:00
Tom Hulton-Harrop 089dd681b9 Merge stabilization/2110 as of dcc2890da3 into development 2021-11-09 17:32:36 +00:00
AMZN-ScottR 5f7aee0814 Merge branch 'development' into android_compat_fixes 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-09 07:53:13 -08:00
Benjamin Jillich 669ac8bb61 EMotion FX: Fix for the Y motion coordinate not being editable in blend space nodes (#5406) 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-11-09 13:07:59 +01:00
Benjamin Jillich 0ce2a7b2f4 EMotion FX: Apply motion extraction only in game-mode and for anim editor entities (#5401) 
* Motion extraction should only be applied when in game mode or for entities that belong to the Animation Editor. We don't want our entities to move in editor mode.
* Moved code into separate function that actually applies the trajectory delta to the entity/character controller.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-11-09 13:07:48 +01:00
Benjamin Jillich f918b12b5a EMotion FX: Taskify dual quat skinning deformer (#5368) 
* Moved from job system to task graph for the multi-threaded dual quaternion skinning deformer.
* Prepare the task graph at init time and reuse it at runtime.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-11-09 13:07:20 +01:00
Michael Pollind 3b05e6ab1e bugfix: correctly center quick access bar (#5396) 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-11-09 10:13:09 +00:00
Tom Hulton-Harrop 5047ba7f7b merge stabilization/2110 to development - 2021/11/09 
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-09 09:19:54 +00:00
santorac 36043983cc Merge pull request #4426 from aws-lumberyard-dev/Atom/santorac/FixSceneSrgTime 
Fixed potential render scene time precision issues.

The timestamp was simply converted from GetTimeAtCurrentTick to a float. Since this value is backed by QueryPerformanceCounter which is 0 at boot, you could see broken animations on the GPU when your system has been on for a long time. So I simplified the RPI's time API (removed unused code), and subtracted the application start time each frame before converting the time value to a float.

Also moved FindShaderInputConstantIndex("m_time") to be called only once, instead of every frame.

Testing:
Originally: I had a local material shader that did vertex animation and it wasn't working at all before, and now it works.
More recently, I made local changes to StandardPBR to add a simple sin wave animation. I also modified GetTimeNowMicroSecond() to artificially add 30 days to the clock. This showed choppy animation before my changes, and smooth animation after.
AtomSampleViewer passed dx12 and vulkan (other than pre-existing issues)
 2021-11-08 19:35:00 -08:00
Sean Masterson 015611977f Merge branch 'development' of https://github.com/o3de/o3de into Atom/semaster/add_diffuse_probe_grid_p0 2021-11-08 15:29:56 -08:00
Chris Burel 33d5109fe8 Merge stabilization/2110 as of 20edb35cdc into development (#5319) 2021-11-08 15:22:17 -08:00
santorac c119947f06 Removed tabs 
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-11-08 13:40:30 -08:00
Sean Masterson 901aa217b8 removed unused import and fixed line length 
Signed-off-by: Sean Masterson <semaster@amazon.com>
 2021-11-08 13:10:55 -08:00
Guthrie Adams dcc2890da3 Merge pull request #5382 from aws-lumberyard-dev/Atom/TechArt/FixUp 
Fixed .bat chain for launching maya for AtomContent gems
 2021-11-08 14:57:00 -06:00
AMZN-ScottR c0dd9ac26b [android_compat_fixes] fixed issues with running Android project generation scripts on Unix systems 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:54 -08:00
AMZN-ScottR aabbf51d3a [android_compat_fixes] added support for non-NDK distributed Vulkan validation layer library paths (required for Android NDK r23+) 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:51 -08:00
AMZN-ScottR 27d354b1f3 [android_compat_fixes] fixed issue where asset cached was getting deleted when regenerating an existing Android Gradle project with --overwrite-existing 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:49 -08:00
AMZN-ScottR f68b550ca9 [android_compat_fixes] replaced a couple try/except cases that were looking for the wrong exception when invoking adb_* functions 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:46 -08:00
AMZN-ScottR 8b9dfe022d [android_compat_fixes] increased debug logging around adb calls in Android deployment script 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:43 -08:00
AMZN-ScottR c5cd7f7fb8 [android_compat_fixes] replaced deprecated 'jcenter' repo with 'mavenCentral' in Android project generator template 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:40 -08:00
AMZN-ScottR ea52fc93ef [android_compat_fixes] fixed issue with Gradle task chaining for some custom copy tasks 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:38 -08:00
AMZN-ScottR 255bf7cfba [android_compat_fixes] updated min Android Gradle plugin version to latest point release of 4.2 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:35 -08:00
AMZN-ScottR 98dd24dce9 [android_compat_fixes] updated max Gradle version to latest point release of 7.0 to fix volume query bug during sync in some configurations 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:33 -08:00
AMZN-ScottR e532193459 [android_compat_fixes] added support for versioned Android 'cmdline-tools' (the 'tools' replacement) 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:30 -08:00
AMZN-ScottR d1805dbd1c [android_compat_fixes] fixed Android NDK r23 duplicate __ANDROID_API__ define 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-08 12:34:27 -08:00
santorac 885fa35dcc Merge pull request #5360 from aws-lumberyard-dev/Atom/santorac/FixedThinObjectTransmission 
Fixed PBR Material Transmission ThinObject Mode
 2021-11-08 12:32:49 -08:00
santorac 8f1767ab86 Merge remote-tracking branch 'upstream/development' into Atom/santorac/FixSceneSrgTime 2021-11-08 12:31:22 -08:00
Alex Peterson 431f80510f Merge pull request #5414 from aws-lumberyard-dev/Prism/DisplayAddGemInfo 
Fix Additional Gem Info Handling and Display
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-08 12:20:18 -08:00
Alex Peterson 79f8edce14 Allow using gem repos page without losing changes #5317 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-11-08 12:17:16 -08:00
puvvadar 4468a9213d Merge pull request #5359 from aws-lumberyard-dev/LYN-8035_MultiplayerFlakyTest_ServerLogging 
Wait to Activate Editor-server Until the Logging System is Ready
 2021-11-08 12:10:37 -08:00
Sean Masterson cd508415ef Removed unused tuple. 
Signed-off-by: Sean Masterson <semaster@amazon.com>
 2021-11-08 11:57:21 -08:00
Guthrie Adams fa3d2ab15f Merge pull request #5416 from aws-lumberyard-dev/Atom/guthadam/adding_atomtoolsframework_runtime_dependency_to_atomlyintegration 
Add missing runtime dependency to atom ly integration
 2021-11-08 13:21:33 -06:00
Guthrie Adams 5958bb090c Merge pull request #5417 from aws-lumberyard-dev/Atom/guthadam/material_editor_inspector_performance 
Queuing inspector invalidation to remove stall opening/closing several documents
 2021-11-08 13:21:11 -06:00
Sean Masterson 6242d1ee8e Added P0 test for Diffuse Probe Grid component 
Signed-off-by: Sean Masterson <semaster@amazon.com>
 2021-11-08 11:19:30 -08:00
hershey5045 18847fb3cc Improve handling of cached data limits. (#5232) 
* Remove size limit on cached profile regions.

Signed-off-by: rbarrand <43485729+hershey5045@users.noreply.github.com>

* Discard excess profiling data once limit has been reached. Warn users only the first time the limit is reached.

Signed-off-by: rbarrand <43485729+hershey5045@users.noreply.github.com>

* Fix bug that was clearing cached time regions instead of the cached time regions map.

Signed-off-by: rbarrand <43485729+hershey5045@users.noreply.github.com>
 2021-11-08 11:09:07 -08:00
santorac cf0708f260 Merge branch 'development' into Atom/santorac/FixSceneSrgTime 2021-11-08 10:22:03 -08:00
santorac 2b4537febf Merge branch 'stabilization/2110' into Atom/santorac/FixedThinObjectTransmission 2021-11-08 10:18:18 -08:00
Nicholas Van Sickle 16f5980983 Fix Prefab builder test (#5377) 
We were destructively moving the DOM template into the builder, leaving the Prefab system with an invalid DOM when teardown occurs. For now, this just copies the document to fix this specific test failure, but we may want to consider making `FindTemplateDom` return a const document and requiring that mutations get routed through the prefab system component to avoid similar situations in the future.

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-11-08 09:11:13 -08:00
Guthrie Adams 97bb01122f Add missing runtime dependency to atom ly integration 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-08 11:01:02 -06:00
nggieber 14a1206274 Add additional info handling and proper display for gems 
Signed-off-by: nggieber <nggieber@amazon.com>
 2021-11-08 08:17:28 -08:00
srikappa-amzn 652e35b0ca Fix camera transforms being reset when switching to default editor camera (#5326) 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-11-08 08:01:57 -08:00
Qing Tao 5a39361f77 ATOM-16747 RPISystemInterface::GetDefaultScene returns the scene crea… (#5153) (#5389) 
* ATOM-16747 RPISystemInterface::GetDefaultScene returns the scene created by PreviewRenderer but not the Main Scene
Deprecate GetDefaultScene() function.
Update all the places which use GetDefaultScene to use Scene::GetFeatureProcessorFromEntityId or GetMainScene.
Tested with Editor, UI Editor, Material Editor, game launcher.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
(cherry picked from commit 8da6bea073)
 2021-11-08 07:49:30 -08:00
Tom Hulton-Harrop c0d36399db Improvements to feedback for default camera orbit point (when no entity is selected) (#5397) 
* improvements to camera orbit feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* minor tidy-up before publishing PR

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates following review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-08 13:37:35 +00:00
SergeyAMZN 47af914ff5 Merge pull request #5276 from aws-lumberyard-dev/TimeoutAndDisconnectImprovements 
Timeout and disconnect improvements
 2021-11-08 13:27:57 +00:00
AMZN-Igarri a1d9a2cc58 Asset Browser Tests (#4948) 
* Added AssetBrowser Tests

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

* Added Entries to test AssetBrowser

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

* Added Print info.

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

* Added more folders

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

* Added Asset Browser Tests for the Search View

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

* Fixed Entry creation

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

* Removed optimize

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

* Cleanup AssetBrowserModel

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

* RowCount made public

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

* Delegated entry creation to RootAssetBrowserEntry and added Code review feedback

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

* removed unused helper class and fixed demo tests

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

* Fixed bus connections

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

* Refactored test environment and added basic tests

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

* Applied some code review feedback and added basic tests

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

* fixed naming

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

* Refactored Tests

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

* removed pointer reset, now handled by the AssetBrowserComponent

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

* Fixed conversion unsigned-signed

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

* Cleaned includes

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

* fixed test setup

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

* Fixed unused variables

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Added printer function

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* cleaned up code

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Added Test to check the correctness of the setup

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed basic tests

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>

* Fixed Tests

Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com>
 2021-11-08 09:56:51 +00:00
Tom Hulton-Harrop 783186fa7e Update default camera orbit behavior (#5301) 
* add new default orbit point behavior

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add default orbit distance to settings registry

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add new default orbit point behavior

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add default orbit distance to settings registry

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* expose default orbit distance to editor settings menu and update how we display default camera position

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add improve orbit changes for focus

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-11-08 09:19:40 +00:00