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

834 Commits

Author SHA1 Message Date
Gene Walters 562b876734 Merge pull request #5733 from aws-lumberyard-dev/LYN-6769_RPCCompilation 
RPC Variants added AutomatedTesting
 2021-11-24 07:25:58 -08:00
Junbo Liang 6a40d21b66 Merge commit '4ee2f341dc0dc709aedb446b57d5cca61b86160d' into junbo/gitflow_211123_o3de 2021-11-23 13:14:59 -08:00
Gene Walters c446744e2b merging latest dev 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-23 12:16:54 -08:00
Esteban Papp ccb5336843 Reading 3rdparty from manifest if it exists (#5840) 
* Reading 3rdparty from manifest if it exists, removnig the need to pass it across the board, updated jenkins paths so 3rdparty is put into the workspace

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

* Removes unneded space

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

* Changes how we get the NDK folder

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

* needs delayed expansion

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

* Ninja is in the path, is not needed for Android

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-22 14:21:02 -08:00
chiyenteng ab76254b43 Make prefab system enabled as default for automated tests (#5670) 
* Make prefab system enabled as default for automated tests

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

* Modify auto tests after preventing regset saved into disk after editor main window closed

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

* Uncomment xfail

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

* Use --regset for editor tests

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2021-11-22 10:45:18 -08:00
Gene Walters ea26ce7289 Fully spelling out 'Autonomous' and 'Authority' in the test autocomponent based on review feedback 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-22 08:34:44 -08:00
puvvadar 6eec6c8f8e Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de 
Merge stabilization/2110
 2021-11-19 15:46:16 -08:00
Nicholas Van Sickle 4ee2f341dc Fix several Prefab outliner ordering issues (#5747) 
* Fix several Prefab outliner ordering issues

This change does a few things to address instability in entity order when prefabs are enabled:
- Changes ordering behavior on entity add to always be "insert after the last selected sibling of the new entity, or at the end if there is no selected sibling"
- Adds some logic to ensure selection stays frozen during prefab propagation to allow this behavior to be used
- Alters delta generation in `PrefabPublicHandler::CreateEntity` to use the template instead of reserializing the DOM - this avoids a whole bunch of patching issues caused by EditorEntitySortComponent doing post-hoc order fix-up and should generally be safer/faster as we're producing patches for the actual target for those patches
- Because the duplicate action is DOM-driven, and there's some thorniness around making changes that will affect the template during propagation, this adds `PrefabPublicHandler::AddNewEntityToSortOrder` to directly patch the DOM for the duplicate case

Two bits of this come from patches from the incredibly helpful @AMZN-daimini
- Alters `PrefabPublicHandler::GenerateUndoNodesForEntityChangeAndUpdateCache` behavior for determining what's an override: we now check to see if we're part of the current focused instance but *not* owned by the focus instance directly. This lets entity order for nested prefabs get saved to the owning prefab instead of as an override. I'm putting this up for discussion without a feature flag gating it, but we may wish to make this a toggle or disable it outright for stabilization (in which case entity order won't be saved to the owning prefab)
- Adds a custom serializer for EditorEntitySortComponent. This isn't strictly necessary now, but it was very useful for debugging and ended up receiving much more manual testing its migration path and save/load path more than I've tested without using the serializer.

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Add missing serializers

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Address some review feedback

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Generate patch in `PrefabPublicHandler::CreateEntity` using the instance's fully evaluated template in-memory

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix up comment

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix Linux build

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Try to make test less timing dependent (haven't been able to repro failure locally)

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix another build issue

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix unit test failures

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* Fix a duplicate issue with sanitization that was causing sporadic test failure (thanks, test!)

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>

* One more Linux fix...

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-11-19 23:35:19 +05:30
puvvadar a49496f94b Merge commit '06e5c394e2faa746b4a2bb70dd908e36e0a9bb77' into puvvadar/gitflow_211118_o3de 2021-11-19 09:15:37 -08:00
Esteban Papp 49e8f35858 Creates a deb package (#5567) 
* configure/generation working

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

* Generates deb package forLinux

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

* Fixes to EngineFinder

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

* changes the owner of the installed folder so it is writable by the user

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

* jenkins scripts

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

* Fixes execution permission for scripts

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

* Fixes wrong parameter to build for linux

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

* removal of clang parameters in build_config.json

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

* Simplifies and fixes build configs

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

* fixes to EngineFinder

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

* Adds linux deb package upload and small fixes/organization cleanup

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

* fixes checksum generation

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

* Some more small fixes for reviewing

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

* Test if this space is necessary for cpack

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

* More fixes for installer jobs

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

* Adding eval to variables that need to double-expand

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

* Removing unused variables being passed

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

* Do not remove symlink

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

* Use cmake_path for concatenating paths

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

* removing quotes so the variable expands

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

* cleaned up some variables that have way too many ways to be passed

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

* Multiple fixes for Jenkins

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

* Cleanup/re-organization

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

* fixes some temp variables so we can run cpack jenkins jobs locally

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

* Delays cmake download to install step
Cleanup on installer_windows.cmd, we already have the path to cpack (same as cmake, which is added to the path)
Some simplification in the windows installer generation, we now generate the same even if we dont upload

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

* Fixes mac install

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

* CPack can generate hashes for us
Defiine CPACK_OUTPUT_FILE_PREFIX to prevent the exe/msi from ending in the bin dir
Remove unnecessary generation of folder from 3rdPartyPacakges which fails when including from cpack

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

* multiple fixes

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

* fixes typo

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

* more fixes

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

* Fixes for linux/mac/windows (fixing discrepancies with Jenkins)

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

* uploads to S3 from the upload directory and fixes the latest upload

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

* Adds ERROR_VARIABLE to S3 upload to find a Jenkins issue

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

* printing command invocation to try to figure out the errors

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

* Changes the hashing algorithm to sha256 and fixes the cmd used to call to pythojn

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

* wrong path being passed in mac

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

* removes compiler parameters from a config job (after rebase)

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

* more fixes fro deb packaging job

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

* small fix for fingerprint patching for latest

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

* Changing extension of public key and leaving better TODO places for code signing

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

* Removes sdl as a dependency, leaving it commented since it is needed for wwise

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

* fixes runtime copy during install, makes it more consistent with regular runtime dependencies and optimizes copy when there is already an install

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

* $ENV{DESTDIR} and CMAKE_INSTALL_PREFIX cannot be used in cmake_path because the CMAKE_INSTALL_PREFIX is absolute

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

* Fixing some runtime_dependencies optimizations, we cannot take size of a bundle

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

* Fixes warning in mac for an unused variable

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

* Fixes a variable that was being passed to fix qt frameworks

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

* More fixes for Jenkins

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

* Updates email to use for maintainer to match certificate

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

* make directory because in some cases the dependency is copied before the actual library and the directory has to be created

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

* Fix for a new warning/error in linux

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

* The sha file is created after the upload happens, so creating it

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

* remove the size comparison for install since it stomps over the copy from the target and doesnt trigger stripping

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-18 16:26:49 -08:00
puvvadar 38c89e37c2 Re-resolving Base.prefab with stabilization 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-11-18 14:39:20 -08:00
puvvadar 2ab7866702 Re-resolve base.prefab 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-11-18 13:32:11 -08:00
puvvadar cd4eca7f75 Fix missing comma in prefab 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-11-18 11:55:38 -08:00
jckand-amzn 06e5c394e2 Updating AssetBrowser tests around new TableView model and removed several xfails from tests that now pass (#5727) 
Signed-off-by: jckand-amzn <jckand@amazon.com>
 2021-11-18 10:07:19 -08:00
puvvadar 6943db86b5 Merge commit 'a54a149877ee2054b315e9b9276dfec255713f62' into puvvadar/gitflow_211118_o3de 2021-11-18 09:43:27 -08:00
puvvadar 29562fd7c5 Merge commit '6b1fb04a1c3a8515a60fa06fc8cac242e441cba9' into puvvadar/gitflow_211118_o3de 2021-11-18 09:41:49 -08:00
puvvadar 5f0823f3c0 Merge commit '551e6010ddf1f04b3d3d289ef73bacbe4477fa2a' into puvvadar/gitflow_211118_o3de 2021-11-18 09:36:35 -08:00
puvvadar 0623777a51 Merge commit '3ad07a229524b410b5eb2dab0cb0a6197bcdc1a8' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:47 -08:00
puvvadar ebab2f8cf5 Merge commit 'c73417a9c135e7788d10c1ca57a1a916a2d8c17b' into puvvadar/gitflow_211118_o3de 2021-11-18 09:35:08 -08:00
srikappa-amzn 91dd00672a Added more subdirectories and better names for prefab automated tests (#5488) 
* Added more subdirectories and better names for prefab automated tests

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Removed an additional prefab directory prefix for tests

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Removed editor_workflows subdirectory and fixed prefab package casing issue

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>
 2021-11-18 22:32:07 +05:30
John Jones-Steele a54a149877 Changes from comments made after merge (#5738) 
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
 2021-11-18 16:06:54 +00:00
Gene Walters dc28c5019c Adding all 4 network RPC variants with and without parameters to AutomatedTesting to ensure each variant compiles 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-11-17 18:01:41 -08:00
John Jones-Steele 6b1fb04a1c Terrain Supports Physics test (#5706) 
* Terrain Supports Physics test

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-11-17 19:16:30 +00:00
jromnoa ef16207ac5 Merge pull request #5684 from aws-lumberyard-dev/Atom/jromnoa/cherrypick-dev-asset-gpu-test-fixes 
Cherrypick GPU test changes (that also fix issues) to stabilization
 2021-11-17 09:06:46 -08:00
Tommy Walton 1e42261d76 Merge remote-tracking branch 'upstream/development' into amzn-tommy/gitflow_211116_o3de2 
Signed-off-by: Tommy Walton <waltont@amazon.com>
 2021-11-17 09:04:04 -08:00
Mike Balfour 551e6010dd Add support for getting the level entity when prefabs are enabled. (#5680) 
* Add support for getting the level entity when prefabs are enabled.

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

* Made a little prettier.

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

* Addressed PR feedback plus fixed the crash when the level component failed to add.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2021-11-16 19:23:53 -06:00
jromnoa a38c59372c improve docstring descriptions for FOV degrees and Asset.id not asset paths for diff asset properties 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:02:46 -08:00
jromnoa b36ad7aaff move component descriptions above the property param in the docstrings 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:02:23 -08:00
jromnoa d07cbb7af6 add AtomComponentProperties.grid('Secondary Grid Spacing') direct call, remove fmt:on comment 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:02:15 -08:00
jromnoa 222581318d add some docstring descriptions for Cubemap Texture, Material Asset, Secondary Grid Spacing, & Field of View component properties 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:02:06 -08:00
jromnoa e27e6cc5ef update asset called in global skylight test as well 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:01:58 -08:00
jromnoa 3b0e3a5d52 update golden images for spot light and area light tests, update asset used 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:01:49 -08:00
jromnoa bbbcc94634 saving progress on test fixes to swap branches 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:01:39 -08:00
jromnoa 53275fcb70 add new golden image that uses smaller asset file 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:01:30 -08:00
jromnoa 33493b5c8e add new component property paths to mesh, material, camera, hdri_skybox, and global_skylight components 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:01:17 -08:00
jromnoa 0efb8847aa drop the 'as helper' for TestHelper and re-factor the helper. calls to TestHelper. 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:01:06 -08:00
jromnoa 9c2a50d686 use smaller asset files, fix asset to use asset.id for tests 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:00:55 -08:00
jromnoa c83d0432dd saving initial round of edits for the using the Asset class 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-11-16 16:00:41 -08:00
allisaurus 3ad07a2295 AWSClientAuth updated to use custom CognitoCachingCredentialsProvider (#5525) 
Signed-off-by: Stanko <stankoa@amazon.com>
 2021-11-16 14:50:37 -08:00
Tommy Walton 7bf5f86c05 Merging latest development 
Signed-off-by: Tommy Walton <waltont@amazon.com>
 2021-11-16 13:38:57 -08:00
Tommy Walton 2f30c50dc0 Merge commit 'e1fb2ad368ca933fe6e299df5aeeb328e301c8be' into amzn-tommy/gitflow_211116_o3de2 2021-11-16 12:54:58 -08:00
Tommy Walton 8887b55fc8 Merge commit 'c44d03a40df0899851c6cbd929a673fac48ce82b' into amzn-tommy/gitflow_211116_o3de2 
Signed-off-by: Tommy Walton <waltont@amazon.com>
 2021-11-16 12:53:42 -08:00
nwidmaie 31025f2232 Merge branch 'development' of https://github.com/aws-lumberyard/o3de into Neil_o3de_automation_HDRi_Skybox 2021-11-16 11:12:17 -08:00
Allen Jackson c73417a9c1 {lyn7352} adding more logging to mock asset builder test (#5591) 
* {lyn7352} adding more logging to mock asset builder test

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

* put the guts of the test case into an event callback


Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2021-11-16 12:21:33 -06:00
chiyenteng a1c67a5203 Fix prefab enabled automated tests (#5626) 
Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2021-11-16 17:56:24 +00:00
Nicholas Van Sickle 6067575624 Merge pull request #5603 from aws-lumberyard-dev/jckand/SliceDeprecationAutomationUtils 
Adding in-memory prefab creation helpers for DynVeg tests
 2021-11-16 09:45:02 -08:00
jckand-amzn d2d83079eb Cleaning up test docstring 
Signed-off-by: jckand-amzn <jckand@amazon.com>
 2021-11-15 18:30:06 -06:00
jckand-amzn e5ebdaebcf Removing unused helper for now and utilizing helper function for opening base level 
Signed-off-by: jckand-amzn <jckand@amazon.com>
 2021-11-15 18:27:52 -06:00
jckand-amzn 05caf1b29d Removed redundant append to components list from add_component() 
Signed-off-by: jckand-amzn <jckand@amazon.com>
 2021-11-15 17:50:42 -06:00
jckand-amzn 60f7ea54aa Reverting unintentional change to create_vegetation_area() helper 
Signed-off-by: jckand-amzn <jckand@amazon.com>
 2021-11-15 17:45:52 -06:00