Commit Graph

956 Commits

Author SHA1 Message Date
moraaar 4475528df2 Fixed Event Hander's copy constructor and copy assignments
It was missing to save the event before connecting to it. (#2026)

Signed-off-by: moraaar <moraaar@amazon.com>
2021-07-09 11:48:04 -07:00
lumberyard-employee-dm 8a76ec713e Updated the SettingsRegistry Specialization tag name max size to 64 (#2016)
The tag name max size should match the maximum size of a project name,
since the project name is automatically added as a specialization tag in
the settings registry when loading .setreg files from within the
<ExecutableDirectory>/Registry directory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-09 12:41:43 -05:00
jjjoness 1b530195fc Clarify ImGui activation in Editor viewport (#1765)
* Clarify ImGui activation in Editor viewport

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* All working following changes from comments in PR

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* One more change

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* fixes from comments in PR.

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fixed git merge error

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Added header to ImGuiBus.h

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Fix for Jenkins error

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>

* Minor typo fix

Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-07-09 12:03:20 -05:00
Esteban Papp e3be8b4c46 Enable AZ_TRAIT_AZFRAMEWORK_USE_PROJECT_MANAGER for Mac/Linux (#2017)
Validated it opens the project manager in Mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-09 09:01:35 -07:00
Esteban Papp d075d5f7b5 fix AzGenericTypeInfo template handling with clang 12+ (#833) (#1947)
Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

Co-authored-by: Tom "spot" Callaway <72474383+spotaws@users.noreply.github.com>
Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
2021-07-08 11:29:55 -07:00
sphrose 83d1bc0fbf Merge branch 'stabilization/2106' into LYN-3718 2021-07-08 10:19:11 +01:00
Chris Galvan c097ae8235 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-07 18:43:26 -05:00
SJ 9ca7a698df Fix Mac Editor crash when adding PhysX Collider component to an entity. (#1930)
Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-07-07 18:17:40 -05:00
Chris Galvan 3037837be6 Fixed logic to remove the tabs not close them.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-07 16:37:25 -05:00
Chris Burel 80bdd4e17b Clang compile fixes (#1876)
* Fix compile error from -Wwritable-strings

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix flags used to build MaskedOcclusionCulling with clang

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix class that has a final destructor, but the class itself was not final

Signed-off-by: Chris Burel <burelc@amazon.com>
2021-07-07 14:34:45 -07:00
Terry Michaels 24d21cadae Merge pull request #1475 from aws-lumberyard-dev/nvsickle/ViewportInfoDpiScaling
Make IMGUI & viewport info scale with DPI
2021-07-07 15:55:46 -05:00
alexmontAmazon dae2ddaec2 fix for [LYN-4828], message box style changes (#1911)
* fix for [LYN-4828], message box style changes

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* now with missing .qss file! Friends don't let friends git add -u

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
2021-07-07 13:49:55 -07:00
nvsickle 2fefa80937 Use AZ::DynamicModuleHandle
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 11:51:18 -07:00
nvsickle 21dbe8b48f Address review feedback
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 11:51:16 -07:00
nvsickle 0c97888d0f Revert accidental change
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 11:51:13 -07:00
nvsickle 6b76eceb1f Add GetDpiScaleFactor to native window API
-This includes implementations of the API for the Editor and Windows, all other platforms will have a 1.0 scale for now

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-07-07 11:51:08 -07:00
Chris Galvan 91656ded9f Ensured EditContext is created for the legacy tools framework application (Lua) so that settings are able to be displayed
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-07 11:58:41 -05:00
Chris Galvan 77cc0e921c Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-06 10:15:32 -05:00
amzn-sean 636ff587c3 Shape casts correctly report positions of colliders that intersect or in contact of the initial pose (#1848)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-07-05 18:06:20 +01:00
Sandeep 4c684b1a10 Merge pull request #1657 from aws-lumberyard-dev/carlitosan/scriptcanvas/prefabs
Initial prefab integration
2021-07-02 14:05:25 -07:00
SergeyAMZN 0a957fb03a Merge pull request #1762 from aws-lumberyard-dev/MultiplayerEditorFixes2
LYN-4866 Fixed net entities indices when creating net spawnable
2021-07-02 21:31:42 +01:00
pereslav 436d9734d2 Fixed clang build error
Signed-off-by: pereslav <pereslav@amazon.com>
2021-07-02 18:06:39 +01:00
Danilo Aimini 3c959832a3 Reparenting - introduce loop detection on instance reparenting (DCO fix) (#1752)
* Detect loops in reparenting code and assert.

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

* Add warning when detecting a cyclical dependancy. Revert reparenting on loop.

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

* Use GetActiveWindow helper to handle window edge cases

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-07-02 08:24:58 -07:00
pereslav d17390befb LYN-4866 Fixed net entities indices when creating net spawnable
Signed-off-by: pereslav <pereslav@amazon.com>
2021-07-02 16:01:30 +01:00
Terry Michaels f93c2f5b60 signoff (#1748)
Signed-off-by: Terry Michaels <miterenc@amazon.com>
2021-07-02 07:08:12 -05:00
Danilo Aimini 02f340abbd Fix resource registration for the EntityOutlinerWidget class in AzToolsFramework. Also moves icons to a more appropriate location. (#1731)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-07-01 18:37:44 -07:00
Terry Michaels b331eea9ca Removed the AmazonStyle executable and files as they are old/invalid (#1733)
* signoff

Signed-off-by: Terry Michaels <miterenc@amazon.com>
2021-07-01 19:25:08 -05:00
srikappa-amzn 37a899f5e1 Merge pull request #1709 from aws-lumberyard-dev/Prefab/DisableDestroyGameEntity
Disable support to destroy game entities through behavior context when prefabs are enabled
2021-07-01 16:31:04 -07:00
alexmontAmazon 9ef25cb5c4 rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640) (#1726)
* rewrite of the filter code to fix [LYN-4156][LYN-4545]

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* improved onRowCountChanged() per comments

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
2021-07-01 13:59:10 -07:00
srikappa 6b2c02e477 Merge branch 'stabilization/2106' into Prefab/DisableDestroyGameEntity
Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-01 12:24:42 -07:00
srikappa bab4e5eaf3 Improved function comments
Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-01 12:11:27 -07:00
Chris Galvan 4145b4663a Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-01 14:07:03 -05:00
Mike Balfour d34d088191 Miscellaneous prefab/converter bugfixes to support TrackView (#1701)
This has a small bundle of bugfixes and improvements all based around improving prefab TrackView support:

* JsonMerger - improved the error message when patch remove operations fail to make the specific failure more obvious
Instance - swapped the order of destroying entities vs clearing the lookup tables so that lookups still produce valid results during destruction. (This could happen while creating undo caches)
* InstanceEntityIdMapper - in the case where an id isn't found, it now returns an invalid id instead of an "attempted-valid" one that still generally turned out to be not-valid
* PrefabUndo - downgraded a potential crash to an error message if for some reason the patch contains changes to an entity that doesn't currently have an alias. (This case can be caused occasionally by other bugs and error conditions)
* EditorSequenceComponent - downgraded a potential crash to an assert for the times when it tries to remove components, fails, but thinks it succeeded. (This case can currently be caused by using Maestro with Prefabs enabled)
* EditorSequenceAgentComponent - added an undo cache refresh whenever the component deletes itself, so that deleting itself during an EditorSequenceComponent destruction chain of events leaves the undo cache in the correct state.
* SliceConverter - fixed the conversion of entity references in top-level slice instance entities that refer down to nested slice entities. There was a chicken-and-egg problem in terms of which entities need to be created first to make the references and the prefab patching & serialization happy. This was worked around by creating placeholder top-level entities, then the nested slice entities, then replacing the top-level entities with the fully-realized ones.

Specific changes:
* Added more informative error message.

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 672608a6c833c07295996cd9b3449825222b74d0)

* Changed the error condition to produce a "valid" invalid id instead of a deterministic but not-valid id

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 3673950c949de8e067b32ddafaffd07e648a13d8)

* Guard against invalid reference assert/crash

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 268d4ef3447f268a1372d07e028b9e67bac5c64e)

* Downgrade an invalid reference crash to an assert

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 38c9303770845f4e863273dd6fb8fc7e83380425)

* Improved logic for handling entity references across nested slices.

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 7e89a016d95fb72cb5f119e1e3768daa60e6bfb4)

* Changed order of entities.clear() call so that instance lookups are still valid during entity destruction.

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

* Add undo cache notification when removing Maestro components.

Signed-off-by: mbalfour <mbalfour@amazon.com>
2021-07-01 13:53:17 -05:00
chcurran 9efb6248d8 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/scriptcanvas/prefabs 2021-07-01 10:03:08 -07:00
Tom Hulton-Harrop f2242f1ed5 Merge pull request #1684 from aws-lumberyard-dev/hultonha_LYN-4304_viewport_ui_gamemode
Cherry-pick hiding viewport ui change from development to stabilization
2021-07-01 16:55:31 +01:00
Chris Galvan d7b516b518 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-01 10:08:04 -05:00
greerdv 05a2ce4fe1 update based on PR feedback
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 13:35:57 +01:00
greerdv 88615f462c merge from stabilization/2106
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 11:30:16 +01:00
greerdv 899350b5c7 bring across lua raycast improvements from 1.x
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 11:24:10 +01:00
hultonha e1de075789 Merge remote-tracking branch 'upstream/stabilization/2106' into hultonha_LYN-4304_viewport_ui_gamemode 2021-07-01 09:58:55 +01:00
chcurran 2281330a7c merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 20:42:41 -07:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
srikappa c61e69d794 Add correct prefix for param tag
Signed-off-by: srikappa <srikappa@amazon.com>
2021-06-30 17:16:13 -07:00
srikappa cd3fad20b4 Disable support to destroy game entities through behavior context when prefabs are enabled
Signed-off-by: srikappa <srikappa@amazon.com>
2021-06-30 17:16:10 -07:00
chcurran 0136c92467 PR white space feedback, better Lua print error message, fix ACM static variable culling
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 16:55:26 -07:00
Danilo Aimini 7030f663f5 LYN-4890 | Change all instances of teal blue to correct O3DE branding palette colors (#1672)
* Replace old teal color with correct palette colors from the O3DE branding.

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

* Fix hyperlink color in O3DE About Us dialog to improve visibility.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-06-30 15:20:42 -07:00
Chris Galvan 20775b7745 [LYN-3195] Fixed fancy docking restore state to only touch dock tab containers that it created
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-06-30 15:26:27 -05:00
Steve Pham 827855f01c Removal last CryTek references
- 'Crytek application' is now 'O3DE application' in ISystem.h
- 'CryTek' is now 'O3DE' in ProjectDefines.h (comment)
- 'Crytek Legacy' is now 'O3DE Legacy' in LocalizedStringManager.cpp
- 'Crytek extended data' references are now 'O3DE extended data'

Signed-off-by: spham <spham@amazon.com>
2021-06-30 12:48:16 -07:00
chcurran 5b7b989733 use more constexpr in ScriptCanvasAttributes.h, remove superfluous string use in SC user data serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 11:44:25 -07:00
hasareej 8408f6b815 PR feedback changes 2.0
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-06-30 18:02:44 +01:00