birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,581 Commits 3 Branches 3 Tags
e18bcc63f2a2b294e87f4328ea2f787cc8e1b82e
Commit Graph

4581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Cynthia Lin 82bd18ef5a [ATOM-15868] Collect and serialize initial benchmark metadata. 
Signed-off-by: Cynthia Lin <cyntlin@amazon.com>
 2021-06-30 19:42:14 -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
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
Brian Herrera 1b3eb1d44d Merge pull request #1689 from aws-lumberyard-dev/pipelines/SPEC-7574 
Add parameter so created EBS volumes are encrypted
 2021-06-30 16:45:31 -07:00
AMZN-Olex d7bfd34a67 IFilterEntityManager work 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 2021-06-30 19:18:06 -04: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
AMZN_Saulty 76b334f479 Merge pull request #1629 from o3de/add-code-of-conduct-1 
Create CODE_OF_CONDUCT.md
 2021-06-30 14:20:38 -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
chcurran 917dacb61e Added comment explaining state of progress of SC --> C++ 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-30 12:10:51 -07:00
chcurran df02813cd4 Hide ExecutionState methods from SC, Fixes LYN-4900 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-30 11:58:04 -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
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
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
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-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
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
brianherrera 0b75ebcdd8 Add parameter so created volumes are encrypted. 
Signed-off-by: brianherrera <briher@amazon.com>
 2021-06-30 11:12:57 -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
Gene Walters bafcdfe037 Merge pull request #1655 from aws-lumberyard-dev/genewalt/gitflow_210628 
Merging Stabilization/2106 into Development
 2021-06-30 11:07:30 -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
Tom Hulton-Harrop 8d35f31fa6 API documentation pass for CameraInput types (#1681) 
* add api comments for new camera system

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-06-30 18:16:35 +01: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
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