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

441 Commits

Author SHA1 Message Date
Artur K 2dff26ddb5 Fix asset type retrieval in AssetCatalogModel::GetAssetType (#4995) 
* Fix asset type retrieval in AssetCatalogModel::GetAssetType

Previous logic would visit the next entry in m_extensionToAssetType map, if the previous entry had multiple types
 was only exiting the inner loop.

The main change is that now the first found matching asset type is returned.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply reviewer's suggestions + reduce allocations.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-11-01 14:51:15 +00:00
AMZN-AlexOteiza e871dff70e Added two complex prefab tests (#5089) 
* Added two complex prefab tests

* Fix compile error

* Added extra methods, fixed test failure

* Addressed PR commments

* More PR comments

* Fix space

* Fix ar error
 2021-10-29 22:32:33 +01:00
Artur K a322d9e2b8 Small Code/Editor cleanup pass (#4909) 
* Clean-up in ConfigGroup

Removed unused templated AddVar and related code.
Replaced legacy types with `AZ::` ones.
Cleaned up cpp file.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Add a few missing Q_OBJECT macros, remove some unused variables.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply some of clazy suggestions + simplifications

* removed `emit` from non-signal function calls.
* replaced `QStringLiteral("")` with a constexpr friendly
`QLatin1String()`

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix a CNewLevelDialog focus bug

Fixed an incorrect QTimer::singleShot invocation.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* match lambda to `messageChanged` signature

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* vs compilation fix + applied review

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* apply reviewer recommendation

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-10-29 09:59:18 +01:00
Chris Galvan 78b0683313 Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-10-26 15:47:17 -05:00
Chris Burel f3499011ac [Mac] Fix QtEditorApplication_mac include (#4978) 
Commit 8e03d6f306 missed updating the
platform-specific mac QApplication implementation file to include the
class declaration from the new header.

Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-10-26 08:30:51 -07:00
AMZN-Igarri e970247fc5 Asset Browser Search View fixes (#4814) 
* Fixed RowCount method.

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

* Fixed Signals

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

* Fixed Delegate case

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

* Fixed issue when displaying branch icons

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

* Fixed AssetBrowser Delegate

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

* Removed optimize flags

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

* AssetBrowsertableModel cleanup

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

* Fixed Typos

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

* Fixed Comment

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

* Added check for rowCount == 0

Signed-off-by: igarri <igarri@amazon.com>
 2021-10-25 10:35:50 +01:00
Danilo Aimini a4e0d69e83 Update Splashscreen and About Us dialogs for General Availability (#4901) 
* Add new image for splashscreen. Layout changes incoming.

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

* Adapt layouts to new splashscreen style with transparent background.

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

* Ensure cropping logic works correctly when screen scaling is used.

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

* Remove old image. Replace new image with new version with more readable credits.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-10-22 12:46:06 -07:00
Yaakuro 8e03d6f306 Separate application into platform specific files. (#4799) 
Signed-off-by: Yaakuro <y1@codeposer.net>
 2021-10-22 11:10:47 -07:00
Chris Galvan d78aa5bf90 Removed legacy ColorGradientCtrl. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-10-21 10:55:32 -05:00
Chris Galvan c1948bf94e Treat invalid p4 configuration as a warning for the scene settings save action so the processing popup will get the job results. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-10-20 15:04:21 -05:00
rgba16f [Amazon] c6afb1f0a3 Update all the hardcoded filenames inside the level.pak file to be lowercase now the editor no longer forces them to be lower case. (#4802) 
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-10-20 10:35:31 -05:00
AMZN-AlexOteiza 181d12625f Reorganized Prefab tests and standarization (#4786) 
* Reorganized Prefab tests and standarization

* Restore changed file by accident
 2021-10-20 16:16:04 +01:00
AMZN-AlexOteiza 38f9dcb8ca Added option to reopen if the current level is the same. This contributes to stability for batched tests (#4043) 
* Added option to reopen if the current level is the same. This contributes to stability for batched tests

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Addressed PR comments

* Addressed PR and cleaned Base level that had an entity by accident

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Cleaned up params

Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>

* Addressed PR comments
 2021-10-20 14:55:20 +01:00
jonawals a1ee7b5a31 Merge pull request #4725 from aws-lumberyard-dev/hultonha_LYN-7394_focus_cursor 
Updates to support 'lock'/'forbidden' cursor when in Focus Mode
 2021-10-20 14:55:01 +01:00
jonawals 0031016548 Merge pull request #4785 from aws-lumberyard-dev/pytest_editor_testcase_name_fix 
Fix for PyTest editor test case names.
 2021-10-19 16:13:56 +01:00
John ae6005545e Fix for PyTest editor test case names. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-19 13:23:23 +01:00
igarri 6050d2e16e merge develop 
Signed-off-by: igarri <igarri@amazon.com>
 2021-10-18 12:42:00 +01:00
igarri d8a453f826 changed names 
Signed-off-by: igarri <igarri@amazon.com>
 2021-10-18 12:20:04 +01:00
igarri c93bd87127 Added default camera position to viewport settings 
Signed-off-by: igarri <igarri@amazon.com>
 2021-10-18 12:16:54 +01:00
igarri 026919c11b Set View in viewport fixed 
Signed-off-by: igarri <igarri@amazon.com>
 2021-10-18 11:49:05 +01:00
Pratik Patel b58ae15d83 Merge pull request #4595 from yaakuro/yaakuro-development-patch-1 
[GNU/Linux] Add basic mouse device implementation and fullscreen handling to GNU/…
 2021-10-15 15:28:15 -07:00
Yaakuro 4c733d3f4c Add basic mouse device implementation and fullscreen handling to GNU/Linux. 
Signed-off-by: Yaakuro <y1@codeposer.net>
 2021-10-15 23:03:06 +02: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
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
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
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
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
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
Nicholas Lawson 5ba30f9a37 Update tiff to the new package revision (fixes IOS TIFF package) (#4638) 
The new tiff package works for all platforms, including android and IOS, which had issues before.
Android - was missing tiff.h
ios - wrong minimum ios revision
 2021-10-13 13:46:20 -07:00
Steve Pham 70636572ff Fix casing of editor_xml filenames to match casing in .ly files (#4640) 
Signed-off-by: Steve Pham <spham@amazon.com>
 2021-10-12 15:08:07 -07:00
Chris Galvan 94c938496e Fixed logic error causing Python Scripts tree items to only show extension intead of filename. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-10-12 13:46:54 -05:00
igarri 8cf736b999 Added default Camera position a Sensible Default 
Signed-off-by: igarri <igarri@amazon.com>
 2021-10-12 11:37:05 +01:00
igarri da190abbab Fixed Camera Locations 
Signed-off-by: igarri <igarri@amazon.com>
 2021-10-12 10:37:33 +01:00
hultonha 5c859cb134 Fix camera drift issues (#4576) 
* remove some unused code in RenderViewportWidget and make viewing devicePixelRatioF easier

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

* updates to how cursor positions are calculate to handle the viewport widget moving

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

* remove optional for previous position

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

* add test to capture error with moving the widget

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

* minor comment updates before publishing PR

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-11 16:23:24 +01:00
John 3ef24d3a05 Header fix. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-11 14:28:27 +01:00
John e26d1f9ec5 Linux non-unity header fix (again). 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-11 14:17:46 +01:00
John 6c8441713d Fix another missing header for Linux non-unity. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-11 14:02:56 +01:00
John 9baf76beab Add missing header for non-unity builds on Linux. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-11 13:28:33 +01:00
John 1cdb34326b Merge branch 'development' into LYN-5265_state_tracker_impl 2021-10-11 08:38:54 +01:00
Mikhail Naumov f43b3b9fbe Fixing crash creating new level when simulate mode is on 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-10-07 20:35:23 -05:00
John 863a7c8382 Address PR comments. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-07 17:21:45 +01:00
AMZN-AlexOteiza d1947c68c9 Added extra output and callstack information for improving debugging automated tests (#4528) 
Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>
 2021-10-07 13:29:09 +01:00
hultonha 3d1ec83f78 Update naming to CameraInput types (#4527) 
* rename public facing Pivot cameras to Orbit - previous rename was a mistake

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

* some more comment and naming updates to improve camera documentation

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-07 10:01:30 +01:00
hultonha 3f2881ea46 Simplify viewport interaction model reset functionality (#4524) 
* simplify entity reset functionality

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

* remove reference to removed shortcuts

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-07 10:00:18 +01:00
hultonha a40af98394 Add focus camera and custom camera input (#4493) 
* add focus camera and custom camera input

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

* very minor tidy before publishing PR

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

* small updates after PR feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-10-06 14:52:59 +01:00
John 317d624f6c Minor formatting. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-06 13:01:49 +01:00
John 66f419e8e5 Merge branch 'development' into LYN-5265_state_tracker_impl 2021-10-06 11:59:35 +01:00
John 5308a0fbbb Remove redundant editor mode notifications. 
Signed-off-by: John <jonawals@amazon.com>
 2021-10-06 11:57:42 +01:00
Nicholas Lawson 977d58e1a8 Update ZLIB min req osx ios and android to reasonable limits (#4473) 
This also updates the name of the zlib library to uppercase ZLIB which conforms to normal CMake standards .
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
 2021-10-05 15:20:26 -07:00