birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,721 Commits 3 Branches 3 Tags
96f77f95fb66ea74fac9bf089fd5dfee49b701c7
Commit Graph

854 Commits

Author SHA1 Message Date
Guthrie Adams c9c172794e Atom Tools: Document system exposes reflected object data 
• This removes a direct dependency on dynamic property groups and data from the document system.
• Added support for names, descriptions, and nesting to dynamic property groups.
• Moved property related functions from base document classes into material editor document classes because dynamic property groups are an implementation detail of the material editor document to support material type flexible data format.
• Change material document to use a table of dynamic property groups instead of a map of properties.
• Added functions to traverse groups and properties.
• This keeps groups and properties organized consistently with the material type file as well as what’s expected in the UI.
• Document data can now be maps directly to the inspector reflective property editors instead of copying one property at a time out of the document and keeping those synchronized.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2022-02-03 21:42:27 -06:00
Neil Widmaier a67671759e Merge branch 'development' of https://github.com/aws-lumberyard/o3de into Neil_P0_updates 2022-02-03 10:03:48 -08:00
Gene Walters be783e2c3c Merge pull request #7324 from aws-lumberyard-dev/LYN-6769_TestingRPCs_AutonToAuth_ServerToAuth 
Multiplayer AutomatedTesting: Autonomous->Authority and Server->Authority RPCs
 2022-02-03 10:02:22 -08:00
Sean Sweeney 2bdc102f63 Merge pull request #6795 from aws-lumberyard-dev/scspaldi_lytt_improvements 
Changed kill to protected.
 2022-02-03 10:02:13 -08:00
