8 Commits

Author	SHA1	Message	Date
Chris Galvan	df9358c492	Merge pull request #2109 from aws-lumberyard-dev/cgalvan/RemoveDeprecatedGraphicsMenuItems ... Removed deprecated graphics settings/performance menu options. Updated automated test accordingly.	2021-07-12 16:57:34 -05:00
Chris Galvan	2fc1062802	Removed deprecated graphics settings/performance menu options. Updated automated test accordingly. ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-07-12 13:42:08 -05:00
Chris Galvan	e924ed0b86	Merged stabilization/2106 to development; Resolved merge conflicts ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-07-12 10:45:23 -05:00
jjjoness	1b530195fc	Clarify ImGui activation in Editor viewport (#1765) ... * Clarify ImGui activation in Editor viewport Signed-off-by: John Jones-Steele <jjjoness@amazon.com> * All working following changes from comments in PR Signed-off-by: John Jones-Steele <jjjoness@amazon.com> * One more change Signed-off-by: John Jones-Steele <jjjoness@amazon.com> * fixes from comments in PR. Signed-off-by: John Jones-Steele <jjjoness@amazon.com> * Fixed git merge error Signed-off-by: John Jones-Steele <jjjoness@amazon.com> * Added header to ImGuiBus.h Signed-off-by: John Jones-Steele <jjjoness@amazon.com> * Fix for Jenkins error Signed-off-by: John Jones-Steele <jjjoness@amazon.com> * Minor typo fix Signed-off-by: John Jones-Steele <jjjoness@amazon.com>	2021-07-09 12:03:20 -05:00
Chris Galvan	d7574777a8	Resolved merge conflicts ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-07-02 12:42:44 -05: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
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
Esteban Papp	e34e36cb35	git mv Code\Sandbox\Editor Code/Editor ... Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>	2021-06-29 13:55:28 -07:00