Commit Graph

1437 Commits

Author SHA1 Message Date
AMZN-Phil 58a97d192b Merge pull request #1734 from aws-lumberyard-dev/LYN-4876
Update icons and launcher images to the O3DE logo
2021-07-01 21:21:09 -07:00
Danilo Aimini a0a36b867f LYN-4920 | The project image on the welcome page is disconnected from the Project manager (#1738)
* Display the correct project preview image in the Editor's Welcome Dialog.

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

* Minor fixes to variable naming for clarity.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-07-01 20:55:29 -07: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
pconroy 622139b3d5 Removed missed reference to deleted file.
Signed-off-by: pconroy <pconroy@amazon.com>
2021-07-01 17:38:40 -07:00
pconroy adb3b9366c Update icons and launcher images to the O3DE logo
Signed-off-by: pconroy <pconroy@amazon.com>
2021-07-01 17:38:33 -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
AMZN-stankowi 73522e90c9 FBX -> Scene, part 2. Code changes, file renames (#1704)
* First pass FBX -> Scene File conversion.
This is the simple pass, minimizing code changes and focused on comments.

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

* Step 1 of part 2 of the FBX -> Scene rename

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

* Renaming FbxSceneBuilder folder to SceneBuilder

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

* Renamed files

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

* More FBX -> Scene

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-07-01 15:46:55 -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
amzn-mike 8f7a0a0dbd Merge pull request #1656 from aws-lumberyard-dev/Helios_LYN-4880-IncorrectBoneNodes
[LYN-4880] Fix incorrect detection of bone nodes
2021-07-01 13:58:53 -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
Benjamin Jillich 1586c00fc8 [LYN-4929] Correct gems not showing as enabled for a template (#1722)
* When there are multiple project templates present, we re-gather the gems when changing the selected the project template.
* In case the user enabled or disabled any gem and they select a new project template, we show a warning dialog where users can either cancel the operation or proceed to the new project template. The warning dialog will only appear in case the enabled gems actually differ from the currently used template's default.
* New helper function to select the used project template.
* Storing the currently used project template index and only update the template details and emitting the changed event in case the user has actually chosen another template. This avoids emitting signals in case the user clicks on the already selected template.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-01 18:53:17 +02:00
Benjamin Jillich ea42ef78b8 [LYN-4938] Prism: Paths in Engine settings page do not use consistent slashes (#1721)
* Corrected focus for form line edit widgets.
* Consistent slash usage for folder browse edit widgets.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-07-01 18:44:28 +02:00
Alex Peterson f492949626 Removed mention of sample project from welcome screen (#1664) 2021-07-01 09:09:56 -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
amzn-mike af45aa299e Merge branch 'stabilization/2106' into Helios_LYN-4880-IncorrectBoneNodes 2021-07-01 10:18:57 -05:00
greerdv 0069e9aea6 Merge pull request #1719 from aws-lumberyard-dev/raycast-script-fixes
Raycast script fixes
2021-07-01 16:13:49 +01:00
amzn-sean a02ecefab9 short term fix for editor/game mode/launcher tick times consistency (#1720)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-07-01 14:47:51 +01: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
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
Esteban Papp 4d6f3aefd2 fix wrong path (#1697)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-30 17:02:54 -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
Terry Michaels 85a648049b Added tooltips to the viewport title buttons (#1691)
* Added tooltips to the viewport title dialog buttons

Signed-off-by: Terry Michaels <miterenc@amazon.com>
2021-06-30 16:47:59 -05:00
rgba16f 1f9917f5b7 Fix editor orbit camera (#1683)
* Add a way for the EditorViewportWidget to inform the legacy orbit camera of the calculated orbit distance.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-06-30 15:23:47 -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
amzn-mike 0a241d8fd0 Bump version
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-06-30 13:45:51 -05:00
amzn-mike d2d8e8bc3e unsigned to unsigned int
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-06-30 13:35:27 -05:00
hasareej 8408f6b815 PR feedback changes 2.0
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-06-30 18:02:44 +01:00
hasareej 32687cbcb2 PR feedback changes
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-06-30 18:01:52 +01:00
hasareej df0fede8d2 Hiding the 2 Clusters during Gameplay mode
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-06-30 18:00:52 +01:00
Esteban Papp 5fa495380c Merge branch 'stabilization/2106' into redcode/SPEC-7563 2021-06-30 09:20:08 -07:00
Steve Pham 03c8110d02 Replaced remaining CryTek copyright notices
- Replaced 'CryTek' with 'Contributors to the Open 3D Engine Project' in ConsoleHelpGen.cpp (#1667)
- Removed remaining 'Crytek Engine Source File.. Copyright (C), Crytek Studios' in various Editor source files
- Replaced 'modifications by CryTek' and 'modifications by Amazon' with 'Modified from original'
2021-06-30 08:27:43 -07:00
Benjamin Jillich 3a5b8808a0 [LYN-4879] Incorrect colour UI issue on Gem Configure (#1678)
* Aligned the column headers to the elements
* Moved the styling of the gem column header labels to the qss
* Fixed the scrollbar for the gem list view

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2021-06-30 17:12:01 +02:00
pereslav 1100e20e26 Merged ctrl+g fixes from MultiplayerEditorFixes
Signed-off-by: pereslav <pereslav@amazon.com>
2021-06-30 13:20:07 +01:00
nvsickle 528279af32 Fix Viewport camera position failing to update when "Find in viewport" is activated
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-06-29 18:19:23 -07:00
Esteban Papp d6caff7842 Some sandbox references I was missing
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-29 16:54:30 -07:00
Terry Michaels ffc05872cc Updated Helpers Icon per UX (#1658)
Signed-off-by: Terry Michaels <miterenc@amazon.com>
2021-06-29 17:37:34 -05:00
Esteban Papp d14229c67e some replacements and fixes that were referring Sandbox/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-29 13:55:32 -07:00
Esteban Papp 1696680240 git mv Code\Sandbox\Plugins Code/Editor/Plugins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-29 13:55:31 -07:00
Esteban Papp e34e36cb35 git mv Code\Sandbox\Editor Code/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-29 13:55:28 -07:00
Esteban Papp 9f0bbf3b74 SPEC-7531 Change Code/CryEngine to Code/Legacy (#1634)
* git mv Code\CryEngine Code\Legacy
* redirecting CMakeLists.txt
* fixing uic warning
* Some more CryEngine mentions
* validation scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-29 13:51:24 -07:00
amzn-mike 598c890cbc Fix nodes being incorrectly treated as bones
Some nodes have aiBones created by AssImp even though they aren't bones.  Filter these out by looking through the node graph and only considering

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-06-29 15:14:33 -05:00
Nicholas Van Sickle f570925c0d Merge pull request #1637 from aws-lumberyard-dev/nvsickle/FixRapidCameraSwitch
Fix switching cameras rapidly in the Editor accidentally copying camera positions
2021-06-29 12:37:04 -07:00