jckand-amzn eb1aee0230 Finalizing Terrain automated test conversions to utilize prefab system (#7360) 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2022-02-03 09:58:53 -08:00
Gene Walters f1680daa96 Small log change based on feedback 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2022-02-02 16:06:29 -08:00
Neil Widmaier 2ce9db972d Merge branch 'development' of https://github.com/aws-lumberyard/o3de into Neil_P0_updates 2022-02-02 15:10:21 -08:00
Neil Widmaier 57ab6d5e7c making minor variable name changes 
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
 2022-02-02 15:08:54 -08:00
scspaldi 92da291bb4 Changed kill() to protected. Changed references from kill() to stop(). 
Signed-off-by: scspaldi <scspaldi@amazon.com>
 2022-02-02 13:32:10 -08:00
jromnoa 9a30c5366c Merge pull request #7302 from aws-lumberyard-dev/Atom/scottmur/P1_decal_null 
P1 Decal tests for null renderer
 2022-02-02 10:43:07 -08:00
Gene Walters 059550a311 Merge pull request #6113 from aws-lumberyard-dev/scspaldi_basic_networking_automation_test 
Basic networking automation test
 2022-02-02 07:16:06 -08:00
Scott Murray 157149928b lower casing materials in path to avoid Linux casing issues 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-02-01 11:24:51 -08:00
Gene Walters 23bdc52270 Merge branch 'upstream/development' into LYN-6769_TestingRPCs_AutonToAuth_ServerToAuth 2022-02-01 09:54:13 -08:00
Scott Murray 9081a0db90 use material included and remove unused decal material 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-02-01 09:51:22 -08:00
Gene Walters 647982ea39 Minor py-code comments 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2022-02-01 09:30:54 -08:00
Gene Walters 9d002860f7 Merge pull request #7293 from aws-lumberyard-dev/LYN-6769_TestingRPCs 
AutomatedTesting: Adding Multiplayer Authority->Client RPC Test
 2022-02-01 08:32:17 -08:00
Gene Walters dcc7ad6e71 Adding automated tests for Autonomous->Authority and Server->Authority RPCs 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2022-01-31 17:40:49 -08:00
Neil Widmaier 4aa5ba4eca Making minor fixes, and cycling through light types 
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
 2022-01-31 15:08:03 -08:00
Scott Murray ad6392e364 decal P1 test for null renderer 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-31 15:03:17 -08:00
Ken Pruiksma b455b915a8 Making terrain query resolution a single float instead of a Vector2 (#7186) 
* Making terrain query resolution a single float instead of a Vector2

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

* Keeping the concept of different x/y step sizes in region queries since that may be useful and is separate from query resolution. Also keeping the concept of different x/y step sizes in physics since that's independent of the terrain gem.

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

* Formatting cleanups

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

* A few more minor cleanups

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

* Added support to convert serialized Vector2 query resolution to a single float.

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

* Switch ray intersection check back to using separate values for x and y resolution

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

* Fixing new unit tests added to use float query resolution.

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

* Updating automated test

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2022-01-31 16:10:03 -06:00
Gene Walters 4919cb3450 Minor code comment change 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2022-01-31 09:48:53 -08:00
Gene Walters 9573bc8032 Re-adding the Authority->Client RPC test now that ScriptCanvas is fixed for Editor play-mode 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2022-01-31 09:38:45 -08:00
Neil Widmaier 342b1ee47c minor update 
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
 2022-01-28 12:44:04 -08:00
Neil Widmaier f1ad9ef0b8 Updated Light, Grid, and Physical Sky P0 tests 
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
 2022-01-28 12:19:27 -08:00
John Jones-Steele b34a955c3d Fixed platform settings not using unique values for Android and iOS (#7198) 
* Fixed platform settings not using unique values for Android and iOS

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

* Removed unnecessary comment

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-01-28 16:38:33 +00:00
SSpalding 5810a150f0 Merge branch 'development' into scspaldi_basic_networking_automation_test 2022-01-26 15:22:47 -08:00
chiyenteng f91c605144 Fix prefab/instance name inconsistency issue in automated testing's prefab utils (#7122) 
* Ensure to fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Ensure to fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* convert test AreaNodes_DependentComponentsAdded to use prefab system

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Prevent SetupEditorEntity being called twice

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Fix prefab utils prefab naming issue

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* revert test changes

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* fix a grammatical error

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2022-01-25 14:57:16 -08:00
jromnoa 312f5ad08f Merge pull request #7092 from aws-lumberyard-dev/Atom/scottmur/P1_entity_reference 
P1 Entity Reference Component tests
 2022-01-25 13:39:07 -08:00
jckand-amzn aab3d8df67 Converting Landscape Canvas tests to utilize the prefab system (#7142) 
* Converting LandscapeCanvas automated tests to utilize prefab system

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Finalizing LandscapeCanvas automated test conversions to utilize prefab system

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing test gem from enabled_gems for AutomatedTesting

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing test gem subdirectory that was mistakenly committed

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing debug wait

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2022-01-25 13:45:30 -06:00
jromnoa adfd77c67c Merge pull request #7046 from aws-lumberyard-dev/Neil_o3de_local 
adding editor level load automation script
 2022-01-25 11:04:42 -08:00
Gene Walters b98bc34eb1 Merge pull request #7031 from aws-lumberyard-dev/LYN-9321_RequestNetSpawnableErrorFix 
Fix Editor Play-Mode RequestNetSpawnable Error
 2022-01-25 09:52:00 -08:00
John Jones-Steele d346d45848 File menu open level and save level as dialogs not properly recognized as modals #6605 (#7072) 
* WIP

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

* Fixes to ModalWindowDismisser

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

* Redisables Import test as fails on Jenkins

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

* Redisables Import test and Edit Platform as fails on Jenkins

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

* Replace skip in TestSuite_Main.py

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2022-01-25 10:43:20 +00:00
scspaldi 5d67b63c92 Added basic client connectivity test. 
Signed-off-by: scspaldi <scspaldi@amazon.com>
 2022-01-24 16:52:25 -08:00
Neil Widmaier b83fc89c74 Making requested changes to LevelLoadTest 
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
 2022-01-24 15:03:27 -08:00
Neil Widmaier d038c4e843 Merge branch 'development' of https://github.com/aws-lumberyard/o3de into Neil_o3de_local 2022-01-24 13:56:34 -08:00
Scott Murray 74c8561fd0 bringing in latest develoment 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-24 13:13:23 -08:00
Junbo Liang 1cf7d57b3f Update deployment scripts to support AWSI automation tests on Linux (#7038) 
* Update deployment scripts to support AWSI automation tests on Linux

Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
 2022-01-24 11:20:15 -08:00
SWMasterson 7bf7b03dd2 Added base level for tests, updated automation to use prefabs, and restored sandboxed tests (#6993) 
Signed-off-by: Sean Masterson <semaster@amazon.com>
 2022-01-24 11:50:37 -06:00
chiyenteng dd7706f9fe Fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition (#7079) 
* Ensure to fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Ensure to fire OnEditorEntityCreated notification in SandboxIntegrationManager::CreateNewEntityAtPosition

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* convert test AreaNodes_DependentComponentsAdded to use prefab system

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Prevent SetupEditorEntity being called twice

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2022-01-21 16:23:31 -08:00
Scott Murray 6481b147fc style and other fixes 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-21 16:03:39 -08:00
Scott Murray 44cbc7659f removing unused line 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-21 15:00:36 -08:00
Scott Murray 529c342eca fixing remove_components 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-21 14:53:11 -08:00
Gene Walters ea3cf928b0 Small change looking for logs so py code doesnt need to wait as long 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2022-01-21 14:40:12 -08:00
jckand-amzn 2c33240b72 Converting Dynamic Vegetation and Gradient Signal tests to utilize prefab system (#7034) 
* Adding on-disk prefabs for automated tests

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Resolving import conflict with cherrypick

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Updating DynVeg tests to use open_base_level function

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Converting initial set of DynVeg tests to utilize prefab system

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Finalizing DynVeg test conversion to use prefab system

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing old test runners

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing optimized suffix from optimized test runners

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing unoptimized test runner

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Removing optimized suffix from optimized test runner

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>

* Adding wait_for_condition on level save for E2E tests

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2022-01-21 11:55:19 -08:00
Scott Murray f93a22cdcc EntityReference P1 case udpates 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-21 11:11:39 -08:00
Gene Walters 05bf066c5a Removed commented out py code 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2022-01-21 10:28:22 -08:00
Scott Murray b98b240a40 Entity Reference P1 initial tests 
Signed-off-by: Scott Murray <scottmur@amazon.com>
 2022-01-20 18:16:51 -08:00
Neil Widmaier 6fde1389bf adding editor level load automation script 
Signed-off-by: Neil Widmaier <nwidmaie@amazon.com>
 2022-01-20 13:35:08 -08:00
Chris Galvan 01dfd291a5 Merge pull request #7012 from aws-lumberyard-dev/jckand/DynVegTestFix 
Fixing query areas for instance count validation in ShapeIntersectionFilter test
 2022-01-20 10:50:23 -06:00
Gene Walters 3c879d5967 fix pytest typos 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2022-01-20 08:45:35 -08:00