birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,010 Commits 3 Branches 3 Tags
b202bbfbc90e8a369ac8d1f6f5d3b63e49336726
Commit Graph

9010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Murray b202bbfbc9 SSAO component P0 automation 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2021-11-10 15:26:32 -08:00
Guthrie Adams 2bfef84aa2 Merge pull request #5512 from aws-lumberyard-dev/Atom/guthadam/cherrypick_material_source_data_loading 
cherry pick material source data loading from stabilization to development
 2021-11-10 16:10:40 -06:00
amzn-mike efe78d035f Updated project path to use absolute path (#5459) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-11-10 13:48:58 -08:00
Guthrie Adams 6f80aab699 Updating parent path usage has part of cherry picked from stabilization combining source data changes with relative path changes 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 14:42:55 -06:00
rgba16f cebf6e2de3 Atom CPU threading optimization (#5481) 
* Small change to make the RasterPass Scope jobs split the work more evenly over the cores

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update with PR feedback. Remove scale of EstimatedItemCount, modify the command list cost threshold instead

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-11-10 12:08:55 -08:00
santorac 04c6f3cc94 cherry-pick 48f3bb7d 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:37:15 -06:00
Guthrie Adams 824da6cabf update comment and error message 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:34:35 -06:00
Guthrie Adams c73b6bbe27 Changing lua material functor script loading code to pass the correct sub ID for a compiled script asset 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:33:48 -06:00
Guthrie Adams 287f08a33c Fix parent material loading 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:33:10 -06:00
Guthrie Adams 086859d49a updated comments and error messages 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:32:27 -06:00
Guthrie Adams fbebf04161 cherry-pick c0acbe7b 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 13:31:24 -06:00
amzn-mike 61d0ec9d6b Remove debug messages. (#5429) 
Leaving in the print for absorbed asserts to avoid running into future situations where important asserts are accidentally absorbed

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-11-10 13:22:47 -06:00
Mike Chang 5a8f95a414 Fix Wix root and installer url config (#5500) 
Signed-off-by: changml <changml@amazon.com>
 2021-11-10 11:21:49 -08:00
Guthrie Adams 6ea951214c Moving material type asset PostInit call to be consistent with material asset 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 12:58:47 -06:00
Guthrie Adams 6729941942 adding ifdef to compare loading vs creating material type assets 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 12:57:56 -06:00
Guthrie Adams b72970201b cleanup and setting asset preload flags 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 12:56:38 -06:00
Guthrie Adams b038faf9ca material editor loads source data 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-11-10 12:55:57 -06:00
bosnichd 528a747876 Don't allocate memory when processing WM_INPUT messages. (#5491) 
This change was made years ago in CrySystem (see CSystem::HandleMessage in System.cpp), but looks like it never made it into the NativeWindow_Windows version.

Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-11-10 11:28:21 -07:00
SJ f5c00e9e72 Fix Editor crashes on asset failures (#5421) 
* 1. Add nullptr checks to prevent crashes when non-critical shaders fail to compile.
2. Add a higher "launch_ap_timeout" for Mac because launching a newly built/downloaded AP can take a while.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Fix one more nullptr dereference.

Signed-off-by: amzn-sj <srikkant@amazon.com>
 2021-11-10 11:31:49 -06:00
Esteban Papp 21f9a789c1 Merged the Editor.Camera.Tests with the Editor.Tests (#5463) 
* Merged the Edtiror.Camera.Tests witht eh Editor.Tests

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Adds dependency to Camera.Editor gem which is used by the test

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Inheirts from TraceBusHook instead of adding the default env to the test

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* makes order consistent between Setup/Teardown

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* adds missing header for non-unity builds

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes dependency to Camera gem

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-10 08:57:39 -08:00
Scott Romero ab37eb138c [development] removed CryLibrary (#5474) 
* [redcode_crylibrary] replaced CrySystem loading in launcher and editor with new custom wrapper that uses AZ::DynamicModuleHandle

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] removed all remaining references to CryLibrary

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] migrate CrySystem loading to use AZ::DynamicModuleHandle directly instead

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] clean up of CrySystemModuleHandle and old CrySystem module [un]init functions

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

* [redcode_crylibrary] added trailing newline to DllMain.cpp in CrySystem

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2021-11-10 09:43:13 -07:00
rgba16f 8b5fe4a015 Move PipelineStateCache validation of set uniqeness to only be active in debug builds (#5472) 
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-11-10 10:26:03 -06:00
Benjamin Jillich 838970206b Animation Editor: Remove preview label (#5449) 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-11-10 16:23:43 +01:00
bosnichd eb775a48dc Make InputDeviceId's constructor constexpr. (#5433) 
* Make InputDeviceId's constructor constexpr.

See also https://github.com/o3de/o3de/pull/4220

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

* Updates based on review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
 2021-11-10 08:06:27 -07:00
SergeyAMZN 354802d387 Merge pull request #5320 from yuriy0/physx_multi_shape_rigid_body 
Fix a bug where a rigid body with multiple shapes would ignore all shapes except the first
 2021-11-10 12:48:24 +00:00
SergeyAMZN b9f6d1ec9f Merge pull request #5311 from aws-lumberyard-dev/HierarchiesFixes 
Fixed client hierarchy construction to check for authority instead of controller
 2021-11-10 12:47:43 +00:00
Luis Sempé 29de7c0542 Merge pull request #5464 from aws-lumberyard-dev/scripting/improve_assert_msg 
Improved messaging on assert about argument types lacking reflection …
 2021-11-09 17:34:01 -08:00
Vincent Liu 0dca09b039 Update AWS gem info content (#5281) 
* Update AWS gem info content

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

* Tweak requirement statement based on feedback

Signed-off-by: liug <liug@amazon.com>
 2021-11-09 16:56:06 -08:00
lsemp3d 934c0f2ec7 Made SerializeContext and BehaviorContext consistent with their class name 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-09 15:25:06 -08:00
lsemp3d d3b8b761fd Improved messaging on assert about argument types lacking reflection for scripting 
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
 2021-11-09 14:51:10 -08:00
Mikhail Naumov e1d53395fe Propagation Optimization (#5355) 
* Merge changes

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* removing leftover immediate flag

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-11-09 14:05:15 -08:00
Roman aa229976f3 Render Colliders (#5434) 
* Render Colliders

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

* CR feedback

Signed-off-by: rhhong <rhhong@amazon.com>
 2021-11-09 13:42:56 -08:00
Ronald Koppers e6a1f8ed0a Merge pull request #5108 from aws-lumberyard-dev/Prefabs/SpawnableEntityAlias 
Ability to setup aliases for entities spawned from spawnables.
 2021-11-09 13:17:59 -08:00
Brian Herrera 8f7191be1b Merge pull request #5457 from aws-lumberyard-dev/retry-failure-fix-development 
Remove timeout in the mount step
 2021-11-09 13:15:09 -08:00
brianherrera 92f1883cae Remove timeout in the mount step 
We no longer need a timeout here. A timeout mechanism was added to the mount script to raise an exeception if the EBS volume is not mounted in the configured timeframe.

This also causes a bug with the retry mechanism where Jenkins will hit this timeout in the event the node goes offline during the setup stage instead of raising an exception.

Signed-off-by: brianherrera <briher@amazon.com>
 2021-11-09 11:50:01 -08:00
Esteban Papp 61fa2eac32 Better compiler detection on Linux (#5376) 
* Better compiler detection on Linux
Moving EngineFinder.cmake to cmake/ in the templates

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* skipping detection if compiler is passed through environment

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes condition, needs to be in quotes since is the value of the sttring

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-09 11:10:03 -08:00
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
AMZN-koppersr cc2513f224 Linux build fix Spawnable Entity Aliases. 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
 2021-11-09 09:55:39 -08:00
Sergey Pereslavtsev 7fce5e52a4 PR feedback addressing 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2021-11-09 17:36:01 +00:00
Tom Hulton-Harrop 089dd681b9 Merge stabilization/2110 as of dcc2890da3 into development 2021-11-09 17:32:36 +00:00
AMZN-koppersr 83db368706 Merge branch 'development' into Prefabs/SpawnableEntityAlias 2021-11-09 08:53:25 -08: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
Sergey Pereslavtsev 1e6518abab Build fix after the merge from dev 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2021-11-09 14:50:44 +00: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