Commit Graph

869 Commits

Author SHA1 Message Date
pappeste a421b4cb71 Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/LYN-2948
# Conflicts:
#	scripts/o3de.py
2021-05-26 09:06:49 -07:00
lumberyard-employee-dm 922099050b Simplified the o3de package gem enable/disable logic
The add_gem_project and remove_gem project scripts, now just enables on
a gem name basis instead of a CMake target basis

Updated the ProjectManager code and scripts to account for the
add_gem_project and rmeove_gem_project script changes.
2021-05-26 04:46:16 -05:00
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
pappeste b0527387a1 Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/LYN-2948 2021-05-25 19:24:14 -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
pappeste df44f782f2 More dependencies fixes 2021-05-25 18:11:48 -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
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
phistere 59254cc9e7 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 15:44:50 -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 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
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
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
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
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
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
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
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
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 92311ddf0d more tidying up 2021-05-25 15:43:04 +01:00
greerdv ccccfb2c5b more tidying up 2021-05-25 14:56:08 +01:00
greerdv 6fe8b972a4 fix formatting 2021-05-25 13:46:30 +01:00
greerdv a037062a07 move trackview changes to another branch 2021-05-25 13:31:39 +01:00
greerdv e0fc4cd985 some tidying up 2021-05-25 13:11:05 +01:00
sphrose d15cbdbbc8 Merge pull request #865 from aws-lumberyard-dev/LYN-2139
LYN-2139 UX: Goto Position modal is unnecessarily massive
2021-05-25 08:15:14 +01:00
Benjamin Jillich 36c23b5d1a [LYN-2522] Filtering for gem catalog (#867)
* Added sort filter proxy model for gem model that can filter based on name, gem origin, supported platform, features and/or types.
* Added new filter pane on the left with several filter categories for gem origin, type, platform and feature.
* Added filter category widget which is a collapsable generalized checkbox group that can interact with the proxy model and thus control filtering.
* Removed fixed size of the project manager. The application should always be resizable.
2021-05-25 07:17:23 +02:00
pappeste db0db5c1c0 Proper dependencies to LmbrCentral/LmbrCentral.Editor, mixing those two can cause Editor modules to load non-Editor modules 2021-05-24 18:57:48 -07:00
greerdv 42c5801c52 Merge branch 'main' into transform-float-scale 2021-05-24 23:01:29 +01:00
greerdv 5ef515813e fix another test 2021-05-24 23:01:02 +01:00
rgba16f d4bad61f9a DebugDraw gem fixes for Atom (#885)
* Work in progress on adapting the DebugDraw gem to use AzFramework::DebugDisplayRequests API

* Cleanup fixes for DebugDisplayRequestBus & DebugDraw gem.

Remove SandboxIntegration implementation of the DebugDisplayRequestBus
Add DrawWireCylinder & DrawWireCone to the DebugDisplayRequestBus interface
Remove SetFillMode & DrawTexture functions from the DebugDisplayRequestBus interface
Fixup uses of the SetFillMode api, replace with new Draw[Wire|Solid]X functions.
Fixes to the DebugDraw gem to get it compiling with new warnings settings.

* Changes to get the DebugDraw gem working with Atom/RHI/Code/Include/Atom/RHI

Add GetWidth, GetHeight, GetDepth utility accessors to RHI::Viewport
Start cleaning out unnecessary Cry includes from DebugDraw gem
Fixes for AtomFont FFont.cpp 3d screen aligned text drawing.
Clean out no longer supported code for 3d text to render multiple strings for the same entity location

* Cleanup some unused or commented code

* Update with PR feedback from Nick Van Sickle
2021-05-24 16:49:00 -05:00
greerdv adb37b4a76 fix physx editor tests 2021-05-24 21:38:53 +01:00
AMZN-mnaumov 87c6fa3884 Merge pull request #889 from aws-lumberyard-dev/Atom/mnaumov/Atom-15550
[ATOM-15550] Asset hint displays product name instead of source name
2021-05-24 11:29:54 -07:00
AMZN-stankowi b37be6cdbf New AssImp build, just for Windows. This has the crash fix with bones. (#875) 2021-05-24 10:41:19 -07:00
Tommy Walton 838202873a Fix for ATOM-15595 : OctreeNode silently evicts entries that are larger than the size of the root node (#870)
- Fixed a bug where an entry would get removed from the octree when being updated if it was too large to be fully contained by the root node (the desired behavior is that it just lives in the root node)
- Added a unit test to ensure that large entries can exist in the root node
- Updated the unit tests to manually count the number of entries instead of relying on GetEntryCount, since GetEntryCount was reporting an unreliable count before this bug was fixed.
2021-05-24 10:10:50 -07:00
AMZN-stankowi 58adcf168f FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)
* FBX settings can be opened again: g_fbxImporter is set, and if the extension list is empty, it is reloaded.

* auto -> auto*, .size() == 0 -> .empty()
2021-05-24 10:05:12 -07:00
sphrose 576356684b Merge branch 'main' into LYN-2139 2021-05-24 16:32:39 +01:00
greerdv fadd227698 fix aztoolsframework tests 2021-05-24 16:30:24 +01:00
greerdv 76202e4000 fix azcore tests 2021-05-24 14:39:18 +01:00
greerdv 0315d97fe6 fix white box editor physics tests 2021-05-24 13:51:26 +01:00
greerdv 945f55378e merge from main 2021-05-24 11:27:43 +01:00