Commit Graph

804 Commits (3aa6969d199cc4ece38cfe9698f8fda4e591839b)

Author SHA1 Message Date
sharmajs-amzn 3aa6969d19
disabling rccontrollertest (#874) 5 years ago
Mike Balfour 0be75732cc
Added initial support for nested slices to slice-prefab converter (#881)
Nested slices are now detected, converted into prefabs, and the top-level prefab will get linked to the nested prefabs with the proper number of instances.  However, the nested prefabs won't retain any of the slice override values or parent entity hierarchy.  That will (hopefully) be added in a separate PR.

This also adds support for better relative source paths for nested prefabs.  To support this, the tool now needs to connect/disconnect with the AssetProcessor to be able to turn a slice asset ID into a relative source path, so that nested templates can be looked up and converted correctly.
5 years ago
AMZN-nggieber 1d50d7ed64
Project Manager Projects Screen Dynamically Shows Projects Loaded from O3DE (#873)
* Projects Home Screen Dynamically displays Projects from O3DE and can open Project settings editor

* Seperated out CreateProjectCtrl and UpdateProjectCtrl

* Moved source level statics back into class headers

* Updated background image location
5 years ago
Terry Michaels 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
5 years ago
Tom Hulton-Harrop 50f5976e59
Rename and move ModernViewportCameraController (#866)
* rename ModernViewportCameraController to ModularViewportCameraController and move to AtomToolsFramework

* update names and includes after file moves
5 years ago
AMZN-stankowi 1da8c50e8e
Temporarily backing out STL changes to unblock mainline (#921)
* Revert "FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)"

This reverts commit 58adcf168f.

* Revert "Merge pull request #753 from aws-lumberyard-dev/Helios_DataDrivenAssetImporter"

This reverts commit 798d96f1a2, reversing
changes made to eb31d90ad9.
5 years ago
sphrose d15cbdbbc8
Merge pull request #865 from aws-lumberyard-dev/LYN-2139
LYN-2139 UX: Goto Position modal is unnecessarily massive
5 years ago
Benjamin Jillich 36c23b5d1a
[LYN-2522] Filtering for gem catalog (#867)
* Added sort filter proxy model for gem model that can filter based on name, gem origin, supported platform, features and/or types.
* Added new filter pane on the left with several filter categories for gem origin, type, platform and feature.
* Added filter category widget which is a collapsable generalized checkbox group that can interact with the proxy model and thus control filtering.
* Removed fixed size of the project manager. The application should always be resizable.
5 years ago
rgba16f 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
5 years ago
AMZN-mnaumov 87c6fa3884
Merge pull request #889 from aws-lumberyard-dev/Atom/mnaumov/Atom-15550
[ATOM-15550] Asset hint displays product name instead of source name
5 years ago
AMZN-stankowi b37be6cdbf
New AssImp build, just for Windows. This has the crash fix with bones. (#875) 5 years ago
Tommy Walton 838202873a
Fix for ATOM-15595 : OctreeNode silently evicts entries that are larger than the size of the root node (#870)
- Fixed a bug where an entry would get removed from the octree when being updated if it was too large to be fully contained by the root node (the desired behavior is that it just lives in the root node)
- Added a unit test to ensure that large entries can exist in the root node
- Updated the unit tests to manually count the number of entries instead of relying on GetEntryCount, since GetEntryCount was reporting an unreliable count before this bug was fixed.
5 years ago
AMZN-stankowi 58adcf168f
FBX settings can be opened again: g_fbxImporter is set, and if the ex… (#878)
* FBX settings can be opened again: g_fbxImporter is set, and if the extension list is empty, it is reloaded.

* auto -> auto*, .size() == 0 -> .empty()
5 years ago
sphrose 576356684b Merge branch 'main' into LYN-2139 5 years ago
Alex Peterson d112ae403b
Engine settings UX update and basic functionality 5 years ago
mnaumov ff2a6c3acd Asset hint displays product name instead of source name 5 years ago
Ken Pruiksma 31122044d3
Merge pull request #877 from aws-lumberyard-dev/pruiksma/halton
Halton sequence added to AzCore/Math/Random.h with unit tests.
5 years ago
cgalvan 6f23138338
Merge pull request #809 from aws-lumberyard-dev/cgalvan/DuplicateEntities
[LYN-2255] Implemented duplication of entities with prefabs.
5 years ago
pruiksma f3af2722e9 changing floor() to aznumeric_cast<uint32_t>() 5 years ago
pruiksma 35ef2004a6 Halton sequence added to AzCore/Math/Random.h with unit tests. This work is in support of ATOM-13988 for generating sub-pixel camera offsets for TAA jitter. 5 years ago
Terry Michaels d785b3310f
Make sure to autoscroll to a selected entity after a rename (#872) 5 years ago
Chris Galvan 21620a0d73 [LYN-2255] Fixed additional alias replacement case, and removed now unneeded specific alias replacement. 5 years ago
lumberyard-employee-dm f5bc191a55
Exposing the Settings Registry parse error to a Native UI dialog (#864)
* Exposing the Settings Registry parse error to a Native UI dialog

* Fixing format specifier for the rapidjson error offset
5 years ago
Chris Galvan 3d1fa538c2 [LYN-2255] Added extra protection for duplicate replacement of alias logic by bookending the strings. 5 years ago
Chris Galvan 20ee399864 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 5 years ago
Chris Burel d8bd6ef407
Preserve asset ids for assets that fail to load, when deserializing from json (#847)
Sometimes deserializing a Json document happens when asset handlers are not
registered. In that case, `FindOrCreateAsset` will fail to create the
asset, since there's no handler registered to create it. When this happens,
`FindOrCreateAsset` returns an Asset instance with a null asset id. This
effectively causes the json deserializer to lose that data, even in
situations where the the actual asset data doesn't need to be loaded, but
the asset id needs to be preserved.
5 years ago
sphrose 5be021a6de Added comment. 5 years ago
AMZN-stankowi ead54c85d7
Helios - SPEC-6963 - Fixed unused variables in release builds (#856) 5 years ago
greerdv 1a4bdcf651
Merge pull request #855 from aws-lumberyard-dev/non-uniform-scale-blast
remove vector scale from Blast in preparation for its removal from Transform
5 years ago
Tom Hulton-Harrop 74a2735766
Add better support for mouse deltas with camera system (#846)
* add better support for mouse deltas with camera system

* small fixes spotted during review

* rename after review feedback

* small refactor to reduce duplication
5 years ago
sphrose 032201a66b Make goto button primary. 5 years ago
sphrose bbafd8843d Adjusted dialog size. 5 years ago
kberg-amzn c05c100a72
Merge pull request #834 from aws-lumberyard-dev/MultiplayerComponents
Finishing off rewind and backward reconciliation support as well as a bunch of bug fixes and API cleanup.
5 years ago
lumberyard-employee-dm 8028cbbe39
Fixed issue where the SettingsRegistryImpl::LessThan function would set the collisionFound boolean to true when comparing two elements that happened to be at the same address via std::sort. (#857)
In reality there is no such collision and the comparisons needs to early return with false, but not change the collisionFound flag.
5 years ago
karlberg 3dd40171cd Merging latest origin 5 years ago
AMZN-puvvadar fd3927651b
Merge pull request #840 from aws-lumberyard-dev/mpgem_scripting_rpc
Add events for MP Gem RPCs plus BC reflection so ScriptCanvas can respond to them
5 years ago
Alex Peterson cfbae9a18b
add/remove gem python bindings 5 years ago
chiyenteng 01f31cdc56
Move the basic Prefab workflows out from behind the WIP flag (#769)
* Move the basic Prefab workflows out from behind the WIP flag
5 years ago
greerdv 726597ad34 Merge branch 'main' into non-uniform-scale-blast 5 years ago
greerdv 87b1a19df4 remove vector scale from Blast in preparation for removal from Transform 5 years ago
puvvadar ba6f9867f6 Reorder TCP Select early exit 5 years ago
Chris Galvan 1a15007dcb Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 5 years ago
Chris Galvan 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). 5 years ago
puvvadar 80e12a2df3 Fix whitespace delta 5 years ago
puvvadar d26d24d9bd Remove test RTTIs 5 years ago
nvsickle 2d550cc994 Merge remote-tracking branch 'upstream/main' into nvsickle/BootstrapFixes 5 years ago
puvvadar 7ecb00cca1 Cleanup jinja formatting and fix log spam 5 years ago
Danilo Aimini 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
5 years ago
sphrose 3788aa4eec LYN-2139 UX: Goto Position modal is unnecessarily massive 5 years ago
Benjamin Jillich 03b41b620d
[LYN-2522] Preparation work for the filter pane (#799)
* [LYN-2522] Preparation work for the filter pane

* Added arrow up/down icons.
* Extended the gem info with the type (Asset, Code, Tool).
* Extended the model with the type and a helper for converting gem uuids into display names.
* Extended the link widget to be clickable with a custom action, needed for the "Show all/less" for the filters.
* Converting the uuids we get from Python to AZ::Uuids and then back to strings to have them all in the same format.
5 years ago