birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,990 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ea42ef78b8'
${ noResults }
Commit Graph

3990 Commits (ea42ef78b864943977c72a1f3eda19d6e1632af7)
 

Author SHA1 Message Date
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
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
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-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
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>
 5 years ago
SergeyAMZN 18d4f1022f
Merge pull request #1677 from aws-lumberyard-dev/MultiplayerEditorFixes2 
Merged ctrl+g fixes from MultiplayerEditorFixes
 5 years ago
pereslav 1100e20e26 Merged ctrl+g fixes from MultiplayerEditorFixes 
Signed-off-by: pereslav <pereslav@amazon.com>
 5 years ago
dmcdiar 09aba94da7 Fixes for ReflectionProbe hot reloading 
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
 5 years ago
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
 5 years ago
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
 5 years ago
AMZN-mnaumov 48c5854666
Merge pull request #1621 from aws-lumberyard-dev/Atom/mnaumov/LYN-4544cherryPick 
[LYN-4544] Fixing thumbnail crashing on bad data
 5 years ago
nvsickle 528279af32 Fix Viewport camera position failing to update when "Find in viewport" is activated 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 5 years ago