birkeh/o3de - o3de - Gitea: DaWig's Git

Author	SHA1	Message	Date
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
Alex Montgomery	372ac2707f	fix outliner sorting using incorrect types for comparisons (#2052 ) * fix outliner sorting using incorrect types for comparisons, fixes for [LY-122258] and [LYN-3666] Signed-off-by: Alex Montgomery <alexmont@amazon.com> * fix annoying but necessary Qt type cast Signed-off-by: Alex Montgomery <alexmont@amazon.com>	2021-07-09 19:37:57 -07: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
Esteban Papp	d7c8c0192f	SPEC-7503 Mac nightly run asset profile failed to process "Translation/scriptcanvas_en_us.ts" (#1742 ) * copy frameworks to output for loose file case Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * patching lrelease Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fix for python in loose files and bundles Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * found what the problem is, setting a version just in case Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * fixup_bundle working with Python.framework and codesigning on AssetProcessor.app Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Trying to ignore other files to solve Jenkins Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Fix some qt stuff for mac Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * removal of cstemp files to prevent signature failures Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Updating Qt with fixes to solve some qt framework issues with include paths Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>	2021-07-08 17:20:20 -07:00
Chris Galvan	3b1873b045	Merged stabilization/2106 -> development (resolved merge conflicts). Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-07-08 13:56:47 -05:00
Esteban Papp	c132b00f6e	Removing some unused files from Code/Editor/Plugins (#1943 ) * fix path Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * remove some unused files from Code/Editor/Plugins Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>	2021-07-08 09:46:31 -07:00
AMZN-ScottR	34f70cb324	[mobile-settings-fixes] removed stale WAF reconfigure process on settings save Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>	2021-07-07 13:17:00 -07:00
AMZN-ScottR	11d36b0b5b	[mobile-settings-fixes] simplified and updated version validation regex to support 4 component strings Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>	2021-07-07 12:49:34 -07:00
Danilo Aimini	02f340abbd	Fix resource registration for the EntityOutlinerWidget class in AzToolsFramework. Also moves icons to a more appropriate location. (#1731 ) Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>	2021-07-01 18:37:44 -07:00
alexmontAmazon	9ef25cb5c4	rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640 ) (#1726 ) * rewrite of the filter code to fix [LYN-4156][LYN-4545] Signed-off-by: Alex Montgomery <alexmont@amazon.com> * improved onRowCountChanged() per comments Signed-off-by: Alex Montgomery <alexmont@amazon.com>	2021-07-01 13:59:10 -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
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
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
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
Esteban Papp	5fa495380c	Merge branch 'stabilization/2106' into redcode/SPEC-7563	2021-06-30 09:20:08 -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
Esteban Papp	1696680240	git mv Code\Sandbox\Plugins Code/Editor/Plugins Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>	2021-06-29 13:55:31 -07:00

17 Commits