3453 Commits

Author SHA1 Message Date
amzn-mike 4c9b3b12cb Merge branch 'stabilization/2106' into V2Mainline 2021-06-16 12:05:28 -05:00
amzn-mike 57b19feca5 Cleanup code 2021-06-16 12:03:47 -05:00
John 15bf2d20ed Merge branch 'development' into TIF/Runtime 2021-06-16 17:23:18 +01:00
IgnacioMartinezGarrido d86e8b63c1 Merge pull request #781 from aws-lumberyard-dev/LYN-1767-AB
LYN-1767 : Asset Browser Search View
2021-06-16 17:05:40 +01:00
Olex Lozitskiy 1eaa11303b sig/network - added r_viewportPos cvar for set the position of a viewport (Windows only)
Example: +r_viewportPos 100 200
Works from a command line or --console-command-file
2021-06-16 11:59:55 -04:00
Nicholas Van Sickle bfeb3e0ab9 Merge pull request #1306 from yuriy0/FullScreenGamePreview
Full screen game preview for Atom viewport
2021-06-16 08:40:29 -07:00
AMZN-stankowi 1fd0886b70 Updated AssImp to v10 for Windows Invert PostRotation matrix in animation chains (#1340) 2021-06-16 08:32:47 -07:00
Olex Lozitskiy fff7cc0e10 Merge pull request #1344 from aws-lumberyard-dev/Network/olexl/redcode_bullet_code_use
[sig/network] Redcoding parts of old Networking that used Bullet external physics code
2021-06-16 09:55:06 -04:00
Tom Hulton-Harrop d9b1ccd323 Add align grid button to Viewport UI (#1311)
* first pass of adding grid snapping button

* update to request current grid size

* show/hide snapping option based on selection

* small tidy-up changes

* small updates following review feedback

* added some unit tests for snapping functionality and some small tidy-up/refactoring

* small refactor to ensure snap to grid ui only appears with snapping enabled

* add missing include to resolve build error

* fixes for build

* add & to make compiler happy
2021-06-16 12:58:01 +01:00
igarri 3ed6b318ab Merge branch 'develop' into LYN-1767-AB 2021-06-16 12:30:10 +01:00
John 0e6a266e89 Remove frontend console tests 2021-06-16 11:47:17 +01:00
John Jones-Steele 0983d1ba45 Changes made to address comments. 2021-06-16 11:22:59 +01:00
pappeste 6ea8017646 Update qt versions and add missing dependency 2021-06-15 17:33:34 -07:00
pappeste 355c5ced1f fixing runtime dependencies for cases with multiple values 2021-06-15 17:33:21 -07:00
srikappa-amzn 604dca1c3e Merge pull request #1349 from aws-lumberyard-dev/BenchMarksReset
Change create-spawnable benchmarks to not destroy created spawnables immediately
2021-06-15 16:18:02 -07:00
AMZN-koppersr 98ff91d854 Removed unused test structure. 2021-06-15 16:12:36 -07:00
Eric Phister 74491c88b8 Fix AssetBuilders when project-path has a trailing slash (#1345)
* Fixes issues with project paths w/ trailing slash

When launching AP with a --project-path that has a trailing slash, the
AssetBuilders would get that slash instead of a normalized version.
This would mess up the params sent to AssetBuilders.

* Missed a variable name replacement

* Addresses feedback on code style guidelines

Removed 'auto' keyword in favor of explicit types.
2021-06-15 17:50:40 -05:00
Yuriy Toporovskyy 7d1a12a14f Bug fix: crash after full screen preview due to dangling pointer 2021-06-15 18:33:44 -04:00
carlitosan 889e6e2b14 Merge pull request #1287 from aws-lumberyard-dev/carlito/stabilization/2106
Remove unwanted entries from ScriptCanvas node palette
2021-06-15 15:01:54 -07:00
AMZN-koppersr 8af45d28be Additional unit tests for the Json Serialization
To cover the recent changes to the return code from containers and the initialization fixes additional unit tests were added. Almost all new tests are part of the conformity test suite so that they test any custom json serializers outside of AzCore that might need to be updated due to the fixes.
2021-06-15 14:14:31 -07:00
AMZN-koppersr 780dd0df9f Container fixes for the Json Serialization
These changes fix the following:
- Containers treat new values as new objects and make sure they're initialized.
- Fixed sized containers behave slightly different and will initialize all values when a new fixed sized container is created.
- Loading any values to a container will now return PartialDefaults instead of defaults used as adding any value to a container no longer makes the container a default as the default is always an empty container.
- The previous doesn't apply to fixed sized containers as those containers are always considered to have the exact number of values they can hold.
2021-06-15 14:14:27 -07:00
AMZN-koppersr f00fa26e12 Separated initializing new and all objects in the Json Serialization
Introduced OperationFlags::InitializeNewInstance to the Json Serialization which allows custom json serializers to indicate that they need to set defaults only to new instances. Objects created to fill in a pointer are considered new objects and serializer can use the new ContinuationFlags::LoadAsNewInstance to also inform that the load is happening on a new object. Serializer that use the InitializeNewInstance flag know that a new object is begin initialized if they're called with an explicit default object.
2021-06-15 14:14:24 -07:00
AMZN-koppersr fcd989c295 Removed unit tests from bool, int and double Json Serialization
A future commit will include a generic test conformity test suite to replace these.
2021-06-15 14:14:20 -07:00
AMZN-koppersr 08abc497f3 Fixed initialization of math types for Json Serialization
Several math types in AzCore deliberately don't initialize through a constructor. This set of changes make sure that they still get properly initialized in the Json Serialization instead having random values.
2021-06-15 14:14:16 -07:00
AMZN-koppersr bc5fc9a191 Added missing reflection to NameJsonSerializerTests 2021-06-15 14:14:12 -07:00
AMZN-koppersr 716e99a8a7 Reverted string change because it cause incorrect string sizes. 2021-06-15 14:14:08 -07:00
AMZN-koppersr a98355e000 Fix PODs not initializing in Json Serialization
When pointers are used new instances are created for pod types, which will have random values at that point. The Json Serialization did not set a value for these if they were explicitly set to defaults. This change adds initialization for explicit defaults in the bool, integer and double serializer plus unit tests to verify.
2021-06-15 14:14:04 -07:00
AMZN-koppersr 6f50207b06 Updated the unit tests for the Json Serialization array fix 2021-06-15 14:14:00 -07:00
Yuriy Toporovskyy 3c46a72672 Bug fix: handle the case where a container has only default elements 2021-06-15 14:13:56 -07:00
srikappa-amzn bd8b6aea8e Moved vector declartion inside state for loop 2021-06-15 14:12:08 -07:00
AMZN-Olex 04f045bfd2 Recoding parts of old Networking that used Bullet external physics code 2021-06-15 15:58:16 -04:00
yuriy0 e40a598648 Bug fix: check for valid extension in case insensitive manner (#1339) 2021-06-15 12:41:58 -07:00
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