Commit Graph

3799 Commits (6301e44d338551830a781dffe5be51e2d482d88c)

Author SHA1 Message Date
Nicholas Van Sickle 3d8664ee92
Merge pull request #5511 from aws-lumberyard-dev/nvsickle/GenericDomJson
Generic DOM: Add DomBackend abstraction and JSON support
4 years ago
amzn-mike 7c96bc4f1f
Fix loaded procprefabs not going through the asset hint fixup process… (#6077)
* Fix loaded procprefabs not going through the asset hint fixup process for all versions of LoadInstanceFromPrefabDom.

Fixes procprefab asset references not working when pressing Ctrl+G in the editor

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

* Add unit test

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

* Add missing include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Alex Peterson 3405cee2ef
GUI for engine force registration and renaming (#6184)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
carlitosan 4b97f7bac2
Merge pull request #5296 from aws-lumberyard-dev/sc-editor-asset-redux
Sc editor asset redux
4 years ago
Nicholas Van Sickle 6cf805256b Make backend write API string-based
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Danilo Aimini 6e0ac97f13
Merge pull request #6178 from aws-lumberyard-dev/daimini/gitflow_211206_o3de
Merged `stabilization/2111RTE` to `development`
4 years ago
Allen Jackson dae25beef5
{lyn2264} Adding Python API for Actor Group (#6064)
* {lyn2264} Adding Python API for Actor Group

* updating the IBoneData with behavior attributes
* adding actor_group.py for making actor group JSON data
* adding physics_data.py for making physics JSON data

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* fixing dictionary issues

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* updated comment style to numpydoc

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* updated to numpydoc style

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* example of actor group rules

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* Updated based on feedback

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
4 years ago
Danilo Aimini efe63f3e95 Merge commit 'c5615f812ccc9d235747a1c5ba396ac2e9a23690' into daimini/gitflow_211206_o3de
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp
#	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
#	Code/Framework/AzToolsFramework/Tests/UI/EntityOutlinerTests.cpp
4 years ago
Chris Galvan d04f4d238c Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/ReadOnlyViewportChanges 4 years ago
carlitosan 15e26b7515 merge development
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
Chris Galvan 10e95cd863 Updated logic to use AZStd::erase_if
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Danilo Aimini 476e66d902
LYN-8631 + LYN-8632 | Display appropriate read-only icons and procedural prefabs ui in the Outliner (#6160)
* First step of procedural prefab styling and read-only registration.

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

* WIP - Introduce read-only handler for procedural prefabs (not hooked up)

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

* Introduce read-only entity interface, handler and unit tests.

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

* Introduce temp read-only icon, use new icon hierarchy in Outliner.

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

* Switch from a push paradigm to a pull paradigm - handlers get to implement logic to determine if an entity should be read-only. This allows multiple systems to weigh into whether an entity is read-only.

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

* Fixed to missing call in test

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

* Post-rebase fixes to class name changes

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

* Display a lock icon on top of the entity icon in the Entity Outliner. This icon is added programmatically, which prevents having to alter all Outliner icons and future-proofs this functionality.

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

* Minor style changes to procedural prefabs in the Outliner (use white icon)

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

* Ensure cache is refreshed when the handler is created, and also whenever the focus changes.

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

* Remove Procedural Prefab setreg that was added in the wrong place

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

* Remove redundant function

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

* Fix spacing issue caused by rebase

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

* Change tooltip so that it accurately says "inspect" instead of "edit" for procedural prefabs.

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

* Address minor styling issues mentioned in PR.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Nicholas Van Sickle ea9d7c9d82 Add optional size parameter to ReadFromBufferInPlace
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Chris Galvan e24323660b Fixed typo.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Nicholas Van Sickle 1c42cd98cc Address a bit more review feedback
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Chris Galvan 1f279ca713 Updated viewport to hide the transform maniuplators for entities marked as read only.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan d583256b17
Merge pull request #6144 from aws-lumberyard-dev/cgalvan/ReadOnlyEntityInspectorChanges
Updated Entity Inspector to changed behavior when an Entity has been marked as read-only.
4 years ago
Guthrie Adams aa5563803f
Merge pull request #6110 from aws-lumberyard-dev/Atom/guthadam/update_trace_logger_to_clear_log
Changing trace logger to clear log file when opened
4 years ago
Chris Galvan e9c09f6359
Merge pull request #6159 from gusmccallum/development
Updated android launcher to remove confusing branding
4 years ago
Steve Pham be252d797d
Remove disabled failed asset load tests trait from linux (#6100)
* Remove trait AZ_TRAIT_DISABLE_FAILED_ASSET_LOAD_TESTS for Linux

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
4 years ago
Chris Galvan a7989df051 Fixed status combo box style in Entity Inspector.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Tom Hulton-Harrop 969dbf407a
Add tests for planar manipulator draw when dealing with scaling (#6164)
* add support to add a custom debug display request interface for manipulator test framework

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* wip changes to support tests for manipulator view drawing

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add test for planar manipulator draw when dealing with scaling

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* additional comments for added context

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* small updates/fixes after PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for missing NullDebugDisplayRequests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
Mikhail Naumov c5615f812c
Fixing pivot offset when performing undo on Transform component (#6150)
* Fixing undo offest on transform component

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Fixining possible issue with firing an unnecessary OnTransformChanged event when entity is manually disabled/enabled

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Adding better comments

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Unit tests

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Cherrupicking changes

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
gusmccallum fc8fd89ff9 Updated android launcher to remove confusing branding
Signed-off-by: gusmccallum <gusmccallum@hotmail.com>
4 years ago
Danilo Aimini 87fb6be964
Fixes to Procedural Prefab instantiation - ensure the container of the procprefab has the correct editor components, and remove limitation to instantiating at the root. (#6147)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Chris Galvan b470f917ca Listen to read-only entity state changes so we can refresh if the read-only state changes on one of our selected entities.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan 273fb87eeb Renamed variable to be more descriptive.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Nicholas Van Sickle 8165f54c05 Use temporary lifetimes for test
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Guthrie Adams af75b3a52a Made clearing the log file optional and renamed the function
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Alex Peterson fa385ec842
Fix number argument in notifications (#6121)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Alex Peterson b3bf2158b4
Right click menu support for project buttons (#6122)
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
Guthrie Adams d56cfa40dd Changing trace logger to clear log file when opened
Also switched the log message sink from a vector to a list so the entire container does not have to be rebuilt every time and entry is added.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Nicholas Van Sickle 037a93406a Fix a couple format string issues
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle f2f7dad972 Remove FormatVisitorErrorMessage
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Chris Galvan 954642c1ce Updated Entity Inspector to changed behavior when an Entity has been marked as read-only.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Nicholas Van Sickle 016e261f36 Add DomUtils
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Danilo Aimini d0511cf444
Fix warnings on Mac builds. (#6112)
* Fix warnings on Mac builds.

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

* Save one map query

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
lumberyard-employee-dm c3fdbfb926
Updated the ComponentApplication Settings Registry initialization to no (#6108)
longer read form the users `~/.o3de/Registry` directory in non
debug/profile configurations.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Michael Pollind 75c015b67e
chore: add #prama once to XcbInputDeviceKeyboard (#6091)
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
sphrose 1962083c72
Merge pull request #4955 from aws-lumberyard-dev/terrain/sphrose_test_terrain_gradient_list_LYN-7376
Python tests for TerrainHeightGradientList LYN-7376
4 years ago
Tom Hulton-Harrop 8344539ab6
Manipulator Bounds updates (#5959)
* first pass updates to improve manipulators

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add setting to enable/disable manipulator axis flipping

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update manipulator cvar to use ed_ naming convention

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* wip updates to add AzToolsFramework values to the SettingsRegistry

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* expose a number of manipulator settings for configuration

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add setting for manipulator base scale to change size of all manipulators together

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* minor updates before posting PR

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add manipulator section for settings registry paths

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for failing unit test after manipulator changes

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix total scale

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for polygon prism component shape tests

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
sphrose d24f01a413 compile fix
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
4 years ago
sphrose 1ed0b4f8ff Replace } lost in merge
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
4 years ago
sphrose 4e5b62ee25 conflict fix
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 59a2216584 Fix a build issue
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle 4dbce4275b Refactor the interface after some chatting with @amazon-employee-dm
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
michabr 4d5aad13d1
Remove legacy renderer dependencies in LyShine and move LyShine headers to gem (#6049)
* Remove CryRenderer dependencies

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

* Fix non-unity compile error

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

* Remove ITexture.h reference

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

* Simple file moves from CryCommon to LyShine Gem

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

* More simple file moves from CryCommon to LyShine Gem

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

* Move more headers from CryCommon to LyShine Gem

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

* Add LyShine gem module as a build dependency to fix compile error in some gems

Signed-off-by: abrmich <abrmich@amazon.com>
4 years ago
carlitosan 6bd0308339 Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
Steve Pham bd1a4a3062
Removed trait AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS
* Removed trait AZ_TRAIT_DISABLE_FAILED_INPUT_TESTS (#6078)
* Added check for gamepad support
* Skip tests that rely on gamepad support on platforms that dont support it
* Use GTEST_SKIP(() if available, otherwise just use SUCCEED()

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
4 years ago
Steve Pham d89dcff7df
Fix failing zero color conversion test on Linux
* Removed AZ_TRAIT_DISABLE_FAILED_ZERO_COLOR_CONVERSION_TEST (#6074)
* Protect against 'NaN' (divide by zero) for saturation calculations by setting value to zero instead

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
4 years ago