birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,313 Commits 3 Branches 3 Tags
18bb69a5cbecf53ce9388300090391bbc5aba071
Commit Graph

909 Commits

Author SHA1 Message Date
AMZN-Phil ae3dedfe59 Merge pull request #6172 from aws-lumberyard-dev/Prism/RefactorProjectSettings 
Refactor Project Manager Settings
 2021-12-13 09:40:48 -08:00
Allen Jackson 0ff94f4e6e {lyn2265} adding a Python API for MotionGroup rules (#6215) 
* {lyn2265} adding a Python API for MotionGroup rules

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* updating the license headers
added more proper example code for motion group


Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* updating the actor group to use the common rules module

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2021-12-10 13:36:47 -06:00
chiyenteng ca49eedc5f Convert prefab to temp spawnable assets (#6179) 
* Convert prefab to temp in-memory spawnable assets

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2021-12-10 10:55:01 -08:00
nggieber 88b78c0d16 Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-10 06:32:14 -08:00
amzn-mike 5e5bb27219 Procedural Prefabs: Python documentation cleanup (#6136) 
* Auto LOD script setup

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Working auto LODs

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Correctly selected LODs and added default prefab

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Cleanup code

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Cleanup code

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add missing legal header, move name cleanup to scene_helpers, add documentation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add PhysX mesh group support.

Updated example script to show usage

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add a physics collider component

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update DefaultOrValue call

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Document remaining methods in scene_data.py

Add enums where appropriate
Add type hints and default values

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove unused import

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Convert docstring to numpy style

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix return types

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove empty returns

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add docs on enums

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-09 12:53:35 -08:00
Gene Walters 4b3d1452fd Merge pull request #6066 from aws-lumberyard-dev/LYN-8514_AutomatedReviewServerLogChecks 
Updating Multiplayer PyTests To Check Server Logs
 2021-12-09 09:15:58 -08:00
amzn-sean 7d3399cf96 fixed failing physx script canvas auto tests (#6280) 
I noticed the periodic script canvas physics automated tests were failing. It was because the Script Component no longer had the SC scripts assigned (not sure why). So i reassigned them and the tests are back to green.

Affected tests:
    ScriptCanvas_CollisionEvents
    ScriptCanvas_ShapeCast
    ScriptCanvas_PostUpdateEvent
    ScriptCanvas_PreUpdateEvent

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
 2021-12-09 13:00:06 +00:00
benblack75 29da71e64e Updated Sponza Model (.ma, .fbx, textures) (#6080) 
* Updated Sponza Model (.ma, .fbx, textures)

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Removed corrupted file

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Revisions to Sponza Scene

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Sponza updates

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Updated Cloth Irradiance Values

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Added Sponza scene to Automated Testing- request from QA

Signed-off-by: Benjamin Black <benblac@amazon.com>

* Clean up removed files

Signed-off-by: Benjamin Black <benblac@amazon.com>
 2021-12-08 08:49:18 -08:00
moraaar 045eea03e6 Converted NvCloth automated tests to prefabs (#6253) 
* Deleted cloth slice assets and AutomatedTesting levels based on slices

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

* Recreated nvcloth AutomatedTesting levels for prefabs

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

* Run nvcloth automated tests with prefabs enabled (which is the default)

Signed-off-by: moraaar <moraaar@amazon.com>
 2021-12-08 16:07:03 +00:00
John Jones-Steele 9e7d5fe52b Test the Terrain World configuration changes when parameters are chan… (#6063) 
* Test the Terrain World configuration changes when parameters are changed in the component

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>

* Before merge

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

* Before merge 2

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>

* Change from PR

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

* Change before merge

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

* Change before merge 2

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

* Change before merge 3

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

* Change after merge to fix conflicts

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

* Fix merge conflict

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

* Fix merge conflict

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>
 2021-12-08 14:09:56 +00:00
jromnoa 1be7845cd2 Merge pull request #6085 from aws-lumberyard-dev/Atom/jromnoa/add-remaining-gpu-tests-to-optimized-classes 
Enable optimized GPU tests and make them the main GPU tests.
 2021-12-07 10:52:03 -08:00
sphrose f06230f614 fix merge conflict 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-12-07 08:12:20 +00:00
sphrose 2316ddac65 Merge pull request #5784 from aws-lumberyard-dev/terrain/sphrose/vegetation_tests 
Terrain/sphrose/vegetation tests
 2021-12-07 08:04:21 +00:00
jromnoa 9038cdfcf9 fix merge conflict between constants in atom_constants.py 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-06 17:53:31 -08:00
jromnoa 523691497d call AtomComponentProperties.light(), AtomComponentProperties.directional_light(), etc. as is for its component name, rather than make a component name variable 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-06 16:43:07 -08:00
jromnoa 9d6dc1ac63 add ATTENUATION_RADIUS_MODE constant with its 2 available options of automatic or explicit 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-06 16:38:42 -08:00
jromnoa ad3148ece5 add new enter_exit_game_mode_take_screenshot() shared function 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-06 16:05:55 -08:00
Allen Jackson dae25beef5 {lyn2264} Adding Python API for Actor Group (#6064) 
* {lyn2264} Adding Python API for Actor Group

* updating the IBoneData with behavior attributes
* adding actor_group.py for making actor group JSON data
* adding physics_data.py for making physics JSON data

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* fixing dictionary issues

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* updated comment style to numpydoc

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* updated to numpydoc style

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* example of actor group rules

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* Updated based on feedback

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2021-12-06 17:11:30 -06:00
Gene Walters 9ae3da7acd Merge branch 'upstream/development' into LYN-8514_AutomatedReviewServerLogChecks 2021-12-06 11:30:12 -08:00
jckand-amzn 02fbf31311 Merge branch 'development' of https://github.com/o3de/o3de into jckand/PrefabTestOptimization 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-06 12:30:16 -06:00
nggieber 2c1f0220ec Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-06 09:42:33 -08:00
nggieber 15237af23c Refactored ProjectManagerSettings, added tests, changed project built successful to be tracked by project path, added project ids, changed project settings path to use project id and name 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-06 09:22:03 -08:00
smurly e3306f948f Atom Level component test support in editor_entity_utils.py and tests for level components (#6082) 
* Level component helper and test cases for Atom Level components which currently crash

Signed-off-by: Scott Murray <scottmur@amazon.com>

* moved a close paren to end of previous line to match existing style

Signed-off-by: Scott Murray <scottmur@amazon.com>

* adding a forgotten import

Signed-off-by: Scott Murray <scottmur@amazon.com>

* minor refactor and prep for adding back the Display Mapper Game component test

Signed-off-by: Scott Murray <scottmur@amazon.com>

* putting Game compoenent Display Mapper test back with addition of setting property Enabled to true

Signed-off-by: Scott Murray <scottmur@amazon.com>

* typo in line fixed Test. bocomes Tests.

Signed-off-by: Scott Murray <scottmur@amazon.com>
 2021-12-06 12:18:16 -05:00
sphrose e5a3f21e29 fix merge conflict 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-12-06 16:43:08 +00:00
jckand-amzn 7cabe3e6af Merge branch 'development' of https://github.com/o3de/o3de into jckand/LinuxCrashTest 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-06 09:11:02 -06:00
amzn-sean 09c9548ba4 Automated testing create_backup and restore_backup respects file flags. (#6062) 
* Automated testing create_backup and restore_backup respects file flags.

Example:
If the file that is to be backed-up is readonly, when restored that file will be readonly.
If the file that is to be backed-up is not readonly, when restored that file will be not readonly.

Fixes an issue that would mark physics setreg files to readonly after running AutomatedTesting when restoring from the backup.

* update LyTestTools tests that use create/restore backup to expect copy2 instead of copy

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
 2021-12-06 11:23:52 +00:00
jckand-amzn 658877a9a1 Merge branch 'development' of https://github.com/o3de/o3de into jckand/LinuxCrashTest 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-03 13:15:28 -06:00
jckand-amzn 7657caf6d2 Added helpers to resource locators for finding the platform specific crash logs 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-03 13:15:17 -06:00
LesaelR 2324e1b569 Added a test to verify Asset Processor Batch leaves joblogs for failed jobs. (#6069) 
Signed-off-by: Rosario Cox <lesaelr@amazon.com>
 2021-12-03 10:27:21 -08:00
amzn-mike 5f41463cd6 Procedural Prefabs: Add PhysX mesh group support and example (#6073) 
* Auto LOD script setup

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Working auto LODs

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Correctly selected LODs and added default prefab

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Cleanup code

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Cleanup code

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add missing legal header, move name cleanup to scene_helpers, add documentation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add PhysX mesh group support.

Updated example script to show usage

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add a physics collider component

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update DefaultOrValue call

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-03 09:23:48 -08:00
sphrose 4e5b62ee25 conflict fix 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-12-03 11:36:58 +00:00
jckand-amzn 1f51e186fb Removing intentional crash used for testing from CreatePrefab_WithSingleEntity.py 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-02 18:51:59 -06:00
jckand-amzn e6fb876682 Updating error log handling for Linux 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-02 18:24:26 -06:00
jromnoa 97cd722ac1 remove shadowmap size calls to fix test, clean up some property value assignments for component tests 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-02 14:42:37 -08:00
LesaelR 0498e4a9c3 Added an assert to verify AP and AP Batch close on teardown. (#5891) 
* Added an assert to verify AP and AP Batch close on teardown.

Signed-off-by: Rosario Cox <lesaelr@amazon.com>

* Removed ".exe" from assert to ensure it works on any platform
Fixed missing set of parenthesis in the assert
Added "AssetBuilder" to the assert to ensure assetbuilders have closed correctly

Signed-off-by: Rosario Cox <lesaelr@amazon.com>

* Moving the helper function from asset_processor_fixture to asset_processor_utils.
Changed individual process_utils calls into a single call with a list.

Signed-off-by: Rosario Cox <lesaelr@amazon.com>

* Added the missing references.

Signed-off-by: Rosario Cox <lesaelr@amazon.com>
 2021-12-02 13:48:30 -08:00
jckand-amzn 9b0df63505 Testing crash log retrieval on Linux 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-02 15:39:17 -06:00
jromnoa d158d36ce4 add the test steps to the docstring for the AtomGPU_LightComponent_SpotLightScreenshotsMatchGoldenImages() function 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-02 13:14:48 -08:00
jckand-amzn ab76f8cb62 Combined tests under NoAutoTestMode test class. Updated prefab name in test due to conflict running in parallel. 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-02 12:28:58 -06:00
jckand-amzn 444fb8cfa0 Merge branch 'development' of https://github.com/o3de/o3de into jckand/PrefabTestOptimization 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-02 11:55:45 -06:00
SWMasterson 0116f0a520 Adding Macbeth level to AutomatedTesting and converting to Prefab (#6060) 
* Adding macbeth level to AutomatedTesting

Signed-off-by: Sean Masterson <semaster@amazon.com>

* removing unnecessary files

Signed-off-by: Sean Masterson <semaster@amazon.com>
 2021-12-02 08:26:56 -08:00
sphrose 0e5c9c3867 Merge pull request #5908 from aws-lumberyard-dev/terrain/sphrose/reference_shape 
LYN-7693 Rename and move vegetation reference shape.
 2021-12-02 10:09:05 +00:00
jromnoa cc76ee58a7 update light component constant, fixed the return value for find_editor_entity(), removed old GPU test scripts, added new GPU test scripts 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-01 18:46:58 -08:00
jckand-amzn b1c0d1e12b Enabling optimized test runner for Prefab tests 
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-01 18:41:31 -06:00
amzn-mike f97ec14cf8 Procedural Prefabs: Add example LOD script (#6057) 
* Auto LOD script setup

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Working auto LODs

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Correctly selected LODs and added default prefab

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Cleanup code

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Cleanup code

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add missing legal header, move name cleanup to scene_helpers, add documentation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-01 13:44:03 -08:00
jckand-amzn 68bf7c85ed Adding setup step to remove temporary level that fails to cleanup (#6056) 
* Adding setup step to remove temporary level that fails to cleanup with test teardown

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

* Adding new create_level to TestHelper class with additional error logging

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

* Cleaning up custom setup/teardown

Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com>
 2021-12-01 11:17:08 -08:00
jromnoa 4664cf5aec Merge pull request #5914 from aws-lumberyard-dev/Atom/jromnoa/add-display-mapper-component-property-check 
Expand the Display Mapper component p0 test so that it modifies at least 1 property before passing.
 2021-12-01 11:12:07 -08:00
Gene Walters c8b631054f Misc edit to keep an AZLOG_INFO instead of AZPrint. No real difference, but good as an example for pytest 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-12-01 10:04:26 -08:00
sphrose 1026c598b2 merge conflict fixes 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-12-01 16:47:38 +00:00
Gene Walters d2ee1b92f3 Merge branch 'upstream/development' into LYN-8514_AutomatedReviewServerLogChecks 2021-12-01 08:41:11 -08:00
sphrose 786a72cf63 LYN-7376 test_TerrainHeightGradientList_AddRemoveGradients 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-12-01 10:41:45 +00:00