Commit Graph

359 Commits

Author SHA1 Message Date
sphrose 9bea26511f Merge branch 'main' into LY-113714 2021-05-11 08:06:16 +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
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
Tom Hulton-Harrop b2523217c3 Update snapping settings to be stored in the Settings Registry (#646)
* add overload to ActionManager to support capturing an AZStd::function

* move snapping settings to new settings registry

* remove unneeded reference in ViewportSettings

* move viewport setting function implementations to .cpp file

* add more sensible default values for snapping

* fix variable name for angle snapping

* remove const from function prototype value parameters

* add import/export api for free functions

* change from std::bind to a lambda

* remove redundant const for constexpr string_view

* add AZStd alias for std::abs
2021-05-10 18:40:32 +01:00
kberg-amzn bdaa7eb3c1 Merge pull request #544 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components, visibility fixes for gameplay runtime and localprediction player controller component.
2021-05-10 10:23:15 -07:00
bosnichd 440c40e490 Remove (almost) all references to pRenderer (#651)
Remove all references to pRenderer, except from the DebugDraw and LyShine Gems that are still being updated.
2021-05-10 10:05:15 -06:00
jjjoness 9a113c083d Checked all Search boxes and made them compliant with UX specs. 2021-05-10 11:46:16 +01:00
sphrose 29f3185c0b Merge branch 'main' into LY-113714 2021-05-10 11:08:22 +01:00
karlberg 9c23e637a0 Fix for white box test weirdness 2021-05-08 18:24:13 -07:00
karlberg 851323e112 One more test crash fix due to nullptr component application 2021-05-08 10:05:16 -07:00
karlberg 6b9ecc69c9 two more unit test touchpoints where core systems may not be initialized 2021-05-07 20:45:35 -07:00
karlberg eb7a8b386a Fixes for unit tests where component application might be null 2021-05-07 20:40:23 -07:00
Danilo Aimini 656a8443bc Merge pull request #382 from aws-lumberyard-dev/Prefab/Instantiate/Loop
LYN-3245 | Detect circular dependencies on Instantiate Prefab and cancel operation
2021-05-07 18:43:01 -07:00
daimini e24827efb3 Fix direct editing of a reference 2021-05-07 17:08:35 -07:00
karlberg ae8a49c4ef fix bad merge 2021-05-07 16:51:53 -07:00
daimini 4662290d92 Switching IsPrefabInInstanceAncestorHierarchy to use const refs 2021-05-07 16:50:41 -07:00
daimini 47001dc0c3 Merge main 2021-05-07 16:42:51 -07:00
karlberg 1df2fe1d48 Merging latest origin 2021-05-07 16:28:11 -07:00
karlberg 80f6dcd258 Build fixes for android 2021-05-07 16:20:00 -07:00
Nicholas Van Sickle b026b6818b Merge pull request #483 from aws-lumberyard-dev/nvsickle/ViewportControllerAPI
Give MultiViewportControllerInstances a pointer to their parent
2021-05-07 13:53:50 -07:00
greerdv 9f5987d431 Merge branch 'main' into non-uniform-scale-ux 2021-05-07 19:55:26 +01:00
greerdv 3817c05d81 fixing unit test 2021-05-07 19:54:59 +01:00
karlberg d2df379fa4 Fixes for AR issues 2021-05-07 11:26:59 -07:00
karlberg a8fa7a59d4 CR feedback 2021-05-07 10:03:07 -07:00
karlberg 05a39a4412 Fix several build failures 2021-05-07 09:54:49 -07:00
Tom Hulton-Harrop c5a06b8953 Restore grid and angle snapping (#640)
Restore grid and angle snapping (LYN-3367)
2021-05-07 17:21:12 +01:00
Steve Pham 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
jackalbe 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
greerdv 4202f646e4 Merge branch 'main' into non-uniform-scale-ux 2021-05-07 15:20:29 +01:00
greerdv 9e22268107 feedback from PR 2021-05-07 15:18:51 +01:00
greerdv 2c6d04f673 feedback from PR 2021-05-07 15:03:57 +01:00
amzn-sean cb4e394784 Remove physics world body notification bus (#576) 2021-05-07 14:12:07 +01:00
karlberg c21b4a577d Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-06 19:40:09 -07:00
sourjon 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
nvsickle b848e2dcd1 Appease clang 2021-05-06 18:37:52 -07:00
nvsickle ea8e098e33 Tidy up MultiViewportControllerInstanceInterface 2021-05-06 17:53:23 -07:00
AMZN-mnaumov 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
karlberg 4b1fe9b10b Fix a comment and minor optimization to the server to client replication window 2021-05-06 17:35:48 -07:00
nvsickle e8f37bb29f Merge remote-tracking branch 'upstream/main' into nvsickle/ViewportControllerAPI 2021-05-06 17:16:39 -07:00
jonbeer 8947abcbb7 PR fixes and recommendations 2021-05-06 16:35:01 -07:00
jonbeer bf38935e85 Updating conformity tests 2021-05-06 14:49:44 -07:00
greerdv ad6479967f changing add NUS button from invisible to read only when NUS component already present 2021-05-06 22:15:00 +01:00
mnaumov dfd0cbb0fd Material Editor camera controller zoom respects viewport boundary 2021-05-06 13:10:55 -07:00
chiyenteng 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
karlberg 751d13dd7b Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-05 20:07:49 -07:00
karlberg a1fe8fe419 Ported the local prediction player controller component 2021-05-05 20:07:16 -07:00
AMZN-koppersr 4661da23bb Cleaned up the flags in the BaseJsonSerializer.h 2021-05-05 17:51:22 -07:00
AMZN-koppersr 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
AMZN-koppersr 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