greerdv
18a6134e2d
Merge branch 'main' into non-uniform-scale-manipulators
2021-05-17 13:21:43 +01:00
greerdv
7edef63884
address PR feedback
2021-05-17 13:20:52 +01:00
srikappa-amzn
0cfc7f10a9
Merge pull request #728 from aws-lumberyard-dev/Prefab/CyclicalDependencyCheck
...
Detect cyclical dependencies in the nested prefabs of the prefab being instantiated
2021-05-14 16:33:13 -07:00
greerdv
d878932966
merge from main
2021-05-14 21:04:06 +01:00
srikappa
1a456cc9b9
Marked an our parameter correctly and changed a ref to const ref
2021-05-14 11:48:31 -07:00
greerdv
f2d415ecb8
add functionality for central scale manipulator
2021-05-14 19:38:25 +01:00
nvsickle
cc986f563a
Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay
2021-05-14 10:27:33 -07:00
srikappa-amzn
f6767cec2f
Merge pull request #751 from aws-lumberyard-dev/Prefab/DeletePrefab
...
Fixed bug with delete prefab where the prefabs were not being deleted from the correct instances
2021-05-14 09:52:58 -07:00
greerdv
c8568a7cf2
add feedback from PR
2021-05-14 13:51:02 +01:00
greerdv
068deea918
remove unnecessary overrides
2021-05-14 13:31:25 +01:00
greerdv
e9386bcb9b
remove unecessary overrides
2021-05-14 13:29:54 +01:00
greerdv
737178b928
Merge branch 'main' into non-uniform-scale-manipulators
2021-05-14 12:08:10 +01:00
greerdv
5508bf7e1d
remove unnecessary non-uniform scale manipulator bus
2021-05-14 12:06:44 +01:00
greerdv
d365d00abd
hook up non-uniform scale manipulator callbacks
2021-05-14 11:52:29 +01:00
srikappa
b72836fa8f
Fixed a typo
2021-05-13 18:03:49 -07:00
srikappa
d8865a8f0d
Remove links when deleting prefabs
2021-05-13 17:41:45 -07:00
srikappa
16b2dabde2
Removed additional spacing
2021-05-13 14:51:27 -07:00
srikappa
9328c944b2
Remove an unnecessary check in the if statement
2021-05-13 14:49:06 -07:00
srikappa
7d8180a3bb
Fixed a typo
2021-05-13 14:46:30 -07:00
srikappa
b92a68f5a4
Improved a comment
2021-05-13 14:45:06 -07:00
srikappa
cd4be3a708
Found a better way to find common owning instance
2021-05-13 14:37:22 -07:00
srikappa
76e8a0ef47
Fixed bug with delete prefab where the prefabs were not being deleted from the correct instances
2021-05-13 14:11:47 -07:00
greerdv
41ea7a1b81
add stubs for non-uniform scale component mode
2021-05-13 20:52:29 +01:00
Tom Hulton-Harrop
795aa114e6
Improve selection in the viewport ( #720 )
...
* improve selection in the viewport
* remove debug code
* updates following review feedback
- update API comments from /// to //! from
- add [[nodiscard]] attribute to member function
- move constructor implementations to .cpp files
* use lambda instead of ternary operator
* fix unit test failure caused by typo
2021-05-13 16:19:53 +01:00
Hasareej
a13c9e8d53
Hasareej lyn 2301 cluster space ( #717 )
...
ViewportUi widget anchoring & alignment update.
2021-05-13 14:23:31 +01:00
greerdv
ce3842ac84
Merge branch 'main' into non-uniform-scale-compatibility
2021-05-12 22:19:33 +01:00
srikappa-amzn
1895c2d18d
Merge pull request #675 from aws-lumberyard-dev/Prefab/CreatePrefab
...
Get instantiation to work after creation of a prefab is undone
2021-05-12 13:54:26 -07:00
srikappa
7bdf44a099
Detect cyclical dependencies in the nested prefabs of the prefab being instantiated
2021-05-12 13:38:44 -07:00
greerdv
059f69e5e6
tidy up NonUniformScaleService compatibility
2021-05-12 21:20:23 +01:00
srikappa
98a579abef
Added a comment
2021-05-12 12:17:36 -07:00
nvsickle
559798251d
Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay
2021-05-12 11:55:51 -07:00
bosnichd
7cec2d8b07
Remove more unused things from CryCommon and CrySystem. ( #709 )
...
Lots of unrelated removals, I basically tried to remove everything exposed via gEnv that isn't used anymore, and following the threads found a few other things to remove also.
2021-05-12 08:30:15 -06:00
kberg-amzn
deae9db5c2
Merge pull request #704 from aws-lumberyard-dev/MultiplayerComponents
...
Removing unused GridMate touchpoints from AzFramework, and non-inclusive code removal
2021-05-11 17:51:03 -07:00
sconel
4e54df49db
Merge pull request #438 from aws-lumberyard-dev/Spawnable/ProductDependency
...
AddProductDependency to handle inter-product dependencies in PrefabProcessors
2021-05-11 15:19:01 -07:00
karlberg
318f97a717
build fix for removed gridmate headers
2021-05-11 14:28:10 -07:00
karlberg
74385a575f
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-11 13:43:17 -07:00
srikappa
33af6c1014
Merge branch 'main' into Prefab/CreatePrefab
2021-05-11 13:41:48 -07:00
karlberg
3e13dd52d1
First pass, removing gridmate touchpoints from AzFramework and non inclusive terminology purge
2021-05-11 12:47:15 -07:00
mbalfour
899d4c438d
Move ThumbnailerNullComponent into AzToolsFramework so that it can be used by other tools that need it.
...
SerializeContextTools will soon rely on this.
2021-05-11 14:25:25 -05:00
srikappa
b11234097d
Fixed a capitalization issue
2021-05-11 11:30:16 -07:00
Mike Balfour
9ccddab552
Merge pull request #694 from aws-lumberyard-dev/mbalfour/slice-prefab-converter
...
Fix up incorrect autoDelete use and handling.
2021-05-11 12:02:28 -05:00
sconel
c2a9ab18e4
Merge branch 'main' into Spawnable/ProductDependency
2021-05-11 09:59:50 -07:00
sconel
2e32b2ee57
Merge pull request #671 from aws-lumberyard-dev/Prefabs/AssetPreload
...
Asset Preload fix for json serialization and prefab game mode
2021-05-11 09:35:06 -07:00
mbalfour
704443ac89
Fix up incorrect autoDelete use and handling.
...
Several UI property handlers were incorrectly using the autoDelete feature by calling UnregisterPropertyType and deleting the pointer themselves, which caused double-delete crashes on application shutdown. PropertyManagerComponent now gracefully handles that condition but also explicitly asserts explaining how the code should be changed, and the "known offenders" have been fixed up to use autoDelete correctly.
2021-05-11 10:25:03 -05:00
Tom Hulton-Harrop
b5e5a3bfee
More camera fixes for the new CameraInput system ( #667 )
...
* use new ViewportContext interface to set camera transform on load
* WIP fixes for camera viewport handler callbacks
* disable synchonization with old camera when new camera system is enabled
* further updates to camera-input
* ensure event is signalled when camera transform is set
* updates to ModernViewportCameraController
* fix for right click menu appearing with camera
* updates following review feedback
* convert std:: usage to AZStd::
2021-05-11 13:38:09 +01:00
Danilo Aimini
d61c93a7b6
Merge pull request #431 from aws-lumberyard-dev/Prefab/Create/IgnoreLevel
...
LYN-3211 | Create Prefab can be triggered on the Level Container, generating an invalid level hierarchy
2021-05-10 23:09:51 -07:00
Terry Michaels
8ddfcabae7
Removed unneeded comments ( #673 )
2021-05-10 22:02:30 -05:00
sconel
36911723c2
Addressed PR feedback
2021-05-10 18:17:39 -07:00
nvsickle
3c315df36f
Fix Camera transform property notifications.
...
Moves transform notification logic from CComponentEntityObject::InvalidateTM (which will eventually go away) to AzToolsFramework::TransformComponent::OnTransformChanged.
We also specifically make sure PropertyEditorEntityChangeNotifications::OnEntityComponentPropertyChanged fires, which is used by Track View to detect camera position changes.
2021-05-10 15:08:41 -07:00
sconel
93974dd1c5
Seperated queue load and blocking load calls so queue loads aren't interrupted. Added comment about asset dispatch events
2021-05-10 14:22:48 -07:00