2555c88fe7
this test needs to be disabled in main, it was supposed to be merged to development before break but got merged to stabilization and then main
...
Signed-off-by: jromnoa <jromnoa@amazon.com >
2021-07-09 07:42:57 -07:00
097dc25424
Fixed the discovery of the dependencies of gem variant aliases which ( #2013 )
...
alias INTERFACE LIBRARY targets.
This was causing the dependent Atom_AtomBridge sub gems from not being
found when generating the cmake_dependencies.*.setreg file containing
the list of gem modules to load
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-09 00:41:25 -05:00
3b1873b045
Merged stabilization/2106 -> development (resolved merge conflicts).
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-08 13:56:47 -05:00
c64f3fa5f9
Merge branch 'development' of https://github.com/o3de/o3de into jckand/DynVegXfailFixes
2021-07-08 13:28:14 -05:00
ea0e38aaf4
Updating expected View menu options for test_Menus_ViewMenuOptions_Work
...
Signed-off-by: jckand-amzn <jckand@amazon.com >
2021-07-08 08:10:09 -05:00
30f8c75613
Merge pull request #1908 from aws-lumberyard-dev/cgalvan/FixLegacyCryIcons
...
Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.
2021-07-07 16:39:46 -05:00
0a68bbdf7c
Updating camera position and null renderer args for launcher test
...
Signed-off-by: jckand-amzn <jckand@amazon.com >
2021-07-07 15:28:55 -05:00
dae44030fd
Merge branch 'development' of https://github.com/o3de/o3de into jckand/DynVegXfailFixes
2021-07-07 15:13:39 -05:00
78752a23a7
Updating null renderer argument for launcher tests
...
Signed-off-by: jckand-amzn <jckand@amazon.com >
2021-07-07 14:30:24 -05:00
02922806a5
Updated gem.json for all top-level Gems. ( #1715 ) ( #1917 )
...
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.
Signed-off-by: Cronin <mikecro@amazon.com >
* Fixed minor formatting issues with RADTelemetry gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to QtForPython gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the Twitch gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to AWSCore gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the AtomTressFX gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the AudioEngineWwise gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CertificateManager gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in summary of CrashReporting gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CustomAssetExample gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in editorPythonBindings gem summary
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ScriptedEntityTweener gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the Gestures gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitetspace in the summary of the GameStateSamples gem
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ExpressionEvaluation gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the default "requirments" field value to be empty string instead
of "None"
This works better with the ProjectManager GemInfoFromPath function.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Correcting "summary" field name
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Added the requirements text to the AudioEngineWwise Gem
This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: Mike Cronin <58789750+micronAMZN@users.noreply.github.com >
2021-07-07 13:29:33 -05:00
b9f70412c4
Moving flaky test test_WindowsAndMac_ComparisonOperations_Success to sandbox test suite ( #1750 )
...
Signed-off-by: sharmajs <sharmajs@amazon.com >
2021-07-07 11:16:14 -07:00
c32f00d73f
Updating/re-enabling skipped/xfailed Dynamic Vegetation automated tests
...
Signed-off-by: jckand-amzn <jckand@amazon.com >
2021-07-07 11:54:00 -05:00
635473e5cf
[LYN-4990] Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-07 11:29:18 -05:00
2f34a35aed
removing .orig file from previous merge
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-06 17:46:24 +01:00
2ea9bfb144
merge stabilization/2106 into development
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-06 17:34:04 +01:00
827805ed83
fix C12712452 - re-link script canvas to correct entities ( #1855 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-07-06 12:28:24 +01:00
9d5a9ff925
NvCloth automated tests use default renderer to be more stable and complete ( #1850 )
...
Signed-off-by: moraaar <moraaar@amazon.com >
2021-07-05 16:52:24 +01:00
1dfe65a3ef
Update AWSNativeSDK-Android revision and enable AWS gems ( #1837 )
...
Signed-off-by: dhrudesh <dhrudesh@amazon.com >
2021-07-04 15:47:17 -07:00
f47e71da36
Merged conflicts from pulling down latest development
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:29:27 -05:00
40f9761f86
Fixed more copyright header issues caused by script replacement
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 16:21:26 -05:00
4c684b1a10
Merge pull request #1657 from aws-lumberyard-dev/carlitosan/scriptcanvas/prefabs
...
Initial prefab integration
2021-07-02 14:05:25 -07:00
b9e06e70d9
Fixed copyright header issues per new validator
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 15:34:04 -05:00
e9dd032a75
Updated gem.json for all top-level Gems. ( #1715 )
...
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.
Signed-off-by: Cronin <mikecro@amazon.com >
* Fixed minor formatting issues with RADTelemetry gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to QtForPython gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the Twitch gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to AWSCore gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the AtomTressFX gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the AudioEngineWwise gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CertificateManager gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in summary of CrashReporting gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CustomAssetExample gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in editorPythonBindings gem summary
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ScriptedEntityTweener gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the Gestures gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitetspace in the summary of the GameStateSamples gem
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ExpressionEvaluation gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the default "requirments" field value to be empty string instead
of "None"
This works better with the ProjectManager GemInfoFromPath function.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Correcting "summary" field name
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Added the requirements text to the AudioEngineWwise Gem
This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-02 15:23:10 -05:00
9f2b31e077
[LYN-4915] [iOS] [Android] awscoreconfiguration.setreg, awsMetricsClientConfigurationsetreg and authenticationProvider.setreg couldn't be loaded when the application starts ( #1716 )
...
[LYN-4915] [iOS] [Android] awscoreconfiguration.setreg, awsMetricsClientConfiguration.setreg and authenticationProvider.setreg couldn't be loaded when the application starts
2021-07-02 11:12:45 -07:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
d365ff51d6
[AWS][Gems] Fix for Linux Release Monolithic Builds ( #1739 )
...
* Add missing 3rd party deps to Metrics gem
Signed-off-by: dhrudesh <dhrudesh@amazon.com >
* Set AWSNativeSDK-linux revision to 5
Signed-off-by: dhrudesh <dhrudesh@amazon.com >
2021-07-02 08:24:42 -07:00
6b27c1d797
fix python test against editor
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-01 11:18:03 -07:00
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com >
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com >
2021-06-30 19:51:55 -07:00
6392788212
Merge pull request #1547 from aws-lumberyard-dev/build_game_launcher
...
Test game launcher with GPU
2021-06-30 21:25:30 +05:30
9814e9dc6c
Adding missing o3de copyright headers
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 16:31:06 -07:00
6fb2558e44
Merge branch 'upstream/development' into genewalt/gitflow_210628
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 15:40:46 -07:00
149863c527
Removed Amazon as Company for QSettings ( #1649 )
...
* Removed Amazon as Company for QSettings
Signed-off-by: Terry Michaels <miterenc@amazon.com >
2021-06-29 14:00:11 -05:00
ee537ae8fa
Address PR comments
...
Signed-off-by: John <jonawals@amazon.com >
2021-06-29 17:43:42 +01:00
773fb4ea74
Add python test case to hydra test utils editor launcher
...
Signed-off-by: John <jonawals@amazon.com >
2021-06-29 17:43:40 +01:00
fd1bb483c0
Address PR comments
...
Signed-off-by: John <jonawals@amazon.com >
2021-06-29 17:43:38 +01:00
1cf1301a07
Add extra comments
...
Signed-off-by: John <jonawals@amazon.com >
2021-06-29 17:43:37 +01:00
478ffeeac6
Remove PythonCoverage runtime component
...
Signed-off-by: John <jonawals@amazon.com >
2021-06-29 17:43:35 +01:00
0e0f266fdd
Provisional implementation of PythonCoverage gem
...
Signed-off-by: John <jonawals@amazon.com >
2021-06-29 17:43:33 +01:00
3e659b5107
fixes the nightly GPU test
...
Signed-off-by: John <jonawals@amazon.com >
2021-06-29 17:43:11 +01:00
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
2021-06-28 19:09:20 -07:00
9dc961ec35
[iOS] Fix incorrect window size being used when rendering on newer iPhones with bigger screens. ( #1625 )
...
* [iOS] Fix incorrect window size being used when rendering on newer iPhones with bigger screens.
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-06-28 17:53:43 -07:00
19695cfd12
"Fixing review comments"
2021-06-28 10:02:30 -07:00
d617e8765b
Disable AWS gems for Linux and Android release monolithic builds ( #1592 )
...
* Disable AWS gems for Linux and Android release monolithic builds
* Update AWS gems add condition
2021-06-25 16:37:41 -07:00
ba0f1ad758
Updated Project Manager O3DE Logos with Rotated Squares Version ( #1595 )
2021-06-25 13:54:02 -07:00
0c468e4c31
"Adding new line"
2021-06-25 09:05:37 -07:00
0ef72afdba
"Resoved Merge Conflicts"
2021-06-25 09:03:53 -07:00
ce143a31f6
Merge branch 'stabilization/2106' into build_game_launcher
2021-06-25 08:22:38 -07:00
ae9e3737c1
""
2021-06-25 08:21:44 -07:00
7d833b87a5
"Resoving merge conflcts"
2021-06-25 08:19:23 -07:00
72ed95f095
"Resolving merge conflicts"
2021-06-25 08:17:36 -07:00
jromnoa
lumberyard-employee-dm
Chris Galvan
jckand-amzn
sharmajs-amzn
hultonha
amzn-sean
Aaron Ruiz Mora
amzn-hdoke
Sandeep
Mike Cronin
Junbo Liang
chcurran
Steve Pham
balibhan
Gene Walters
Terry Michaels
John
SJ
darapan
AMZN-nggieber