Commit Graph

449 Commits (b6be57d2cf68f53c46e6aadeedab08ec7a11dcc2)

Author SHA1 Message Date
Esteban Papp 0b7bff79d3
Removes VTUNE profiler hooks from Cry (#5291)
* Removes VTUNE profiler hooks from Cry

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

* some more vtune cleanup

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Danilo Aimini 9dc85000a3
LYN-7547 | Focus Mode - It is possible to create a child entity of a closed container (#5193)
* Disable drag&drop of entities on closed containers.

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

* Do not show the Create Entity context menu when right clicking a closed prefab container.

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

* Disable entity creation on closed containers, both via the Create Entity flow and drag/drop of assets.

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

* Minor changes to modernize old code.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Mike Balfour 6d7be70133
Merge pull request #5202 from aws-lumberyard-dev/mbalfour/gitflow_211102_o3de
Merging stabilization/2110 to development
4 years ago
AMZN-stankowi 6d592d78cd
Fixes for release builds with DCO fix (#5164)
* This set of changes is work toward allowing release builds to work with asset bundler generated bundles and legacy, non-prefab levels. This requires some other in-flight changes before this work is complete.

    Updated engine seed list + fixed automated test
    ComponentApplicationLifecycle has the ability to automatically register events if asked to register a handler and the event doesn't exist. This is only intended for cases where you need to register a handler early in startup before the settings registry file is loaded.
    Added two new lifecycle events: One after the system entity has been activated, and one after the system interface has been created.
    If you load an archive before the system entity has been activated, archive.cpp caches information about those archives until that time, so it can finish registration. This is because the serialization system and BundlingSystemComponent both need to be available to do this registration, but the bundles have to be loaded before those are initialized so that the settings registry file can be loaded.
    Fixed an error were mounted pak files were searching for levels.pak and not level.pak, and not finding them. I'm pretty sure this logic doesn't do anything functional either way, but I've been testing legacy levels with this change and they work now.
    Moved wildcard pak loading to where engine.pak is loaded. This is because the settings registry file that defines the IO stack to spin up must be available early in application startup, and this file must be within a mounted pak file. If you're using asset bundler generated bundles, they need to be loaded at this time so that file can be loaded.
    Atom's BootstrapSystemComponent.cpp no longer initializes on AssetCatalogLoaded, and instead initializes on the ApplicationLifecycle event SystemInterfaceCreated. This is because the base assetcatalog.xml file is really just a development time concept, this file should not be used in packaged release builds, because those builds will make use of delta catalogs in each bundle loaded. The asset catalog contains the list of all assets that were in the cache at development time, and this contains content that developers don't want to ship, and they may want to specifically hide from their customers, so data miners don't find secrets about upcoming game content.

Recovering from a branch that had incorrect DCO

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed an incorrect ebus disconnect and removed an include that's no longer needed

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed a copy and paste typo from trying to recover the previous pull request

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated product IDs for the settings registry builder to no longer collide with the JSON builder. Now they are based on a hash of the configuration.
Updated the engine default seed list to include the new asset ID info for the renamed bootstrap file

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated the path to the application lifecycle events, because runtime settings aren't included in the merged bootstrap file.
Addressed some feedback on printing out a string view on an error

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed a test that uses old assets that aren't relevant. We may not need this test anymore, but if we do we've backlogged a task to create a new test to cover this behavior without using old assets.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Renamed SystemInterfaceCreated event to LegacySystemInterfaceCreated
Removed SystemEntityActivated event. Now that I have the rest of the fixes in this pull request, this new event wasn't needed, the already existing SystemComponentsActivated event does what I need.
Changed list to vector

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
4 years ago
Mike Balfour a769a324fa Merge commit 'de6af361ab15a9fc504518368e5a8fca2db5a065' into mbalfour/gitflow_211102_o3de 4 years ago
Mike Balfour 5867ab6bde Merge commit 'b2a8e4056950398e13f2fe32f486d29733669a2b' into mbalfour/gitflow_211102_o3de 4 years ago
hultonha de6af361ab
Do not clear input channels everytime focus changes (#5044)
* remove HandleFocusChange from FocusIn/Out events in QtEventToAzInputManager

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

* ensure we clear input channels when application state changes

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

* wip changes for focus switching tests

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

* updates to test to verify focus change not affecting input

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

* add test to ensure input is not cleared when focus changes

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

* ensure key press goes to correct widget

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

* add test to verify input is cleared when application state changes

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

* clear input for all types of application state change

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

* update input key for focus test

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

* use the Settings Registry to tell the InputSystemComponent to disable various devices

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

* update how we simulate the application state change event

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

* revert Settings Registry changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
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>
4 years ago
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
4 years ago
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>
4 years ago
Chris Galvan e56396a817 Improvements to C++/Python tool gemplates
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan 78b0683313 Added GetComponentTypeEditorIcon API and replaced old macro style ebus calls.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
Yaakuro 8e03d6f306
Separate application into platform specific files. (#4799)
Signed-off-by: Yaakuro <y1@codeposer.net>
4 years ago
Chris Galvan d78aa5bf90 Removed legacy ColorGradientCtrl.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
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>
4 years ago
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>
4 years ago
AMZN-AlexOteiza 181d12625f
Reorganized Prefab tests and standarization (#4786)
* Reorganized Prefab tests and standarization

* Restore changed file by accident
4 years ago
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
4 years ago
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
4 years ago
jonawals 0031016548
Merge pull request #4785 from aws-lumberyard-dev/pytest_editor_testcase_name_fix
Fix for PyTest editor test case names.
4 years ago
John ae6005545e Fix for PyTest editor test case names.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
igarri 6050d2e16e merge develop
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri d8a453f826 changed names
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri c93bd87127 Added default camera position to viewport settings
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri 026919c11b Set View in viewport fixed
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
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/…
4 years ago
Yaakuro 4c733d3f4c Add basic mouse device implementation and fullscreen handling to GNU/Linux.
Signed-off-by: Yaakuro <y1@codeposer.net>
4 years ago
hultonha bd224b3a5c update bus implementation for integration tests
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Michael Pollind 716c561cb7
bugfix: correct broken layout when searching global preferences (#4689)
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
igarri d12c6beb40 Added Default Camera Location to the Viewport Setting Registry
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
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
4 years ago
Steve Pham 70636572ff
Fix casing of editor_xml filenames to match casing in .ly files (#4640)
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
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>
4 years ago
igarri 8cf736b999 Added default Camera position a Sensible Default
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri da190abbab Fixed Camera Locations
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
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>
4 years ago
John 3ef24d3a05 Header fix.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John e26d1f9ec5 Linux non-unity header fix (again).
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John 6c8441713d Fix another missing header for Linux non-unity.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John 9baf76beab Add missing header for non-unity builds on Linux.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John 1cdb34326b Merge branch 'development' into LYN-5265_state_tracker_impl 4 years ago
Mikhail Naumov f43b3b9fbe Fixing crash creating new level when simulate mode is on
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
John 863a7c8382 Address PR comments.
Signed-off-by: John <jonawals@amazon.com>
4 years ago