Commit Graph

2021 Commits

Author SHA1 Message Date
chcurran 9f7f6e84a4 Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into carlito/stabilization/2106 2021-06-15 12:10:10 -07:00
Mike Balfour ab3aa904f0 Fixed misc slice conversion bugs
* Fixed crash caused by nesting the same slice twice
If the same slice is nested at multiple levels in the same slice hierarchy, the second conversion would reregister the prefab and crash.  Now that case is detected and the slice isn't reconverted.

* Fixed json array patches where multiple elements are removed.
The patches now generate removals from back to front, instead of front to back, so that the indices remain valid as each patch is applied.
2021-06-15 14:00:47 -05:00
srikappa-amzn 9f9c01e781 Used reserve instead of resize 2021-06-15 11:10:45 -07:00
srikappa-amzn 5b4333e4b1 Added a comment and gave a variable better name 2021-06-15 11:07:43 -07:00
AMZN-Olex a446d397c6 Minor name refactoring 2021-06-15 14:05:35 -04:00
srikappa-amzn c8ba42d04f Merge branch 'stabilization/2106' into BenchMarksReset 2021-06-15 10:59:36 -07:00
cgalvan 13c59385a7 Merge pull request #1332 from aws-lumberyard-dev/cgalvan/FixPrefabActionsWhenDisabled
[LYN-4527] Make sure the PrefabIntegrationManager is only created when prefabs are enabled, otherwise could result in crashes.
2021-06-15 12:50:10 -05:00
AMZN-Olex 2f5cffe679 Added r_ViewportPos cvar for set the position of a viewport of a game/server launchers 2021-06-15 13:46:53 -04:00
mnaumov 9ca0e731f4 Merge remote-tracking branch 'upstream/stabilization/2106' into mnaumov/StabilizationJun15
# Conflicts:
#	Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp
2021-06-15 10:41:13 -07:00
yuriy0 aade48e751 Allow smaller values and increments for editor camera speed, allow custom speed values 2021-06-15 10:36:35 -07:00
sconel bd2a2ebcf5 Merge pull request #1293 from aws-lumberyard-dev/Prefabs/RemoveEditorInfoFromNestedContainerEntities
Fix nested container entities not getting editor info removed during prefab processing
2021-06-15 10:36:13 -07:00
John 58ad67dc44 Disable EntityIdGeneration test 2021-06-15 17:44:00 +01:00
John baab0cb43b Disable EntityIdGeneration test 2021-06-15 17:33:57 +01:00
John 2606234cfa Merge branch 'main' into TIF/Runtime 2021-06-15 17:32:21 +01:00
Chris Galvan 1aad201a98 [LYN-4527] Make sure the PrefabIntegrationManager is only created when prefabs are enabled, otherwise could result in crashes. 2021-06-15 10:51:36 -05:00
John Jones-Steele c7a6f3e7e6 Merge branch 'development' into LYN-4195 2021-06-15 09:16:26 +01:00
rgba16f 0198f6121b Rebind the DebugDisplayRequestBus Instance to handle drawing in GameMode. (#1275) 2021-06-14 20:29:37 -05:00
amzn-mike 625e1326e3 Merge branch 'stabilization/2106' into V2Mainline 2021-06-14 19:55:01 -05:00
Alex Peterson ecded991b5 Display error when unable to start Python
Added AzFramework Application, logging, unit tests
2021-06-14 17:02:22 -07:00
amzn-mike 364187a87b Merge pull request #1047 from aws-lumberyard-dev/Helios_AssImp_TransformImporterFix
Fix AssImpTransformImporter logic for bone nodes
2021-06-14 18:41:09 -05:00
AMZN-nggieber 948075fa61 Gem Catalog Allows Filtering by Gem Selected Status Live (#1274) 2021-06-14 15:56:54 -07:00
yuriy0 12c7391bd7 Bug fix: correct RTTI for AttributeInvocable (#1004)
* Bug fix: correct RTTI for AttributeInvocable

* Allow test case to crash if RTTI is wrong

* Revert "Allow test case to crash if RTTI is wrong"

Based on PR feedback, this change adds no value to the test and is confusing.

This reverts commit 6c36065c3759d857cc16ab011d09167261181141.

* Remove perhaps confusing comments and add a more to the point comment

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-06-14 17:29:19 -05:00
sharmajs-amzn 86d0acf76c fixes for invalid drive letter casing for scanfolder (#1281) 2021-06-14 13:55:37 -07:00
Yuriy Toporovskyy 84492dee48 Address some PR feedback
- Use AZ::IConsole instead of deprecated Cry IConsole.
- Create fullscreen preview widget on the same screen where the main window is found, instead of on the 'primary' screen
- Remove "ed_previewGameInFullscreen", which had the effect of always doing a full screen preview. If this functionality is desired, it should be re-added as a registry key instead of a cvar
2021-06-14 16:19:37 -04:00
Mike Balfour 6f61454be4 Added support for remapping entity refs across slice instances (#1284)
* Fixed memory assert on shutdown.
Cleaned up the entity pointers on serialization, so that they no longer leak themselves, their asset references, or anything else within them.

* Added support for remapping entity refs across slice instances.
Slice instances can have components with entity references that have been modified to reference entities in other slice instances, or even in the parent.  This change detects and remaps those references so that they work correctly.
2021-06-14 14:20:39 -05:00
Yuriy Toporovskyy 5becf25a79 Address some PR feedback.
- Better comment explaining signal blocking
- Clang format
2021-06-14 12:14:58 -04:00
Yuriy Toporovskyy 37f70fb47c Address some PR feedback.
- Better variable names
- Close a parenthesis in a comment
- Check equality against nullptr instead of 0
- Add comment to document method of clearing a QLayout
- Format some things
- Const correctness
- Remove a TODO in a comment
- Attempt at removing concatenation of string literal AZ_FUNCTION_SIGNATURE, which might not be a literal on every compiler/platform
2021-06-14 12:08:55 -04:00
Yuriy Toporovskyy 074c3107cd Expose protected method required by full screen preview feature 2021-06-14 11:54:11 -04:00
amzn-mike a3ae330e6d Merge branch 'stabilization/2106' into Helios_AssImp_TransformImporterFix 2021-06-14 10:17:29 -05:00
Chris Burel 6d92f7109f Fix function signature of binary +/- operator to not return a reference (#1285)
This function creates a new object on the stack, and was returning it as
a reference. This would trigger Clang 12's `-Wreturn-stack-address`
warning, and cause the build to fail.

This fixes builds with clang 12, so it closes #591
2021-06-14 08:09:28 -07:00
John Jones-Steele a306d9bf47 Merge branch 'development' into LYN-4195 2021-06-14 15:41:05 +01:00
jjjoness fb4cac08a3 Merge pull request #1304 from aws-lumberyard-dev/FixCrashInWireFrame
Fixes crash in adding WireFrame/
2021-06-14 15:36:37 +01:00
Yuriy Toporovskyy 73d5617af3 Full screen game preview for Atom viewport 2021-06-14 10:02:49 -04:00
amzn-mike 7dc4d8438b Fix non-bone transforms setting the wrong matrix variable
(cherry picked from commit 838a8b47da73e50fca4ea9ee5abc7c33250bf25d)
2021-06-14 08:08:51 -05:00
amzn-mike 9b039c1f9d Fix creating bone data for non-bones
(cherry picked from commit 8d1bdd1456e70e4efc47aa36dce660bc91e7dfcf)
2021-06-14 08:08:31 -05:00
amzn-mike 10999b6999 All bones have animations
(cherry picked from commit d17a8070010cdc5bc4e08d17b1549736d031414a)
2021-06-14 08:06:48 -05:00
amzn-mike 66a030b800 Fix transform data
Use first offsetMatrix for a bone (there may be multiple) and calculate using offsetOfParent * inverseRootOffset * rootOffset * inverseOffset

(cherry picked from commit a8eae976dda39ad28f9aa235e1e6ba34715ac48a)

# Conflicts:
#	Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp
2021-06-14 08:06:25 -05:00
amzn-mike d841f0c0db Got transform result close for 3 bone chain, longer chains are still not correct
(cherry picked from commit 5ac65de6148dcc03b9f2953e97dd943493f23ed9)

# Conflicts:
#	Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpTransformImporter.cpp
2021-06-14 08:03:39 -05:00
John Jones-Steele 4dc9752620 Fixes crash in adding WireFrame/ 2021-06-14 13:50:29 +01:00
Hasareej aee7fc72cc Hiding the 2 Clusters during Gameplay mode (#1211)
Hiding the 2 Clusters during Gameplay mode.
2021-06-14 12:53:58 +01:00
Tom Hulton-Harrop 0f09a6d8bf Move new camera settings to the Settings Registry and connect them to viewport border elements (#1267)
* ensure the new camera respects changing ui values and move camera settings to the settings registry

* factor out creation of modular camera controller

* small updates before posting PR

* updates following review feedback

* updates following review feedback
2021-06-14 12:32:35 +01:00
greerdv d72d988195 Merge pull request #1280 from aws-lumberyard-dev/simd-division-by-zero
avoid some divisions by zero in simd math types
2021-06-14 11:48:32 +01:00
John Jones-Steele 746c57373b Merge branch 'development' into LYN-4195 2021-06-14 09:42:01 +01:00
John Jones-Steele 8a6975131d Modified the link.svg 2021-06-14 09:26:28 +01:00
amzn-mike 9ff007024d Merge branch 'main' into Helios_AssImp_TransformImporterFix 2021-06-13 16:56:44 -05:00
SJ 6fdbce01eb Fix build and link errors in monolithic builds
Merge pull request #1288 from aws-lumberyard-dev/SPEC-7273
2021-06-11 18:40:52 -07:00
sconel e4921c8d0a Fix nested container entities not getting editor info removed during prefab processing 2021-06-11 17:45:46 -07:00
Danilo Aimini f32590d241 LYN-4042 | No UI Indication that Level is Modified (#1277)
* Restore the code that display the dirty marker on the Level container. Ensure the dirty marker is cleared on level save.

* Moving call one level up to allow usage of the SaveTemplateToString function without clearing the dirty flag.
2021-06-11 16:43:53 -07:00
amzn-sj a86062bd91 Skip interface libraries when genrating StaticModules for game server as well 2021-06-11 16:42:09 -07:00
amzn-sj 469b1a0858 Fix monolithic link error involving gem variants which are "aliased" as interface libraries with multiple gem target dependencies 2021-06-11 16:30:46 -07:00