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
92c74a1aaa
Fixing minor spacing, spelling, and print formatting.
2021-05-07 20:06:12 -05:00
bedecebdcc
Configures and installs an engine.json generated from a template. Fixes HEADERONLY targets for install. Fixes locating .ico resource file. Fix infinite loop in CMake configure on new projects.
2021-05-07 20:05:05 -05:00
e24827efb3
Fix direct editing of a reference
2021-05-07 17:08:35 -07:00
ae8a49c4ef
fix bad merge
2021-05-07 16:51:53 -07:00
4662290d92
Switching IsPrefabInInstanceAncestorHierarchy to use const refs
2021-05-07 16:50:41 -07:00
47001dc0c3
Merge main
2021-05-07 16:42:51 -07:00
1df2fe1d48
Merging latest origin
2021-05-07 16:28:11 -07:00
1c04160966
Added a missing header
2021-05-07 16:23:14 -07:00
eb8084d3f6
Initial draft for getting instantiation to work immediately after creation is undone
2021-05-07 16:21:23 -07:00
80f6dcd258
Build fixes for android
2021-05-07 16:20:00 -07:00
c4115fca11
Merge branch 'main' into mp_editor_pipeline
2021-05-07 14:14:17 -07:00
4c453bf4b6
Merge pull request #648 from aws-lumberyard-dev/mbalfour/legacy-level-load-fix
...
Changed the level loading code to always set the default mission name.
2021-05-07 16:01:57 -05:00
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
2625e983b8
fixing errors that had wrong condition
2021-05-07 13:22:54 -07:00
2eb494f7c1
Changed the level loading code to always set the default mission name now. the mission system recently got redcoded, so nothing else was setting this name.
2021-05-07 13:21:54 -07:00
5ecd1a583f
Changed the level loading code to always set the default mission name now. the mission system recently got redcoded, so nothing else was setting this name.
2021-05-07 14:23:01 -05:00
9f5987d431
Merge branch 'main' into non-uniform-scale-ux
2021-05-07 19:55:26 +01:00
3817c05d81
fixing unit test
2021-05-07 19:54:59 +01:00
e6146b6608
A quick fix for Asset Processor automated tests ( #644 )
...
These tests broke because RC.EXE is no longer a thing.
A more comprehensive fix and cleanup needs to be performed to
properly remove references to it while still keeping the existing
tests and other things. This just removes as little as is possible
to avoid error.
2021-05-07 11:39:07 -07:00
d2df379fa4
Fixes for AR issues
2021-05-07 11:26:59 -07:00
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
108f4dfdd6
Merge branch 'main' into mp_editor_pipeline
2021-05-06 16:19:15 -07:00
aa51233536
Add Asset serialization for Ctrl+G and related net interfaces
2021-05-06 16:18:13 -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
Danilo Aimini
phistere
daimini
karlberg
srikappa
puvvadar
Mike Balfour
Nicholas Van Sickle
pappeste
mbalfour
greerdv
Nicholas Lawson
AMZN-stankowi
Tom Hulton-Harrop
Steve Pham
jackalbe
amzn-sean
Benjamin Jillich
sourjon
AMZN-mnaumov
jonbeer
mnaumov
chiyenteng