Commit Graph

645 Commits (2d1ed48fea6e923c62a48ec12fcdf65fe3c6ea2f)

Author SHA1 Message Date
Esteban Papp 2d1ed48fea Merge branch 'development' into cmake/SPEC-2513_w4018
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
4 years ago
carlitosan 1e0a1e1167
Merge pull request #2991 from aws-lumberyard-dev/carlitosan/development
Add JSON serializer support for the Lua component properties
4 years ago
John Jones-Steele 2bf64879da Fixed the SpinBox tests
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
4 years ago
chcurran 8571e71d93 Add JSON serializer support for the Lua component properties
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
hultonha 1f9e976fe4
Adding Setting to allow the user to choose the max number of items to show in the Search View
Merge pull request #1679 from aws-lumberyard-dev/LYN-4700
4 years ago
hultonha 659e486cd7
Add an integration test to validate pick mode crash (#2935)
* add an integration test to validate pick mode crash

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

* update to test after review feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
igarri 7b5ecfb7d9 Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
Esteban Papp f4164ef3a3 Merge branch 'development' into cmake/SPEC-2513_w4018 4 years ago
moraaar 9e0b8c564d
Fixed AzToolsFramework tests (#2887)
* Fixed AzToolsFramework unit tests.

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

* Include missing header.

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

* Using util's class to generate temp directory, instead of qt.

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

* Added empty line

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

* Fixed warning in MessageTest fixture that CacheProjectRootFolder was not set

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

* Additional checks in CreateDefaultEditorEntity helper function.

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

* Updated the AzToolsFrameworkTest logic to set the project cache path

The Project Cache Path and Project Path is set through the CommandLine functionality of the ComponentApplication.
This allows those Project Cache Path and Project Path to be set within the Settings Registry during the ComponentApplication constructor

Removed the explicitly calls to delete the temporary directory and fixed the ScopedTemporaryDirectory class to recursively delete the temporary directory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Setup correctly @assets@ alias for PlatformAddressedAssetCatalogManagerTest and AssetSeedManagerTest fixtures.

- These 2 test fixtures need to manually set the @asset@ alias to not include the platform at the end (which it does by default), because they are looping over platforms in their setup.
- Also initializing pointers to nullptr, so if setup fail in the future the teardown doesn't crash trying to delete garbage.

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

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
hultonha ff8c4dce00
Ensure we disconnect from EditorInteractionSystemViewportSelectionRequestBus while recreating m_interactionRequests (#2884)
Fixes a crash while selecting an entity in the viewport while in 'pick' mode.
4 years ago
igarri 9d2b99b558 Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
pappeste eb3e0b0998 updates after merging development
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 10f950b726 fix w4018
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 4 years ago
srikappa-amzn 7404622b48
Clear prefab templates on new level creations and loads (#2842)
* Clear prefab templates on new level creations and loads

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

* Fixed failing prefab unit tests after change to clear templates

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
igarri 6fb250c66b Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
Esteban Papp b33a4db332 Merge branch 'development' into cmake/SPEC-2513_w4267 4 years ago
Chris Galvan 32542fd84b
Merge pull request #1927 from aws-lumberyard-dev/GroupToggleSwitch
Created a toggle switch to enable and disable groups through the Edit Context
4 years ago
igarri a241eb8e1c Added Sensible default
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri 7f9c6df67b Merge branch 'develop' into LYN-4700
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
srikappa-amzn c9301a8c94
Fix a bug in patching templates and improve error messaging (#2394)
* Fix a bug in patching templates and improve error messaging
* Fixed incorrect order of function arguments
* Fix build errors regarding c style strings and casting entity ids

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
5 years ago
pappeste 909384bd34 Code/Framework compiling
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
dtamkin1 ce3ec0d49c Moved toggle swtich back to the left side per UX's request
Signed-off-by: dtamkin1 <jotamkin@amazon.com>
5 years ago
dtamkin1 ba347c1d60 Merge branch 'development' of https://github.com/o3de/o3de into GroupToggleSwitch 5 years ago
Nicholas Van Sickle 7f84a4318c
Add an Orthogonal Projection option to the Camera Gem (#2414)
* Add an Orthogonal Projection option to the Camera Gem

This adds a check-box to opt into an ortho projection along with a half-width parameter to adjust the size of the visible area. Includes some light tweaks to ensure debug rendering looks OK and that we generate a correct camera state for these non-perspective views.

Known issue: while in "Be this camera" mode in the Editor using an ortho projection manipulators aren't working correctly. This appears to be a downstream issue with CameraState consumers not actually checking the ortho flag.

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

* Fix some typos

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

* Account for reversed depth buffer

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

* Clarify depth reversal for MakeOrthographicMatrixRH

Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
John Jones-Steele 73706fa04e Added Tests to check code is correct
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
dtamkin1 731640492e Merge branch 'development' of https://github.com/o3de/o3de into GroupToggleSwitch 5 years ago
dtamkin1 fcb2a0f95c Reformatted Unit tests to give more information and be more concise, also changed the position of the toggle switch
Signed-off-by: dtamkin1 <jotamkin@amazon.com>
5 years ago
Chris Galvan 90ef2ba13f Removed slice based context menu options from the RPE when prefabs are enabled.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
AMZN-AlexOteiza b815c203da
(Continuation) Implemented automation paralellization & standarization (#1718)
Engine improvements/fixes

Fixed behavior that made the editor automated test to be sometimes stuck if lost the focus is lost.
Added support for specifying multiple tests to in batch to the editor, this is achieved by passing --runpythontest with the tests separated by ';'
Added new cmdline argument --project-user-path for overriding the user path. This allows to have multiple editors running writing logs and crash logs in different locations.
Moved responsability of exiting after a test finishes/passes out of ExecuteByFilenameAsTest, callers will use the bool return to know if the test passed.
Editor test batch and parallelization implementation:

Now the external python portion of the editor tests will be specified via test specs which will generate the test. Requiring no code. This is almost a data-driven approach.
Tests can be specified as single tests, parallel, batchable or batchable+parallel
Command line arguments for pytest to override the maximum number of editors, disable parallelization or batching.
Automated tests for testing this new editor testing utility

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
5 years ago
hultonha 231f09d899
Merge pull request #2322 from aws-lumberyard-dev/hultonha_LYN-1866_viewport-ui-focus-tidy
ViewportUi related tidy-up changes
5 years ago
sphrose 9639003a7d
LYN-4774 Fix missing box icons inside the main Viewport (#2297)
* LYN-4774 Fix missing box icons inside the main Viewport

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* V2 icons

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Bug fixes

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
5 years ago
srikappa-amzn d8c9c5178e
Reset the prefab root instance before removing the corresponding template (#2287)
* Remove dirty entities correctly when prefab entities get destroyed

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

* Remove call to clear dirty entity for single entity delete

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

* Removed couple of asserts because order of operations is not fixed

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
5 years ago
Terry Michaels b740329c1e
Merge pull request #2326 from aws-lumberyard-dev/ImGuiNoEntityProblem
Im gui no entity problem
5 years ago
lumberyard-employee-dm 8e79ed8667
Merge pull request #2313 from aws-lumberyard-dev/AssetBrowserScanFolderFullPathFix
Fixed RootAssetBrowserEntry setting of child AssetBrowserEntries
5 years ago
John Jones-Steele f24ce2a5bb Merge branch 'development' into ImGuiNoEntityProblem
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
John Jones-Steele 7cb6ef4f47 Checked for no Entity selected and fixed UI
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
5 years ago
hultonha 0b4e8b468f further formatting changes for viewport ui
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hultonha ec3e1f98c1 Merge branch 'development' into hultonha_LYN-1866_viewport-ui-focus
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hultonha 1ac59388a3
Merge pull request #2319 from aws-lumberyard-dev/hultonha_LYN-1866_viewport-ui-focus-fix
Viewport UI focus/shortcut fix
5 years ago
hultonha 67e7a75d50 ensure uiMainWindow and uiOverlay have valid object names
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
lumberyard-employee-dm 92a4c76797 Fixed RootAssetBrowserEntry setting of child AssetBrowserEntries
The issue is due to RootAssetBrowserEntry::UpdateChildPaths not taking
the RootAssetBrowserEntry fullpath into account when appending the child
path entry

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
sconel 36f2207558 Remove unneeded fields from Entity and EditorTransform JsonSerializers
Signed-off-by: sconel <sconel@amazon.com>
5 years ago
hultonha b8a80aa914 fix for viewport ui focus issue
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
Esteban Papp a08f850766
Merge pull request #2284 from nemerle/header_inclution_reductions_pt1
Reduce inclusion overhead a little bit
5 years ago
hultonha cdedb62634 remove commented line
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hultonha 4762867856 fix for focus being removed from main viewport widget when interacting with viewport ui elements
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
sharmajs-amzn d5431e1c57
{LYN-4996} Asset Processor is not reprocessing STL files after settings are edited/updated (#2095)
* add asset importer file extension

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

* add new test setreg file

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

* removed an unnecessary namespace

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

* addressed feedback

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

* addressed feedback

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

* remove unnecessay method

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

* add file

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

* reduce waiting time in block until idle

Signed-off-by: sharmajs <sharmajs@amazon.com>
5 years ago
nemerle e76b65fce9 Reduce inclusion overhead a little bit
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
5 years ago
lumberyard-employee-dm d22a473936
Merge pull request #2241 from aws-lumberyard-dev/CherryPickIssue2227Fix
Cherry Pick: External Gem and Projects now appear in Editor AssetBrowser (#2227)
5 years ago