birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,354 Commits 3 Branches 3 Tags
fe005c9c5050cd2e87ecf14719b0f03216ea2e9f
Commit Graph

3246 Commits

Author SHA1 Message Date
amzn-mike dd47e1aa4e Add EditorPrefabComponent to procedural prefab container entity (#4727) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-10-15 15:50:41 -05:00
puvvadar f6e53241a1 Add test demonstrating size savings of DeltaSerializer 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-10-15 13:42:22 -07:00
puvvadar b5739f6918 Merge branch 'development' of https://github.com/o3de/o3de into mp_deltaserializer_perf 2021-10-15 12:53:26 -07:00
Esteban Papp 721d92b4f9 adding exception handling for tests that are not going through AzTestRunner 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-15 11:02:12 -07:00
hultonha 244e1b8e16 add a switch to enable/disable cursor lock (default off) 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-15 16:55:40 +01:00
Esteban Papp 8829ceb0f8 Merge branch 'development' into issues/exception_handling 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
 2021-10-15 08:55:35 -07:00
Esteban Papp 7651ba621c Remove old "Integ" functionality from tests (#4688) 
* fixes some warnings for newer versions of VS2022

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* more warning fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* remove integ test filters from AzTest

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* remove integ test handling from AzTestRunner

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* changes integ tests of gridmate to regular tests and disables failing ones

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removes the Integ from the EMotionFX tests, but leaves them disabled since they are failing

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removes the Integ from the HttpRequestor tests and disables it since is not passing

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* changing integ tests for DISABLED, these ones are using files that are not there

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes linux build
gridmate tests that were Integ are now disabled

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes linux warnings

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-15 08:53:26 -07:00
hultonha bd224b3a5c update bus implementation for integration tests 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-15 16:44:25 +01:00
hultonha 67ccc438c4 remove redundant word from comment 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-15 15:47:57 +01:00
hultonha 2158c8cfdf Merge branch 'development' into hultonha_LYN-7394_focus_cursor 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-15 15:45:13 +01:00
hultonha c955880d9b ensure cursor position is mapped to the right widget space 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-15 15:30:36 +01:00
hultonha 9aafc51ff5 Add first pass version of click feedback while in Focus Mode (#4693) 
* add first pass version of click feedback while in Focus Mode

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add more WIP experimental feedback ideas for Focus Mode

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small updates after UX feedback to improve focus mode feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* refactor and improve invalid click feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update comments from review feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-15 15:25:27 +01:00
hultonha 3d4c060fb5 updates to improve cursor lock behavior 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-15 15:19:38 +01:00
srikappa-amzn 87533d80c1 Delay propagation for all template updates in detach prefab workflow (#4707) 
* Delay propagation for all template updates in detach prefab workflow

Signed-off-by: srikappa-amzn <srikappa@amazon.com>

* Some minor changes to the PrefabUndo constructor

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-10-15 13:55:26 +01:00
amzn-mike 969a55170e Procedural Prefabs: Entity parenting fixes (#4669) 
* Parent top level entities to container entity when creating prefab

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add to_json method to PythonProxyObject to allow serializing any AZ serialializable type

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update scene_mesh_to_prefab.py to parent entities in a chain

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove redundant eval

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Improve error handling in ToJson

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add maybe_unused for commonRoot since it's not used

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-10-15 07:33:01 -05:00
hultonha 1d6542c274 initial wip code to update cursor states 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-15 13:28:58 +01:00
Michael Pollind 716c561cb7 bugfix: correct broken layout when searching global preferences (#4689) 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-10-15 12:56:20 +01:00
hultonha 5c8a1b573e Add support for border in Focus Mode (#4692) 
* restore component mode border

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add viewport border for focus mode, remove dead code in ObjectManager

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* ensure the focus mode border is restored when leaving component mode

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update FocusModeNotification call order after merge from development

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-15 12:56:05 +01:00
John 396530b274 Address PR feedback. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-15 11:18:17 +01:00
ffarahmand-DPS 606de5427b Fixes debug console autocomplete issues (#4223) 
* Fixed a crash caused by large autocomplete results in the debug console. A fixed vector was growing beyond its allocated size.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Fixes printing duplicate autocomplete results, caused by looping over multiple CVARs registered with the same name. Also adds an erase to prevent undefined behavior.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Adds a test case for autocomplete duplication in the event of multiple cvars existing under the same name. Two matching cvars are created and checked against the number of matches produced by autocomplete.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Added two safety checks and made a pointer const as per reviewer feedback.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>
 2021-10-15 10:30:48 +01:00
AMZN-Igarri f7eb906516 Moved Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings (#4660) 
* removed references to maxNumberOfItemsShownInSearch

Signed-off-by: igarri <igarri@amazon.com>

* Move Max Number of Entries Shown in Asset Browser Search View to EditorViewportSettings

Signed-off-by: igarri <igarri@amazon.com>

* Fixed extra spaces

Signed-off-by: igarri <igarri@amazon.com>

* Code review feedback

Signed-off-by: igarri <igarri@amazon.com>
 2021-10-15 09:55:41 +01:00
moraaar 3b9762142a Triangle Mesh with a Kinematic PhysX Rigid Body warns the user instead of error. (#4657) 
Using triangle mesh with a kinematic rigid body is allowed, but the options "Compute COM", "Compute Mass" and "Compute Inertia" are not supported by PhysX and an error in logged that default values for COM, Mass and Inertia will be used. Now this situation is captured and an explanatory warning is used instead.

- Improved RigidBody::UpdateMassProperties function to apply the same logic in the treatment of shapes for all three parameters: COM, Mass and Inertia.
- Improved UpdateMassProperties function by using references for the override parameters instead of pointers.
- Improved function that computes the Center of Mass UpdateCenterOfMass (renamed from UpdateComputedCenterOfMass), to include the same shapes that the compute mass and inertia functions in physx updateMassAndInertia, which is to include all shapes if includeAllShapesInMassCalculation is true, else include only the shapes with eSIMULATION_SHAPE flag.
- Removed unused private function RigidBody::ComputeInertia.
- Added unit test to check when the warnings are fired correctly when COM, Mass or Inertia are asked to be computed on a rigid body with triangle mesh shapes.
- Improved MassComputeFixture tests by not only using Box shape, but also sphere and capture, plus improved the PossibleMassComputeFlags parameters to include all possible variations of the MassComputeFlags flags.

Fixes #3322
Fixes #3979

Signed-off-by: moraaar <moraaar@amazon.com>
 2021-10-15 08:58:18 +01:00
kberg-amzn 3040f74c41 Merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-14 19:17:10 -07:00
kberg-amzn a6e7a81b79 More fixes to migration, plus some quality of life fixes to TimeoutQueue to allow lambda based handlers and a quick fix to OctreeSystemComponent to more gracefully handle enumerate calls that lie outside the vis system bounds 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 2021-10-14 18:22:41 -07:00
Esteban Papp 17b5312ce5 PR comments 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-14 15:53:21 -07:00
puvvadar 8a1d59934d Remove some includes 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-10-14 15:50:01 -07:00
puvvadar b295e674fc Update DeltaSerializer and tests with delta'd vectors 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-10-14 15:48:46 -07:00
Danilo Aimini bcf3980de6 LYN-7191 + LYN-7194 | Adjust Prefab operations to conform with Prefab Focus/Edit workflows. (#4684) 
* Disable ability to delete container entity of focused prefab. Default entity creation to parent to container entity of focused prefab.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Disable detach and duplicate operations for the container of the focused prefab. Update the context menu accordingly.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix spacing

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Address minor issues from PR (error message, optimization in RetrieveAndSortPrefabEntitiesAndInstances).

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-14 15:32:34 -07:00
Esteban Papp c5da705b46 fixes typo 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-14 14:39:18 -07:00
Esteban Papp a6c506c121 some warning fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-14 13:02:29 -07:00
Steve Pham 16a7b896ee Fix to prevent using legacy windows based logic to create a Path on Linx (#4704) 
Signed-off-by: Steve Pham <spham@amazon.com>
 2021-10-14 12:58:53 -07:00
Esteban Papp 07a52d2dfc Merge branch 'development' into issues/exception_handling 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-14 12:41:43 -07:00
Esteban Papp 04a6744765 enables our exception handling and disables gtest's 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-14 12:33:53 -07:00
Esteban Papp e078580f2c Changes GTEST_OS_SUPPORTS_DEATH_TEST to the right define which is GTEST_HAS_DEATH_TEST 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-14 12:33:18 -07:00
Esteban Papp 3e729638b5 adds unhandled exception test 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-14 12:32:39 -07:00
Esteban Papp 88cc3c774a adds stack trace conversion from native 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-14 12:32:15 -07:00
AMZN-koppersr aabb519452 Merge pull request #4565 from aws-lumberyard-dev/mnaumov/LYN-7227 
Fixing crash creating new level when simulate mode is on
 2021-10-14 11:20:02 -07:00
amzn-mike 63ece6e3ca Change Asset Hint fixup code to not request assets be queued for load. (#4664) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-10-14 11:54:13 -05:00
Mikhail Naumov e36be1ee95 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-7227 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-10-14 11:38:00 -05:00
Chris Galvan 4d4f99767f Merge pull request #4594 from pollend/chore/update-IntersectSegment-cleanup 
Clean-up IntersectSegment  and improve documentation
 2021-10-14 11:33:01 -05:00
Steve Pham 8d7b03c859 Implement open in file browser for Linux (#4677) 
* Add support to open folder browser for Linux
* PAL'ified DesktopUtilities.cpp

Signed-off-by: Steve Pham <spham@amazon.com>
 2021-10-14 08:27:43 -07:00
Chris Burel 5967b419a2 Only enable the Keyboard device in the XcbKeyboard unit tests (#4682) 
This prevents other input devices from interfering with the expected calls
that the Keyboard tests should make.

Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-10-14 08:45:44 -06:00
igarri d12c6beb40 Added Default Camera Location to the Viewport Setting Registry 
Signed-off-by: igarri <igarri@amazon.com>
 2021-10-14 12:44:41 +01:00
Michael Pollind 5a204dc80b chore: remove equality from boolean expression 
Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-10-13 21:26:03 -07:00
Vincent Liu 6823ea2274 Add GameLift matchmaking backfill server support (#4622) 
* Add GameLift matchmaking backfill server support

Signed-off-by: onecent1101 <liug@amazon.com>
 2021-10-13 16:59:37 -07:00
puvvadar ba7ff3c8e8 Add Network Input unit tests 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 2021-10-13 16:31:30 -07:00
puvvadar 65e124809c Merge branch 'development' of https://github.com/o3de/o3de into mp_deltaserializer_perf 2021-10-13 16:28:40 -07:00
amzn-phist 80dcc34e6f Add "Registry" folders as scan folders (#4583) 
* Add "Registry" folders as scan folders

For projects, Gems, and Engine, add the "Registry" folder as scan
folders.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Change params for adding scan folder

Also add trailing newlines to setreg files.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Adjust the priority order for project templates

Scan folder orders were way too high, they should be very low to become
highest priority order.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removes change of default assets folder to Assets

Need to revert this change so it can be done separately.
Renamed the scan folder to 'Project/Assets' to prep for Assets folder
change later on.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Update platform configuration test to pass

Adjusted expectation of scan folder count from 1 to 2 per Gem for
'Assets' and 'Registry' now.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 2021-10-13 16:46:30 -05:00
Esteban Papp 6a2020ec6c fixes some warnings for newer versions of VS2022 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-10-13 14:32:12 -07:00
Danilo Aimini f7e2d07a4b LYN-7333 | Fix multiple selection by dragging to take focus mode and containers into account. (#4620) 
* Change FocusModeNotificationBus's OnEditorFocusChanged arguments to also pass the previous focus root entity id.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add focus mode and container entity states to the visibility cache for the viewport. Use that data to correctly select entities when a rect is dragged on the viewport.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor code adjustments

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Minor fixes and optimizations

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-13 14:17:09 -07:00