Commit Graph

953 Commits

Author SHA1 Message Date
greerdv ec1d129100 Merge branch 'main' into transform-float-scale 2021-05-25 19:21:32 +01:00
greerdv d2c982df98 address PR feedback 2021-05-25 19:21:04 +01:00
amzn-sj 4bfc000974 The @assets@ alias should not be set to an empty string. 2021-05-25 10:30:02 -07:00
amzn-sj e371d41688 Revert change that caused a seg-fault 2021-05-25 10:21:53 -07:00
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
2021-05-25 11:57:49 -05:00
amzn-sj 83b7122128 project_path must be set before call to Application::Start() in order to set aliases. 2021-05-25 09:30:55 -07:00
greerdv b9037df3e0 make transform deprecation warnings less spammy 2021-05-25 15:53:12 +01:00
greerdv 92311ddf0d more tidying up 2021-05-25 15:43:04 +01:00
greerdv ccccfb2c5b more tidying up 2021-05-25 14:56:08 +01:00
greerdv 6fe8b972a4 fix formatting 2021-05-25 13:46:30 +01:00
greerdv e0fc4cd985 some tidying up 2021-05-25 13:11:05 +01:00
AMZN-koppersr a807c0b4d8 Additional list function added to Spawnables.
A new list function was added to the SpawnableEntitiesInterface that list entities together with the id of the entity in the spawnable that was used to create it.
This change also include the setup for testing the SpawnableEntitiesManager plus a few tests to cover the newly added functionality.
2021-05-24 19:47:15 -07:00
amzn-sj dde35ce42c Fix crash in AssetCatalogDeltaTest 2021-05-24 16:08:09 -07:00
amzn-sj e056fdda6b Revert changes to tests where segfault occurs 2021-05-24 15:42:34 -07:00
greerdv 42c5801c52 Merge branch 'main' into transform-float-scale 2021-05-24 23:01:29 +01:00
greerdv 5ef515813e fix another test 2021-05-24 23:01:02 +01:00
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
2021-05-24 16:49:00 -05:00
amzn-sj 090b770d7e Fix segfault in failing tests on Linux 2021-05-24 14:01:41 -07:00
greerdv adb37b4a76 fix physx editor tests 2021-05-24 21:38:53 +01:00
amzn-sj 86932f95d6 Fix more Linux test failures. 2021-05-24 13:08:25 -07:00
amzn-sj 115f18fcdc Fix Linux test failures 2021-05-24 12:24:46 -07:00
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
2021-05-24 11:29:54 -07:00
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.
2021-05-24 10:10:50 -07:00
greerdv fadd227698 fix aztoolsframework tests 2021-05-24 16:30:24 +01:00
greerdv 76202e4000 fix azcore tests 2021-05-24 14:39:18 +01:00
greerdv 0315d97fe6 fix white box editor physics tests 2021-05-24 13:51:26 +01:00
greerdv 945f55378e merge from main 2021-05-24 11:27:43 +01:00
mnaumov ff2a6c3acd Asset hint displays product name instead of source name 2021-05-21 20:14:30 -07:00
amzn-sj d369912727 Merge branch 'main' into LYN-2461 2021-05-21 16:41:46 -07:00
Ken Pruiksma 31122044d3 Merge pull request #877 from aws-lumberyard-dev/pruiksma/halton
Halton sequence added to AzCore/Math/Random.h with unit tests.
2021-05-21 16:57:23 -05:00
cgalvan 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
pruiksma f3af2722e9 changing floor() to aznumeric_cast<uint32_t>() 2021-05-21 15:10:13 -05:00
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. 2021-05-21 15:00:39 -05:00
Terry Michaels d785b3310f Make sure to autoscroll to a selected entity after a rename (#872) 2021-05-21 14:56:59 -05:00
Chris Galvan 21620a0d73 [LYN-2255] Fixed additional alias replacement case, and removed now unneeded specific alias replacement. 2021-05-21 14:19:00 -05:00
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
2021-05-21 13:18:41 -05:00
amzn-sj 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
Chris Galvan 3d1fa538c2 [LYN-2255] Added extra protection for duplicate replacement of alias logic by bookending the strings. 2021-05-21 12:05:24 -05:00
Chris Galvan 20ee399864 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into cgalvan/DuplicateEntities 2021-05-21 10:54:44 -05:00
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.
2021-05-21 08:39:10 -07:00
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
2021-05-21 12:07:55 +01:00
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
2021-05-21 10:35:33 +01:00
Chris Santora 3a3869b4da Removed unnecessary "is not a function" warnings from ScriptContext.
All these warnings are followed by returning false, which call sites can use to report warnings where appropriate. In the case of material lua functors, it is not appropriate to report a warning which is why I'm removing these. The material system uses the "Call" API to potentially call a function that may or may not exist, and it is acceptable for that function to be absent.
2021-05-20 22:32:29 -07:00
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.
2021-05-20 18:48:40 -07:00
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.
2021-05-20 20:41:30 -05:00
karlberg 3dd40171cd Merging latest origin 2021-05-20 17:08:18 -07:00
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
2021-05-20 15:58:29 -07:00
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
2021-05-20 14:44:27 -07:00
greerdv 726597ad34 Merge branch 'main' into non-uniform-scale-blast 2021-05-20 22:05:22 +01:00
greerdv 87b1a19df4 remove vector scale from Blast in preparation for removal from Transform 2021-05-20 22:04:37 +01:00