Commit Graph

686 Commits

Author SHA1 Message Date
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
jackalbe 7d91a4c08e {LYN-3787} Fix for infinite loop in the scene builder's import phase (#747)
* This simple fix pops any node that can not be registered using it name and unique ID
* Any scene file (i.e FBX) with the three or more nodes with the same name and parent will sort of work
* After the 2nd child node with the same name and parent will be dropped on export

Tests: added the new AutomatedTesting/Assets/BadAssets/three_same_named_nodes.fbx to regress test this
2021-05-13 17:50:02 -05: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
Mike Balfour 0ae123eae6 Fix AssetContainer behavior with immediate load errors
The AssetContainer was getting "stuck" in the case that it tried to load a missing asset that was already registered with the AssetManager as missing. This fixes the bug, as well as adding a unit test for the specific condition.
2021-05-13 16:08:47 -05:00
greerdv 41ea7a1b81 add stubs for non-uniform scale component mode 2021-05-13 20:52:29 +01:00
mbalfour 7866178f3e Fix AssetContainer behavior with immediate load errors
The AssetContainer was getting "stuck" in the case that it tried to load a missing asset that was already registered with the AssetManager as missing.  This fixes the bug, as well as adding a unit test for the specific condition.
2021-05-13 14:10:45 -05:00
AMZN-nggieber 7ecd1b1761 Rearchitecture Project Manager Screens Workflow and Create Project Settings Ctrl
* Renamed UX screen files and classes to include screen in the name

* Changed screens to emit a screen change request a controller can connect to

* Made ScreensCtrl that owns and manages screens and their changing and history

* Made Project Settings Control managing back and next buttons

* Add Project Setting Model and moved New Project Settings Ui into Screen file

* Goto previous screen always works

* Removed unnecessary QObject namespace from connect calls

* Merged ProjectSettingsModel into ProjectInfo
2021-05-13 10:47:49 -07:00
michabr 9cde3d60e9 Merge pull request #712 from aws-lumberyard-dev/michabr/lyshine_merge
LyShine/UI Editor fixes for Atom
2021-05-13 10:21:01 -07:00
bosnichd 3d84902b24 Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used). (#741)
Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used).
2021-05-13 11:10:44 -06:00
jjjoness 5940f2ebbe Merge pull request #739 from aws-lumberyard-dev/LYN-1099
LYN-1099 DEV TASK - Play Controls
2021-05-13 17:35:17 +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
bosnichd 4aff32e719 More red code (#732)
Remove:
- Code/CryEngine/CryCommon/Platform
- Some unused Code/CryEngine/CryCommon/Mock files
- Code/Tools/CryXML and almost all of Code/Tools/CryCommonTools
- Code/Tools/TestBed/ResourceCompilerImage
- Tools/DeepBandwidthToExcel
- Various .p4ignore files
2021-05-13 08:55:36 -06:00
kberg-amzn 5225fd2c9f Merge pull request #727 from aws-lumberyard-dev/MultiplayerComponents
Some cleanup to better support backward reconciliation as well as dynamic player spawning on connect
2021-05-13 07:46:21 -07:00
amzn-sean 7f79cc8796 RemoveSimulatedBody automatically updates the requested handle to be invalid once removed. (#740) 2021-05-13 15:04:00 +01:00
Hasareej a13c9e8d53 Hasareej lyn 2301 cluster space (#717)
ViewportUi widget anchoring & alignment update.
2021-05-13 14:23:31 +01:00
greerdv 2ef0e70fff Merge pull request #730 from aws-lumberyard-dev/non-uniform-scale-compatibility
update compatibility for non-uniform scale service
2021-05-13 13:42:01 +01:00
amzn-sean d690c3fee4 static rigid body and rigid body component use Handles instead of pointers (#662) 2021-05-13 11:59:22 +01:00
jjjoness 26b8181cc1 Merge branch 'main' into LYN-1099 2021-05-13 09:18:13 +01:00
nvsickle 8fd5c30e13 Address some build/review feedback 2021-05-12 17:47:10 -07:00
nvsickle cb09d542d1 Use the new Atom API instead of the removed r_displayInfo for ViewportTitleDlg 2021-05-12 15:59:21 -07:00
greerdv ce3842ac84 Merge branch 'main' into non-uniform-scale-compatibility 2021-05-12 22:19:33 +01:00
Mike Balfour 2679826421 Change SerializeContextTools into a ToolsApplication so that it can correctly read in slice data 2021-05-12 16:03:52 -05: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
karlberg d0b006c209 Some cleanup to better support backward reconciliation as well as dynamic player spawning on connect 2021-05-12 13:41:18 -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
mbalfour ae9b36c135 PR feedback - now allows for multiple specializations on the command-line, and changed the switch name to "specializations" to reflect that. 2021-05-12 08:56:49 -05:00
jjjoness 552ebea135 Added Simulate button 2021-05-12 11:40:36 +01:00
Tom Hulton-Harrop 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
jjjoness 0cad668f31 Merge branch 'main' into LYN-1099 2021-05-12 08:58:43 +01:00
jjjoness 2558801a24 Commit before merging main 2021-05-12 08:58:16 +01:00
michabr d9cb61575e Fix up particle emitter to work with Atom (#626)
* Fix up particle emitter component to work with Atom

* PR feedback and disable render target tests until supported
2021-05-11 23:16:36 -07: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
karlberg 35500981eb More removal fixes 2021-05-11 16:36:44 -07:00
sharmajs-amzn 7f5962d1ba disable AssetJobsFloodTest.ContainerCoreTest_BasicDependencyManagement_Success test (#703) 2021-05-11 15:23:43 -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