13 Commits

Author	SHA1	Message	Date
Esteban Papp	8f05c7aa2f	Several build fixes	2021-08-12 16:42:18 -07:00
Steve Pham	38261d0800	Shorten copyright headers by splitting into 2 lines (#2213) ... * Updated all copyright headers to split the longer original copyright line into 2 shorter lines Signed-off-by: Steve Pham <spham@amazon.com>	2021-07-16 15:25:48 -07:00
Chris Galvan	d7574777a8	Resolved merge conflicts ... Signed-off-by: Chris Galvan <chgalvan@amazon.com>	2021-07-02 12:42:44 -05: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
Gene Walters	4e14c0069b	Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628	2021-06-28 19:09:20 -07:00
Steve Pham	70042fcdcd	O3DE Copyright Updates for Linux Foundation (#1504)	2021-06-23 10:55:22 -07:00
AMZN-Olex	2f5cffe679	Added r_ViewportPos cvar for set the position of a viewport of a game/server launchers	2021-06-15 13:46:53 -04:00
bosnichd	1d4c483e73	Red code legacy renderer (#383) ... - Remove some references to gEnv->pRenderer/GetIEditor()->GetRenderer() that is now always null. - Restore the debug console to existence. - Stop building the following in preparation for their removal: Code/CryEngine/Cry3DEngine/* Code/CryEngine/RenderDll/* Code/Tools/CryFXC/* Code/Tools/HLSLCrossCompiler/* Code/Tools/HLSLCrossCompilerMETAL/* Code/Tools/RC/* Code/Tools/ShaderCacheGen/* Tools/CrySCompileServer/*	2021-04-30 07:31:42 -06:00
Chris Burel	28170ffe41	Add newlines to the end of all files	2021-04-23 09:43:40 -07:00
alexpete	8469c9ca0a	Integrating github/staging through commit 5f214be	2021-04-13 17:18:57 -07:00
alexpete	36c4e827bd	Integrating latest from github/staging ... Integrating up through commit 5e1bdae	2021-03-26 14:32:02 -07:00
alexpete	75dc720198	Integrating latest 47acbe8	2021-03-25 13:57:57 -07:00
alexpete	a10351f38d	Initial commit	2021-03-08 14:30:57 -08:00