6ab9d68e69
Merge branch 'main' into ly-as-sdk/LYN-2948
...
# Conflicts:
# Code/Tools/ProjectManager/CMakeLists.txt
# Code/Tools/ProjectManager/Source/GemCatalog.cpp
# Code/Tools/ProjectManager/Source/GemCatalog.h
# Code/Tools/ProjectManager/Source/GemCatalog.ui
# Code/Tools/ProjectManager/Source/GemCatalog/GemCatalog.h
# Code/Tools/ProjectManager/Source/ScreenFactory.cpp
# Code/Tools/ProjectManager/project_manager_files.cmake
# Code/Tools/ProjectManager/source/Qt/GemCatalog.h
2021-05-07 11:05:20 -07:00
e22debec54
ATOM-15465: Helios rollback AssImp SDK version, this fixes the rotation bug ( #608 ) ( #641 )
...
ATOM-15465: Fix issue with incorrect rotation on models.
* Revert "{LYN-3229} Update AssImp package with latest AssImp 3rd party source changes (#545 )"
This reverts commit 06d2050ac4fe6b9d0d0c52e759cf73a9a3f7d3eb.
* bumping version to force assets to reprocess
2021-05-07 10:37:29 -07:00
a8fa7a59d4
CR feedback
2021-05-07 10:03:07 -07:00
05a39a4412
Fix several build failures
2021-05-07 09:54:49 -07:00
c5a06b8953
Restore grid and angle snapping ( #640 )
...
Restore grid and angle snapping (LYN-3367)
2021-05-07 17:21:12 +01:00
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
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
4202f646e4
Merge branch 'main' into non-uniform-scale-ux
2021-05-07 15:20:29 +01:00
9e22268107
feedback from PR
2021-05-07 15:18:51 +01:00
2c6d04f673
feedback from PR
2021-05-07 15:03:57 +01:00
cb4e394784
Remove physics world body notification bus ( #576 )
2021-05-07 14:12:07 +01:00
5e65c5c710
[LYN-2515] Project Manager Gem List Base ( #603 )
...
* [LYN-2515] Project Manager Gem List Base
* Added gem model based on a standard item model
* Added list view using the gem model
* Added item delegate for a gem according to the UX design
* Removed th gem catalog ui file and replaced it with code
* Moved the gem catalog files into a sub folder
2021-05-07 12:05:33 +02:00
c21b4a577d
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-06 19:40:09 -07:00
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
b848e2dcd1
Appease clang
2021-05-06 18:37:52 -07:00
1af6c42e38
Merge pull request #628 from aws-lumberyard-dev/LYN-3636
...
LYN-3636 | Cherrypick to main - Creating a child entity causes an Editor crash in Slice mode
2021-05-06 17:56:32 -07:00
ea8e098e33
Tidy up MultiViewportControllerInstanceInterface
2021-05-06 17:53:23 -07:00
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
7c9053fffc
Move ModernViewportCameraController controller list into EditorViewportWidget
2021-05-06 17:38:19 -07:00
4b1fe9b10b
Fix a comment and minor optimization to the server to client replication window
2021-05-06 17:35:48 -07:00
e8f37bb29f
Merge remote-tracking branch 'upstream/main' into nvsickle/ViewportControllerAPI
2021-05-06 17:16:39 -07:00
8947abcbb7
PR fixes and recommendations
2021-05-06 16:35:01 -07:00
62a84459ee
Fix to begin/end pair that was missed when porting a change from Prefab Outliner to Slice Outliner.
2021-05-06 16:26:24 -07:00
bf38935e85
Updating conformity tests
2021-05-06 14:49:44 -07:00
ad6479967f
changing add NUS button from invisible to read only when NUS component already present
2021-05-06 22:15:00 +01:00
dfd0cbb0fd
Material Editor camera controller zoom respects viewport boundary
2021-05-06 13:10:55 -07:00
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
13a40aba02
Merge pull request #602 from aws-lumberyard-dev/cgalvan/FixedEmptyFloatingWindow
...
[LYN-3439] Make sure the toolbar spacer is created with a parent to prevent an empty floating window.
2021-05-06 11:46:51 -05:00
32b1d52341
[LYN-2515] Added shared gem info class ( #574 )
2021-05-06 18:01:13 +02:00
7dec09d9ae
[LYN-3439] Make sure the toolbar spacer is created with a parent to prevent an empty floating window.
2021-05-06 10:40:24 -05:00
751d13dd7b
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-05 20:07:49 -07:00
a1fe8fe419
Ported the local prediction player controller component
2021-05-05 20:07:16 -07:00
4661da23bb
Cleaned up the flags in the BaseJsonSerializer.h
2021-05-05 17:51:22 -07:00
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
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
9fe893830c
sine fixes to AP model handling, still getting some sporadic asserts in debug
2021-05-05 16:22:13 -07:00
e63c360194
small unrelated fix
2021-05-05 16:21:41 -07:00
724add6365
Fix Project Manager Qt Ui files not Being Autogenerated ( #588 )
...
* Moved Qt files into to renamed 'S'ource
* Updated files after moving all Qt folder into Source
* Updated Source capitalization in cmake files list
* Adding newline to the end of project_manager_files.cmake
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-05-05 15:45:39 -07:00
790e41f675
Reverted previous fix.
2021-05-05 14:21:53 -07:00
1455fcbde6
Asset Bundler - Minor Feedback ( #550 )
...
Asset Bundler - Minor Feedback
* updated the formatting so all lines are shorter than 140 characters
* fixed a few nitpicks that came up on a recent PR
* removed a function that wasn't being used anymore
* updated some error messages based on PR feedback
2021-05-05 13:59:37 -07:00
5b98227a77
Adding newline to the end of project_manager_files.cmake
2021-05-05 14:58:31 -05:00
2044832bb1
Updated Source capitalization in cmake files list
2021-05-05 12:41:05 -07:00
5783bf635b
Fix for LoadLevel not being called. ( #584 )
2021-05-05 13:35:50 -06:00
625aa14aa8
Updated files after moving all Qt folder into Source
2021-05-05 12:31:17 -07:00
76ffff8bb5
Moved Qt files into to renamed 'S'ource
2021-05-05 12:29:06 -07:00
83e2ec6800
Project Manager - Barebones UI Made for All Screens with Basic Flow ( #507 )
...
* Created all barebone screens, a screen factory, and connected basic transitions between screens
* Changed ProjectManager namespace to O3DE::ProjectManager, removed empty new lines, switch to aznumberic_cast usage
* Project Manager - Moved Qt directory into source
2021-05-05 10:46:34 -07:00
dd90c590aa
Merge pull request #564 from aws-lumberyard-dev/MultiplayerPipeline
...
SPEC-6590 Implemented network entities instantiation by network spawnable asset ID
2021-05-05 18:17:44 +01:00
a7224b6379
Integrating github/Helios_RemoveFbxSdk through commit 6dc2604 ( #391 ) ( #560 )
...
Removing FBX SDK, LYN-1045. If you have an issues please reach out to the Helios team.
2021-05-05 09:29:12 -07:00
01976a890c
Removed wireframe from perspective menu and fixed crash on right click ( #575 )
2021-05-05 11:10:19 -05:00
7b95b5e329
Merge pull request #556 from aws-lumberyard-dev/MoveDebugDisplayGlobalID
...
Move g_mainViewportEntityDebugDisplayId from AzToolsFramework to AzFramework
Rename g_mainViewportEntityDebugDisplayId to g_defaultSceneEntityDebugDisplayId
2021-05-05 10:34:17 -05:00
pappeste
AMZN-stankowi
karlberg
Tom Hulton-Harrop
Steve Pham
jackalbe
greerdv
amzn-sean
Benjamin Jillich
sourjon
nvsickle
Danilo Aimini
AMZN-mnaumov
jonbeer
daimini
mnaumov
chiyenteng
cgalvan
Chris Galvan
AMZN-koppersr
AMZN-nggieber
Zaladane
lumberyard-employee-dm
nggieber
bosnichd
SergeyAMZN
Terry Michaels
rgba16f