Commit Graph

3999 Commits (8f7a0a0dbd14e6e228faddf8b67c9e04388ba4d6)
 

Author SHA1 Message Date
amzn-mike 8f7a0a0dbd
Merge pull request #1656 from aws-lumberyard-dev/Helios_LYN-4880-IncorrectBoneNodes
[LYN-4880] Fix incorrect detection of bone nodes
5 years ago
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>
5 years ago
Shirang Jia af9f1aaae0
Remove unused package filelist (#1687) 5 years ago
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>
5 years ago
amzn-hdoke 74de7f785c
Fix reading AWSAttribution checkbox state (#1698)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
5 years ago
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>
5 years ago
Alex Peterson f492949626
Removed mention of sample project from welcome screen (#1664) 5 years ago
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
5 years ago
AMZN-stankowi 4c4be73bd5
First pass FBX -> Scene File conversion. (#1699)
This is the simple pass, minimizing code changes and focused on comments.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
5 years ago
Guthrie Adams ff9d52d38e
Merge pull request #1705 from aws-lumberyard-dev/Atom/guthadam/ATOM-15908
ATOM-15908 Fixed material component exporter to use correct relative paths
5 years ago
amzn-mike af45aa299e Merge branch 'stabilization/2106' into Helios_LYN-4880-IncorrectBoneNodes 5 years ago
greerdv 0069e9aea6
Merge pull request #1719 from aws-lumberyard-dev/raycast-script-fixes
Raycast script fixes
5 years ago
Scott Romero ffe77f7eed
[stabilization/2106] update installer job to override engine name (#1710)
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
5 years ago
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>
5 years ago
greerdv ef1c6732c8 fix licence on new file
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
greerdv 05a2ce4fe1 update based on PR feedback
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
greerdv 88615f462c merge from stabilization/2106
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
greerdv 899350b5c7 bring across lua raycast improvements from 1.x
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
hultonha e1de075789 Merge remote-tracking branch 'upstream/stabilization/2106' into hultonha_LYN-4304_viewport_ui_gamemode 5 years ago
moudgils c6b86e3c40
Remove an assert (#1712)
Signed-off-by: moudgils <moudgils@amazon.com>
Remove this assert as it was firing for swapchain imageview.
5 years ago
AMZN-ScottR 6af01fc378 Merge branch 'stabilization/2106' into installer/2106-engine-name
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
5 years ago
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>
5 years ago
Ken Pruiksma 7b1c37f296
[ATOM-15917] Taa pass will no longer crash if an input attachment is invalid. (#1702)
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
5 years ago
AMZN-ScottR 56ce9908a5 [installer/2106-engine-name] update installer job to override engine name
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
5 years ago
Esteban Papp 4d6f3aefd2
fix wrong path (#1697)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Nicholas Van Sickle e15519603a
Merge pull request #1703 from aws-lumberyard-dev/nvsickle/FixCameraSync
Fix duplicated camera entities in the Editor sharing a transform
5 years ago
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>
5 years ago
guthadam 4c28c9d894 ATOM-15908 Fixed material component exporter to use correct relative paths
Signed-off-by: guthadam <guthadam@amazon.com>
5 years ago
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>
5 years ago
nvsickle c546773521 Fix duplicated camera entities in the Editor sharing a transform
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
Scott Romero f5ea939ccf
[stabilization/2106] update default install path and provide warning about 'Program Files' (#1690) 5 years ago
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>
5 years ago
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>
5 years ago
amzn-hdoke be519bb36a
Allow overriding of AWSAttribution settings to skip consent dialog for automated testing (#1650)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
5 years ago
mrieggeramzn 345be58ca8
Merge pull request #1668 from aws-lumberyard-dev/Atom/mriegger/shadowonoffbug
Fix for shadow aliasing appearing when enabling/disabling lights
5 years ago
amzn-mike 0a241d8fd0 Bump version
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
5 years ago
dmcdiarmid-ly 89f4872469
Merge pull request #1674 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15902
[ATOM-15902] Reflection probes occasionally fail to hot-reload
5 years ago
amzn-mike d2d8e8bc3e unsigned to unsigned int
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
5 years ago
AMZN-ScottR 60f38b0c30 [cpack/2106-install-path] update default install path and provide warning about 'Program Files'
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
5 years ago
Tommy Walton 8d2154af26
Partial fix for LYN-2227 : MeshComponent initialization performance improvement (#1381)
Skip a shader item before creating a shader instance if it's not going to be rendered based on the draw tag. This avoids creating and releasing the shader instance over and over again, which results in a disk write each time during release.
5 years ago
Esteban Papp 473f856d76
SPEC-7563 Change Code/Sandbox/Editor to Code/Editor and Code/Sandbox/Plugins to Code/Editor/Plugins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
moudgils 9c3ebeba04
Fix metal mip writes within compute pass (#1673)
* Fix mip writes via compute passes by creates subresource views

- Create metal subresource views so that we can write into correct mips for compute passes
- Remove code to set the correct slice/level for gfx passes as the view will be correct now
- Handle cubemap/cubemaparray/3d texture types as the drivers do not allow subresource views.
5 years ago
hasareej 8408f6b815 PR feedback changes 2.0
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hasareej 32687cbcb2 PR feedback changes
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hasareej df0fede8d2 Hiding the 2 Clusters during Gameplay mode
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
Esteban Papp 5fa495380c Merge branch 'stabilization/2106' into redcode/SPEC-7563 5 years ago
balibhan 6392788212
Merge pull request #1547 from aws-lumberyard-dev/build_game_launcher
Test game launcher with GPU
5 years ago
Jacob Hilliard ed9232563d
[ATOM-15862] Fixing CPU profiler to save multiple regions within the same thread (#1636)
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
5 years ago
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'
5 years ago
Aaron Ruiz Mora 68f1410956
Using prefabs generated by the conversion tool (#1675)
Signed-off-by: moraaar <moraaar@amazon.com>
5 years ago