Commit Graph

4233 Commits

Author SHA1 Message Date
dmcdiarmid-ly e14000e2e2 Merge pull request #1713 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15922
[ATOM-15922] ReflectionProbe does not refresh when changed to use an Authored cubemap
2021-07-01 13:24:31 -07:00
chcurran 0e8f8e5a7f Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 2021-07-01 12:52:58 -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
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
chcurran 6b27c1d797 fix python test against editor
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-01 11:18:03 -07:00
Victor Huang b93dd36c61 Changed AP window title and popup messages
Signed-off-by: Victor Huang <huavicto@amazon.com>
2021-07-01 10:26:44 -07:00
Shirang Jia af9f1aaae0 Remove unused package filelist (#1687) 2021-07-01 10:21:48 -07: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
chcurran 59ff74f559 The Great ScriptCanvas Purge. Part I.
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-01 09:57:36 -07: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
amzn-hdoke 74de7f785c Fix reading AWSAttribution checkbox state (#1698)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-07-01 09:51:32 -07: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
mriegger 346e294f60 Switch directional light to use the same reformulation as projected shadow and reduce to 16 bit float RT for perf 2021-07-01 09:02:02 -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-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>
2021-07-01 08:53:47 -07:00
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
2021-07-01 10:32:16 -05: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
Chris Galvan d7b516b518 Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit 2021-07-01 10:08:04 -05:00
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>
2021-07-01 07:56:40 -07: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 ef1c6732c8 fix licence on new file
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 14:11:47 +01:00
greerdv 05a2ce4fe1 update based on PR feedback
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 13:35:57 +01:00
chcurran 8cd07c6f4b update license on new files
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-07-01 05:33:59 -07:00
chcurran 6b2f2d55df Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/scriptcanvas/prefabs 2021-07-01 05:30:41 -07: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
moudgils c6b86e3c40 Remove an assert (#1712)
Signed-off-by: moudgils <moudgils@amazon.com>
Remove this assert as it was firing for swapchain imageview.
2021-06-30 23:23:55 -07:00
chcurran 2281330a7c merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 20:42:41 -07:00
AMZN-ScottR 6af01fc378 Merge branch 'stabilization/2106' into installer/2106-engine-name
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
2021-06-30 20:31:17 -07:00
dmcdiar 658c974db9 Properly handled reinitializing the cubemap asset when it is changed between Baked and Authored
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-06-30 20:15:30 -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
chcurran dcea6f47fa linux build fix
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 19:23:21 -07:00
chcurran 59f4e865a4 whitespace and string_view fixes
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 18:59:11 -07:00
dmcdiar ca606a5e08 Set IBL exposure value to 0.0 while baking ReflectionProbe cubemaps
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-06-30 18:35:25 -07:00
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>
2021-06-30 20:31:26 -05:00
chcurran 7b149e6f90 remove unnecessary reporting values from user script variable json serializer
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 18:14:05 -07:00
chcurran fe829bfbd4 Use 'missing' vs 'catastrophic' of missing $type field in user script variable json serializer
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 18:10:17 -07:00
chcurran 3948497f85 remove unused icon
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 18:05:39 -07:00
chcurran 66a935dfa4 Fix missing icon issue leading to failed nightly test: LYN-4926 SPEC-6982
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-06-30 18:04:06 -07:00
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>
2021-06-30 18:02:50 -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
Nicholas Van Sickle e15519603a Merge pull request #1703 from aws-lumberyard-dev/nvsickle/FixCameraSync
Fix duplicated camera entities in the Editor sharing a transform
2021-06-30 16:59:56 -07:00