55e1da64bb
Renamed a function and improved comments
2021-05-28 02:29:09 -07:00
be6cee806d
Show detach prefab only when a single instance is selected
2021-05-28 02:14:28 -07:00
dc4a15628f
Remove unused GetNestedInstance method in Prefab Instance class
2021-05-28 00:43:31 -07:00
57913d8378
A couple of bug fixes
2021-05-27 18:19:28 -07:00
c21a59af50
Remove print dom for debug previously
2021-05-27 17:19:32 -07:00
053e273b97
Clear dirty entities at the end of InstantiatePrefab logic
2021-05-26 18:24:49 -07:00
4fc7d72b2b
modify DetachPrefabFromParent function for debugging
2021-05-26 16:49:09 -07:00
4b610058b5
implement function DetachPrefabFromParent in PrefabPublicHandler
2021-05-26 15:47:41 -07:00
0ffaa5429b
Fixed a linux build error where an implicit conversion to const ref is not supported
2021-05-26 11:31:16 -07:00
7d3dcf85f6
Merge branch 'main' into Prefab/RemoveUndoCacheDependency
2021-05-26 10:47:35 -07:00
5a41746683
Fixed a comment and added a forward declaration
2021-05-26 10:46:00 -07:00
8ca3b078a2
Remove bootstrap.cfg and some references to it.
...
Merge pull request #836 from aws-lumberyard-dev/LYN-2461
2021-05-26 09:32:57 -07:00
ca5e629dac
Hasareej lyn 2301 cluster space 2 ( #843 )
...
Initial Implementation of the ViewportUi Space Cluster
2021-05-26 17:12:30 +01:00
1c7d5e5615
Merge branch 'main' into transform-float-scale-continued
2021-05-26 10:27:18 +01:00
5eb3bcdf55
Merge pull request #932 from aws-lumberyard-dev/carlitosan-beta-fixes
...
SC support for unordered_set, version upgrade improvements and bug fixes
2021-05-25 17:39:06 -07:00
4dd08ec21f
Added a default level prefab concept for newly created levels ( #931 )
...
* Started update for prefab based initial asset inclusion
* Newly Created levels now use a template prefab
* Review feedback changes
* Moved to better asset-based queries to generate the full path.
* Removed pesky pragma
* Replaced with const name instead of literal string
2021-05-25 18:15:19 -05:00
bdf9ac31fb
update to use uniform scale calls to Transform
2021-05-25 22:31:41 +01:00
be9c9d9fa3
Remove prefab undo cache dependency on CreatePrefab use case
2021-05-25 12:57:16 -07:00
f7309ddd0b
Merge branch 'main' into carlitosan-beta-fixes
2021-05-25 12:13:03 -07:00
c1e7970dbb
Add support for unordered_set to ScriptCanvas. Improved graph version upgrade systems and fixed related bugs.
2021-05-25 12:07:14 -07:00
ec1d129100
Merge branch 'main' into transform-float-scale
2021-05-25 19:21:32 +01:00
ad3625c2a2
Added ability to specify a default directory for the asset picker in the asset property control ( #903 )
...
* Framework for setting default directory in asset picker
* Asset Picker will default to a passed in default directory in the selection model
* Added comment to the property to help define what is expected.
* Fixed string assignment
* Removed commented out #pragma
* Addressed review feedback
* Addressed review feedback
2021-05-25 11:57:49 -05:00
92311ddf0d
more tidying up
2021-05-25 15:43:04 +01:00
42c5801c52
Merge branch 'main' into transform-float-scale
2021-05-24 23:01:29 +01:00
d4bad61f9a
DebugDraw gem fixes for Atom ( #885 )
...
* Work in progress on adapting the DebugDraw gem to use AzFramework::DebugDisplayRequests API
* Cleanup fixes for DebugDisplayRequestBus & DebugDraw gem.
Remove SandboxIntegration implementation of the DebugDisplayRequestBus
Add DrawWireCylinder & DrawWireCone to the DebugDisplayRequestBus interface
Remove SetFillMode & DrawTexture functions from the DebugDisplayRequestBus interface
Fixup uses of the SetFillMode api, replace with new Draw[Wire|Solid]X functions.
Fixes to the DebugDraw gem to get it compiling with new warnings settings.
* Changes to get the DebugDraw gem working with Atom/RHI/Code/Include/Atom/RHI
Add GetWidth, GetHeight, GetDepth utility accessors to RHI::Viewport
Start cleaning out unnecessary Cry includes from DebugDraw gem
Fixes for AtomFont FFont.cpp 3d screen aligned text drawing.
Clean out no longer supported code for 3d text to render multiple strings for the same entity location
* Cleanup some unused or commented code
* Update with PR feedback from Nick Van Sickle
2021-05-24 16:49:00 -05:00
86932f95d6
Fix more Linux test failures.
2021-05-24 13:08:25 -07:00
fadd227698
fix aztoolsframework tests
2021-05-24 16:30:24 +01:00
0315d97fe6
fix white box editor physics tests
2021-05-24 13:51:26 +01:00
945f55378e
merge from main
2021-05-24 11:27:43 +01:00
ff2a6c3acd
Asset hint displays product name instead of source name
2021-05-21 20:14:30 -07:00
d369912727
Merge branch 'main' into LYN-2461
2021-05-21 16:41:46 -07:00
6f23138338
Merge pull request #809 from aws-lumberyard-dev/cgalvan/DuplicateEntities
...
[LYN-2255] Implemented duplication of entities with prefabs.
2021-05-21 15:33:54 -05:00
d785b3310f
Make sure to autoscroll to a selected entity after a rename ( #872 )
2021-05-21 14:56:59 -05:00
21620a0d73
[LYN-2255] Fixed additional alias replacement case, and removed now unneeded specific alias replacement.
2021-05-21 14:19:00 -05:00
e54963f0a9
Set project_path in the SettingsRegistry in the test SetUp() functions for tests that require a project to be set
2021-05-21 11:00:50 -07:00
3d1fa538c2
[LYN-2255] Added extra protection for duplicate replacement of alias logic by bookending the strings.
2021-05-21 12:05:24 -05:00
20ee399864
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities
2021-05-21 10:54:44 -05:00
01f31cdc56
Move the basic Prefab workflows out from behind the WIP flag ( #769 )
...
* Move the basic Prefab workflows out from behind the WIP flag
2021-05-20 14:44:27 -07:00
1a15007dcb
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities
2021-05-20 14:44:36 -05:00
c105894aa5
[LYN-2255] Made PrefabTestFixture have the prefab system enabled so that the duplicate tests pass on Jenkins (they rely on the PrefabEditorEntityOwnershipInterface being registered).
2021-05-20 14:28:04 -05:00
ff35804ce3
Change prefab assert to warning
2021-05-20 11:19:27 -07:00
c93c457356
Merge pull request #772 from aws-lumberyard-dev/Prefab/Create/PositionFix
...
LYN-3833 | Position of entity is different after creating it into a prefab
2021-05-20 10:32:42 -07:00
8d8504aec3
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities
2021-05-20 10:40:50 -05:00
2d89c60175
[LYN-2255] Updated Prefab Duplicate to select the newly duplicated entities. Also addressed some other PR feedback.
2021-05-20 10:39:57 -05:00
eb31d90ad9
Updates to fix BoxSelect when using Orbit with the new Camera ( #825 )
...
* update camera controller to block box select during orbit
* simplify update for modern viewport camera controller
* wip working lmb box select with orbit
* add test for changes to click detector
* add unit test for camera system to validate events
* remove debugging code, tidy-up changes for PR
* small updates before posting PR
* fix for linux build failure
2021-05-20 15:54:36 +01:00
2112d67b6b
Rename variable to make it clearer it's a map
2021-05-19 16:15:18 -07:00
e638c6b0d5
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into Prefab/Create/PositionFix
2021-05-19 15:30:48 -07:00
815e750439
Merge pull request #94 from aws-lumberyard-dev/LY-113714
...
Ly 113714 QT Widget component card updates - Array: Bold title and add separator bar.
2021-05-19 16:05:35 +01:00
7def4741cd
merge from main
2021-05-19 12:14:25 +01:00
977030a27a
On prefab creation, inherit the patches when moving the nested prefab instances and then update the link with the new parent if necessary.
2021-05-18 17:53:27 -07:00
srikappa
chiyteng
SJ
Hasareej
greerdv
carlitosan
Terry Michaels
chcurran
rgba16f
mnaumov
cgalvan
Chris Galvan
chiyenteng
Danilo Aimini
Tom Hulton-Harrop
daimini
sphrose