Commit Graph

3982 Commits

Author SHA1 Message Date
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
greerdv 0069e9aea6 Merge pull request #1719 from aws-lumberyard-dev/raycast-script-fixes
Raycast script fixes
2021-07-01 16:13:49 +01: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
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
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
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
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
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
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
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
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
guthadam 4c28c9d894 ATOM-15908 Fixed material component exporter to use correct relative paths
Signed-off-by: guthadam <guthadam@amazon.com>
2021-06-30 17:14:34 -05: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
nvsickle c546773521 Fix duplicated camera entities in the Editor sharing a transform
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-06-30 14:44:34 -07:00
Scott Romero f5ea939ccf [stabilization/2106] update default install path and provide warning about 'Program Files' (#1690) 2021-06-30 14:33:31 -07: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-hdoke be519bb36a Allow overriding of AWSAttribution settings to skip consent dialog for automated testing (#1650)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-06-30 12:17:45 -07:00
mrieggeramzn 345be58ca8 Merge pull request #1668 from aws-lumberyard-dev/Atom/mriegger/shadowonoffbug
Fix for shadow aliasing appearing when enabling/disabling lights
2021-06-30 11:53:04 -07:00
dmcdiarmid-ly 89f4872469 Merge pull request #1674 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15902
[ATOM-15902] Reflection probes occasionally fail to hot-reload
2021-06-30 11:36:52 -07:00
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>
2021-06-30 11:19:52 -07:00
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.
2021-06-30 11:13:54 -07:00
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>
2021-06-30 11:10:39 -07:00
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.
2021-06-30 10:44:59 -07:00
Esteban Papp 5fa495380c Merge branch 'stabilization/2106' into redcode/SPEC-7563 2021-06-30 09:20:08 -07:00
balibhan 6392788212 Merge pull request #1547 from aws-lumberyard-dev/build_game_launcher
Test game launcher with GPU
2021-06-30 21:25:30 +05:30
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>
2021-06-30 08:51:32 -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
Aaron Ruiz Mora 68f1410956 Using prefabs generated by the conversion tool (#1675)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-06-30 16:18:14 +01: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
SergeyAMZN 18d4f1022f Merge pull request #1677 from aws-lumberyard-dev/MultiplayerEditorFixes2
Merged ctrl+g fixes from MultiplayerEditorFixes
2021-06-30 14:47:19 +01:00
pereslav 1100e20e26 Merged ctrl+g fixes from MultiplayerEditorFixes
Signed-off-by: pereslav <pereslav@amazon.com>
2021-06-30 13:20:07 +01:00
dmcdiar 09aba94da7 Fixes for ReflectionProbe hot reloading
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-06-30 00:40:30 -07:00
dmcdiarmid-ly c4a20405e2 Merge pull request #1666 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14526
[ATOM-14526] DiffuseProbeGrid and ReflectionProbe components alter box shape size
2021-06-29 23:27:38 -07:00
Nicholas Van Sickle 84853175e5 Merge pull request #1669 from aws-lumberyard-dev/nvsickle/FixCenterOnAABB
Fix Viewport camera position failing to update when "Find in viewport……" is activated
2021-06-29 20:51:26 -07:00
AMZN-mnaumov 48c5854666 Merge pull request #1621 from aws-lumberyard-dev/Atom/mnaumov/LYN-4544cherryPick
[LYN-4544] Fixing thumbnail crashing on bad data
2021-06-29 18:48:41 -07: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
Guthrie Adams ade4199c28 Merge pull request #1662 from aws-lumberyard-dev/Atom/guthadam/ATOM-15892_fixing_material_slot_clear_overrides
ATOM-15892 fixing material component clear overrides button
2021-06-29 20:05:06 -05:00
Riegger 30834a33a4 Fix for shadow aliasing appearing when enabling/disabling lights
Signed-off-by: Riegger <mriegger@amazon.com>
2021-06-29 17:00:30 -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
guthadam 64186b4ec6 ATOM-15892 fixing material component clear overrides button
The clear material override properties button was not sending the notification to update the entity or undo state.

Signed-off-by: guthadam <guthadam@amazon.com>
2021-06-29 18:45:40 -05:00
dmcdiar b65a2da548 Changed the DiffuseProbeGrid and ReflectionProbe components to only override the Box size if it's at the default (unit)
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-06-29 16:10:03 -07:00
Scott Romero 0b3884985e [stabilization/2106] generalize progress screen text and split out download/execution progress (#1654) 2021-06-29 15:57:22 -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
Vincent Liu f7c96e44b0 [LYN-4848] Migrate remaining doc links to o3de.org (#1632) 2021-06-29 14:56:09 -07:00