26b8181cc1
Merge branch 'main' into LYN-1099
2021-05-13 09:18:13 +01:00
ce3842ac84
Merge branch 'main' into non-uniform-scale-compatibility
2021-05-12 22:19:33 +01:00
2679826421
Change SerializeContextTools into a ToolsApplication so that it can correctly read in slice data
2021-05-12 16:03:52 -05:00
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
7bdf44a099
Detect cyclical dependencies in the nested prefabs of the prefab being instantiated
2021-05-12 13:38:44 -07:00
059f69e5e6
tidy up NonUniformScaleService compatibility
2021-05-12 21:20:23 +01:00
98a579abef
Added a comment
2021-05-12 12:17:36 -07:00
559798251d
Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay
2021-05-12 11:55:51 -07:00
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
c1e21185b4
Selecting correct indexes from Asset Browser Model
2021-05-12 12:20:23 +01:00
80684b383b
Code cleanup
2021-05-12 11:42:39 +01:00
552ebea135
Added Simulate button
2021-05-12 11:40:36 +01:00
1c990b2ef6
Filter Sorting Working
2021-05-12 11:03:02 +01:00
f9fb61cc5d
Fix issue with viewport interaction ordering and viewport matrix changed handler ( #695 )
...
* fix for ctrl+mouse-wheel to cycle transform modes in the viewport
* ensure correct callback function is invoked
* remove redundant check in CameraInput
2021-05-12 09:40:37 +01:00
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
35500981eb
More removal fixes
2021-05-11 16:36:44 -07:00
7f5962d1ba
disable AssetJobsFloodTest.ContainerCoreTest_BasicDependencyManagement_Success test ( #703 )
2021-05-11 15:23:43 -07:00
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
3169b3477d
Adding missing files to azframework_files.cmake and fixing include errors due to network removal
2021-05-11 15:15:35 -07:00
318f97a717
build fix for removed gridmate headers
2021-05-11 14:28:10 -07:00
74385a575f
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-11 13:43:17 -07:00
33af6c1014
Merge branch 'main' into Prefab/CreatePrefab
2021-05-11 13:41:48 -07:00
21dfcfed74
Fix bug where setting autoLoad to false for one gem will prevent every gem after it from loading as well.
2021-05-11 15:26:07 -05:00
3e13dd52d1
First pass, removing gridmate touchpoints from AzFramework and non inclusive terminology purge
2021-05-11 12:47:15 -07:00
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
fe29318293
Make ScriptTimePoint::Get const correct
2021-05-11 12:18:49 -07:00
7ff5c0e105
Add multiline spacing and GetTextSize to Atom Font
2021-05-11 12:18:04 -07:00
b11234097d
Fixed a capitalization issue
2021-05-11 11:30:16 -07:00
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
c2a9ab18e4
Merge branch 'main' into Spawnable/ProductDependency
2021-05-11 09:59:50 -07:00
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
0114a82294
Merge branch 'main' into ly-as-sdk/LYN-2948
2021-05-11 10:52:47 -05:00
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
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
b08643d9da
Use renamed functions in stylesheet.
2021-05-11 11:24:51 +01:00
7276253c42
renamed function
2021-05-11 08:20:44 +01:00
9bea26511f
Merge branch 'main' into LY-113714
2021-05-11 08:06:16 +01:00
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
8ddfcabae7
Removed unneeded comments ( #673 )
2021-05-10 22:02:30 -05:00
286a1aafa9
Clang build fix
2021-05-10 19:11:51 -07:00
5cff7994bf
Small update to AssetJsonSerializer result assignment
2021-05-10 19:00:24 -07:00
12fb07c3e3
Fix for failing AssetJsonSerializer conformity tests
2021-05-10 18:56:29 -07:00
36911723c2
Addressed PR feedback
2021-05-10 18:17:39 -07:00
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
5838436e31
Merge branch 'main' into ly-as-sdk/LYN-2948
...
# Conflicts:
# CMakeLists.txt
2021-05-10 14:36:20 -07:00
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
f7ea02afdc
Fix for NetworkingProcessor using CreateSpawnable without ReferencedAssets arg
2021-05-10 13:21:13 -07:00
9255e4c191
Added non const getter to SerializedAssetTracker
2021-05-10 13:05:29 -07:00
17ccf90480
Updated function header comment
2021-05-10 12:59:16 -07:00
4c0fdf78bc
Added error messaging, cleaned up LoadReferencedAssets
2021-05-10 12:56:54 -07:00
jjjoness
greerdv
Mike Balfour
srikappa-amzn
srikappa
nvsickle
bosnichd
igarri
Tom Hulton-Harrop
kberg-amzn
karlberg
sharmajs-amzn
sconel
mbalfour
sconel
phistere
sphrose
Danilo Aimini
Terry Michaels
pappeste