Commit Graph

407 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
karlberg 3169b3477d Adding missing files to azframework_files.cmake and fixing include errors due to network removal 2021-05-11 15:15:35 -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
mbalfour 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
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 286a1aafa9 Clang build fix 2021-05-10 19:11:51 -07:00
sconel 5cff7994bf Small update to AssetJsonSerializer result assignment 2021-05-10 19:00:24 -07:00
sconel 12fb07c3e3 Fix for failing AssetJsonSerializer conformity tests 2021-05-10 18:56:29 -07:00
sconel 36911723c2 Addressed PR feedback 2021-05-10 18:17:39 -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
sconel f7ea02afdc Fix for NetworkingProcessor using CreateSpawnable without ReferencedAssets arg 2021-05-10 13:21:13 -07:00
sconel 9255e4c191 Added non const getter to SerializedAssetTracker 2021-05-10 13:05:29 -07:00
sconel 17ccf90480 Updated function header comment 2021-05-10 12:59:16 -07:00
sconel 4c0fdf78bc Added error messaging, cleaned up LoadReferencedAssets 2021-05-10 12:56:54 -07:00
srikappa 886fe22b16 Merge branch 'main' into Prefab/CreatePrefab 2021-05-10 12:31:18 -07:00
srikappa b57dd02d90 Removed a debug print command 2021-05-10 12:28:33 -07:00
sconel 2e9ae76596 Removed print statement, adding in new files that were missed 2021-05-10 12:11:53 -07:00
Colin Byrne 43b474a4b2 O3de updates restricted download (#229)
* fix project centric set current
* Adding newline to project.json template
* Adding newline to engine.json
* Changed register -this-engine to be data driven
* adding build server support
* fix log dir
* fix add remove
* fix template creation for restricted
* fix typos and descriptions
* Add newline to the end of template.json
* Adding newline to the end of assets_scan_folders.seteg
* current_project in global project that creates/edits the .o3de/Registry/bootstrap.setreg
* fix the build server flags
* fix the o3de manifest server portion
* disable project manager tests for now. Its changed too much and lytestools is not working at the moment. I will get back to this later.
* fix the Mac build config
* disable project_test, this is the project manager. It has changed too much for these tests to work at the moment. I'll get back to them

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-05-10 12:03:36 -07:00
srikappa 4994103627 Add const ref function parameters as needed 2021-05-10 11:58:54 -07:00
sconel b04bfc459f Asset Preload fix for json serialization and prefab game mode 2021-05-10 11:46:58 -07:00