Commit Graph

2445 Commits

Author SHA1 Message Date
lumberyard-employee-dm 59934e6be1 Updating the ProjectManager code and scripts with new layout of the o3de package scripts 2021-05-26 00:23:21 -05:00
lumberyard-employee-dm 76fe7f3666 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 23:48:55 -05:00
lumberyard-employee-dm 80f9da800a insert the scripts/o3de folder to the front of the sys.path for the o3de.py script to allow the o3de package scripts to be imported 2021-05-25 22:27:28 -05:00
michabr 29163fba1a Replace call to Cry renderer to get viewport height (#939) 2021-05-25 18:51:37 -07:00
Chris Burel 03ec6465b5 Support deserializing non-reflected enums (#815)
The serialize context allows users to reflect fields that are enums to
a class without reflecting the enum type itself with the EnumBuilder. In
this case, the serialize context stores the mapping of the enum's typeid
to the underlying type's typeid. When asking for the class data for the
enum typeid, the underlying type's class data is returned. This was
throwing off the json serializer, which would then see that the type was
"unsigned int" instead of an enum, and attempt to load the unsigned int
value. The unsigned int deserializer would then complain, because the
incoming typeid was the typeid of the enum, and not equal to the typeid
of unsigned int.

This change adds support for detecting the non-reflected enum, and
loading it properly.
2021-05-25 18:49:06 -07:00
carlitosan 5eb3bcdf55 Merge pull request #932 from aws-lumberyard-dev/carlitosan-beta-fixes
SC support for unordered_set, version upgrade improvements and bug fixes
2021-05-25 17:39:06 -07:00
Chris Santora 004a3bbb37 Merge pull request #861 from aws-lumberyard-dev/Atom/santorac/RemoveScriptContextWarnings
Removed unnecessary "is not a function" warnings from ScriptContext.

All these warnings are followed by returning false, which call sites can use to report warnings where appropriate. In the case of material lua functors, it is not appropriate to report a warning which is why I'm removing these. The material system uses the "Call" API to potentially call a function that may or may not exist, and it is acceptable for that function to be absent.
2021-05-25 17:10:24 -07:00
phistere 9f46e34cc4 Updates to the DefaultProject template
Removes raytracingschenesrg.srgi
Updates to the root scenesrg.srgi (to match AtomSampleViewer)
Adds a SceneSrg.azsli and a README to the template
2021-05-25 18:27:45 -05:00
phistere 3bc5ecd9d9 Fixes a divide by zero in Atom FPS Display 2021-05-25 18:24:43 -05:00
Terry Michaels 4dd08ec21f Added a default level prefab concept for newly created levels (#931)
* Started update for prefab based initial asset inclusion

* Newly Created levels now use a template prefab

* Review feedback changes

* Moved to better asset-based queries to generate the full path.

* Removed pesky pragma

* Replaced with const name instead of literal string
2021-05-25 18:15:19 -05:00
Steve Pham 6136bc270e Remove flaky test from AzNetwork instead of using retry
- Remove '--repeat until-pass' from profile test ctest argument
- Moved flaky TCP tests from main googletest suite to sandbox
- Added 'TARGET' to 'ly_add_googletest' to support adding the same module to multiple tests or adding a test that is not named the same as the module
- Fix minor bug in ly_add_googletest
2021-05-25 16:05:40 -07:00
Chris Burel dacffc8f07 Remove the "(PREVIEW)" label from the Animation Editor (#926) 2021-05-25 16:05:09 -07:00
mrieggeramzn 56c8f06fe0 Merge pull request #924 from aws-lumberyard-dev/Atom/mriegger/ATOM-15609
Atom/mriegger/atom 15609
2021-05-25 15:48:02 -07:00
phistere fe29728233 Merge branch 'ly-as-sdk/LYN-2948-phistere' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 17:41:22 -05:00
phistere f12162a1cf Update Launcher to find the autoexec.cfg in assets
Was looking in the engine root for the autoexec.cfg, changed it to use
the project assets path.
2021-05-25 17:40:09 -05:00
lumberyard-employee-dm d536a9438d Revert "Fixes an issue with RUNTIME_DEPENDENCIES including too many targets during install"
This reverts commit f972edee01.
2021-05-25 17:36:16 -05:00
lumberyard-employee-dm d3835699ea Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 17:17:55 -05:00
pappeste 19adbf2f41 Removing adding runtime dependencies for gems that are in the BUILD_DEPENDENCIES 2021-05-25 15:12:17 -07:00
lumberyard-employee-dm cfd6c6f93a Merge branch 'ly-as-sdk/LYN-2948-phistere' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 17:00:50 -05:00
lumberyard-employee-dm 79ba6c0ecf Updating the EngineFinder.cmake for the AutomatedTesting project to use the engines_path key 2021-05-25 17:00:26 -05:00
chcurran 24c17932e3 Add error messages to ErrorText.h, label functionality to fix default groups on FDNs. 2021-05-25 14:19:04 -07:00
michabr 713a3fd885 Convert TextureAtlas gem/builder to use Atom (#853)
* Convert TextureAtlas gem/builder to use Atom
* Convert image markup to use Atom image
2021-05-25 14:05:03 -07:00
Alex Peterson 82b4b83256 Launch o3de.exe instead of project_manager.py
Launch the o3de project manager application instead of project_manager.py when the editor is started but no project is specified.
2021-05-25 13:15:15 -07:00
Mike Chang 3d88774050 Inclusive language edit
- Small edit to remove non-inclusive language in a comment
2021-05-25 12:59:24 -07:00
Mike Chang 8950a99c6b Readme update (#770)
- Update to the 3p system. The megazip and CDN addresses are no longer required for mainline (will still need it for 0.5)
- Updates to the min requirements and notes for 3p redistributables
- o3de engine registration instructions
- Direct link to the full docs on the o3de docs site

Co-authored-by: lumberyard-employee-dm & willihay
2021-05-25 12:58:22 -07:00
greerdv c2e965ea5a Merge pull request #909 from aws-lumberyard-dev/transform-float-scale
Adding float equivalents for vector scale functions on Transform
2021-05-25 20:42:29 +01:00
Vincent Liu 87a8f0ddca [LYN-2969] Update resource mapping tool with O3DE icon (#898) 2021-05-25 12:34:08 -07:00
chcurran f7309ddd0b Merge branch 'main' into carlitosan-beta-fixes 2021-05-25 12:13:03 -07:00
chcurran c1e7970dbb Add support for unordered_set to ScriptCanvas. Improved graph version upgrade systems and fixed related bugs. 2021-05-25 12:07:14 -07:00
amzn-hdoke a1514eb0b5 AWSI Gems Automation Update Jenkins configuration (Windows Only) (#923)
AWS Automation test fixes to run on AR.

* Enable AWS automation tests

* Testing by making test part of main suite

* Fix tests target path

* Adding __init__.py for CLI to work

* Revert "Merge pull request #868 from aws-lumberyard-dev/LYN-3974"

This reverts commit 7c2051ae54, reversing
changes made to d8bd6ef407.

* Using absolute path in resource mappings

* Rexporting client auth automation tests level

* Adding null renderer param to AWS automation tests launchers

* Adding rhi null flag to run null renderer

* Remove extra hyphen from rhi param

* Updating rhi param

* Adding rhi param to launcher

* Fix rhi param and reexport client auth levels

* Disable AWS automation tests and remove client auth levels'
2021-05-25 11:27:11 -07:00
greerdv ec1d129100 Merge branch 'main' into transform-float-scale 2021-05-25 19:21:32 +01:00
greerdv d2c982df98 address PR feedback 2021-05-25 19:21:04 +01:00
jromnoa 35f09b0c3a Merge pull request #916 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6689-remove-testrail-info-from-tests
SPEC-6689: Remove TestRail info from Atom renderer tests.
2021-05-25 11:15:18 -07:00
sharmajs-amzn 3aa6969d19 disabling rccontrollertest (#874) 2021-05-25 11:13:29 -07:00
Mike Balfour 0be75732cc Added initial support for nested slices to slice-prefab converter (#881)
Nested slices are now detected, converted into prefabs, and the top-level prefab will get linked to the nested prefabs with the proper number of instances.  However, the nested prefabs won't retain any of the slice override values or parent entity hierarchy.  That will (hopefully) be added in a separate PR.

This also adds support for better relative source paths for nested prefabs.  To support this, the tool now needs to connect/disconnect with the AssetProcessor to be able to turn a slice asset ID into a relative source path, so that nested templates can be looked up and converted correctly.
2021-05-25 12:44:34 -05:00
AMZN-nggieber 1d50d7ed64 Project Manager Projects Screen Dynamically Shows Projects Loaded from O3DE (#873)
* Projects Home Screen Dynamically displays Projects from O3DE and can open Project settings editor

* Seperated out CreateProjectCtrl and UpdateProjectCtrl

* Moved source level statics back into class headers

* Updated background image location
2021-05-25 10:16:11 -07:00
jromnoa 72d394dfca Revert "merging latest main"
This reverts commit 2c6c639ede.
2021-05-25 10:09:08 -07:00
jromnoa 47df212ecd Revert "revert accidental docstring change"
This reverts commit bdedf419b4.
2021-05-25 10:08:51 -07:00
jromnoa bdedf419b4 revert accidental docstring change 2021-05-25 10:08:11 -07:00
jromnoa 2c6c639ede merging latest main 2021-05-25 10:05:55 -07:00
jromnoa bae370750b Merge branch 'main' into Atom/jromnoa/SPEC-6689-remove-testrail-info-from-tests 2021-05-25 10:04:22 -07:00
Terry Michaels ad3625c2a2 Added ability to specify a default directory for the asset picker in the asset property control (#903)
* Framework for setting default directory in asset picker

* Asset Picker will default to a passed in default directory in the selection model

* Added comment to the property to help define what is expected.

* Fixed string assignment

* Removed commented out #pragma

* Addressed review feedback

* Addressed review feedback
2021-05-25 11:57:49 -05:00
lumberyard-employee-dm 2126915f6c Merge pull request #34 from aws-lumberyard-dev/ly-as-sdk/Engine-Gem-Tracking
Implemented the RFC for tracking external_subdirectory dependencies in the engine.json
2021-05-25 11:44:56 -05:00
Tom Hulton-Harrop 50f5976e59 Rename and move ModernViewportCameraController (#866)
* rename ModernViewportCameraController to ModularViewportCameraController and move to AtomToolsFramework

* update names and includes after file moves
2021-05-25 17:28:51 +01:00
Scott Romero e765a43eda [main] fixes #871 - external project configure failure
Merge pull request #895 from aws-lumberyard-dev/ext_project_packaging_fix
2021-05-25 09:26:21 -07:00
AMZN-stankowi 1da8c50e8e Temporarily backing out STL changes to unblock mainline (#921)
* Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)"

This reverts commit 58adcf168f.

* Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter"

This reverts commit 798d96f1a2, reversing
changes made to eb31d90ad9.
2021-05-25 08:54:42 -07:00
mriegger 14513af1fe Fix for lowend pipeline not having shadows (needed update call) 2021-05-25 08:48:18 -07:00
greerdv d8b74110ff Merge branch 'main' into transform-float-scale 2021-05-25 16:28:28 +01:00
greerdv b9037df3e0 make transform deprecation warnings less spammy 2021-05-25 15:53:12 +01:00
greerdv 4d75f00436 fix physx editor tests 2021-05-25 15:52:11 +01:00