6ab9d68e69
Merge branch 'main' into ly-as-sdk/LYN-2948
...
# Conflicts:
# Code/Tools/ProjectManager/CMakeLists.txt
# Code/Tools/ProjectManager/Source/GemCatalog.cpp
# Code/Tools/ProjectManager/Source/GemCatalog.h
# Code/Tools/ProjectManager/Source/GemCatalog.ui
# Code/Tools/ProjectManager/Source/GemCatalog/GemCatalog.h
# Code/Tools/ProjectManager/Source/ScreenFactory.cpp
# Code/Tools/ProjectManager/project_manager_files.cmake
# Code/Tools/ProjectManager/source/Qt/GemCatalog.h
2021-05-07 11:05:20 -07:00
a8fa7a59d4
CR feedback
2021-05-07 10:03:07 -07:00
05a39a4412
Fix several build failures
2021-05-07 09:54:49 -07:00
c5a06b8953
Restore grid and angle snapping ( #640 )
...
Restore grid and angle snapping (LYN-3367)
2021-05-07 17:21:12 +01:00
2633efbd13
Moving SystemUtilsApple.mm and SystemUtilsApple.h from CrySystem to AzFramework to fix linker error when building iOS non-monolithically ( #631 )
2021-05-07 07:34:35 -07:00
347073cbcd
{LYN-2257} Helios - Add Matrix math type for JSON Serialization system ( #561 )
...
* {LYN-2257} Helios - Add Matrix math type to the JSON Serialization system
* Helios/Systems - Add Matrix math type to the JSON Serialization system
* supports both YPR+scale+translation and array of values
* supports Matrix3x3, Matrix3x4, Matrix4x4
Jira: https://jira.agscollab.com/browse/LYN-2257
Tests: Added Serialization/Json/MathMatrixSerializerTests.cpp
* clang compile fixes
* removed typename
* fixing both tests and some default conformity impls
* stablized the comformity test values; rotations drift too much
2021-05-07 09:31:48 -05:00
4202f646e4
Merge branch 'main' into non-uniform-scale-ux
2021-05-07 15:20:29 +01:00
9e22268107
feedback from PR
2021-05-07 15:18:51 +01:00
2c6d04f673
feedback from PR
2021-05-07 15:03:57 +01:00
cb4e394784
Remove physics world body notification bus ( #576 )
2021-05-07 14:12:07 +01:00
c21b4a577d
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-06 19:40:09 -07:00
cd0628f513
Merge pull request #565 from aws-lumberyard-dev/Prefab/PhysX/ColliderFixes
...
Prefab/physx/collider fixes - Addresses collider crashes on starting in game mode
2021-05-06 19:07:58 -07:00
b848e2dcd1
Appease clang
2021-05-06 18:37:52 -07:00
ea8e098e33
Tidy up MultiViewportControllerInstanceInterface
2021-05-06 17:53:23 -07:00
5fb923738e
Merge pull request #614 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15474
...
[ATOM-15474] Material Editor camera controller zoom respects viewport boundary
2021-05-06 17:45:47 -07:00
4b1fe9b10b
Fix a comment and minor optimization to the server to client replication window
2021-05-06 17:35:48 -07:00
e8f37bb29f
Merge remote-tracking branch 'upstream/main' into nvsickle/ViewportControllerAPI
2021-05-06 17:16:39 -07:00
8947abcbb7
PR fixes and recommendations
2021-05-06 16:35:01 -07:00
108f4dfdd6
Merge branch 'main' into mp_editor_pipeline
2021-05-06 16:19:15 -07:00
aa51233536
Add Asset serialization for Ctrl+G and related net interfaces
2021-05-06 16:18:13 -07:00
bf38935e85
Updating conformity tests
2021-05-06 14:49:44 -07:00
ad6479967f
changing add NUS button from invisible to read only when NUS component already present
2021-05-06 22:15:00 +01:00
dfd0cbb0fd
Material Editor camera controller zoom respects viewport boundary
2021-05-06 13:10:55 -07:00
ede1889507
[CherryPick][LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode ( #585 )
...
* [LYN-3398][LYN-3399] Let EditorEntityModel always use the optimized algorithm even in Slice mode (#490 )
2021-05-06 10:39:43 -07:00
751d13dd7b
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-05 20:07:49 -07:00
a1fe8fe419
Ported the local prediction player controller component
2021-05-05 20:07:16 -07:00
4661da23bb
Cleaned up the flags in the BaseJsonSerializer.h
2021-05-05 17:51:22 -07:00
ec52e51476
Additional unit tests for the Json Serialization to make sure custom json serializer work if they're the first used through the higher Load/Store calls.
2021-05-05 17:22:57 -07:00
6ad135f35c
Fix for smart pointers being loaded through the main load point with a default JSON object.
2021-05-05 16:41:54 -07:00
9fe893830c
sine fixes to AP model handling, still getting some sporadic asserts in debug
2021-05-05 16:22:13 -07:00
790e41f675
Reverted previous fix.
2021-05-05 14:21:53 -07:00
dd90c590aa
Merge pull request #564 from aws-lumberyard-dev/MultiplayerPipeline
...
SPEC-6590 Implemented network entities instantiation by network spawnable asset ID
2021-05-05 18:17:44 +01:00
7b95b5e329
Merge pull request #556 from aws-lumberyard-dev/MoveDebugDisplayGlobalID
...
Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework
Rename g_mainViewportEntityDebugDisplayId to g_defaultSceneEntityDebugDisplayId
2021-05-05 10:34:17 -05:00
45cbe4767f
adding comment to AddNonUniformScaleButton
2021-05-05 15:14:50 +01:00
a49017ec23
merging from main
2021-05-05 13:26:08 +01:00
e1f7d04bc2
adding icon for non-uniform scale component
2021-05-05 13:10:01 +01:00
cec56d7b27
Merge pull request #546 from aws-lumberyard-dev/hultonha_LYN-2315_camera-phase-4
...
Camera Updates - Part 4
2021-05-05 09:46:56 +01:00
7eb6cc10b6
Made change affect all modifiable containers.
2021-05-05 08:57:39 +01:00
7963924b6a
Removing extra commented code
2021-05-04 18:27:09 -07:00
5e6d058a43
Removing default case to fix crash and updating tests
2021-05-04 18:23:02 -07:00
30625cf5d3
merge from main
2021-05-05 00:09:25 +01:00
e414cc151d
SPEC-6590 Implemented network entities instantiation by network spawnable asset ID
2021-05-05 00:00:06 +01:00
cd93df4ca8
hiding button to add non-uniform scale when there already is a NUS component on the entity
2021-05-04 23:15:51 +01:00
b55e881225
Merge branch 'main' into Prefab/PhysX/ColliderFixes
2021-05-04 15:08:37 -07:00
27472169e2
Change global default scene debug draw id variale declare from static constexpr const to inline constexpr
2021-05-04 17:06:22 -05:00
2d4a17a2fb
Merge branch 'main' into JsonSerializationPointerFix
2021-05-04 13:53:03 -07:00
afcbe4e02b
Small updates based on PR feedback.
2021-05-04 13:51:08 -07:00
a5ccfa6053
Merge pull request #456 from aws-lumberyard-dev/Prefab/CreatePrefab
...
Fix undo for nested prefab creation by providing link patches to the undo node
2021-05-04 13:20:37 -07:00
1c1a9aeab4
Merge remote-tracking branch 'upstream/main' into MoveDebugDisplayGlobalID
2021-05-04 14:40:31 -05:00
593528532f
Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework and rename it to g_defaultSceneEntityDebugDisplayId
2021-05-04 14:36:48 -05:00
pappeste
karlberg
Tom Hulton-Harrop
Steve Pham
jackalbe
greerdv
amzn-sean
sourjon
nvsickle
AMZN-mnaumov
jonbeer
puvvadar
mnaumov
chiyenteng
AMZN-koppersr
SergeyAMZN
rgba16f
sphrose
pereslav
srikappa-amzn