Commit Graph

16 Commits

Author SHA1 Message Date
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
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
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
mnaumov 588127772c Fixing missing preview in texture settings 2021-06-14 12:40:19 -07:00
moudgils 058688c182 Merge pull request #723 from aws-lumberyard-dev/Atom/moudgils/FixTextureArray
iOS Fixes to get RHI samples running again
2021-05-14 09:23:10 -07:00
bosnichd a9d986c10f Red code legacy MemoryManager, StreamEngine, ResourceManager, ImageHandler, AsyncPakManager, and more (#758)
Remove from CryCommon and CrySystem:
- MemoryManager and all related classes/files
- StreamEngine, ResourceManager, ImageHandler, and AsyncPakManager
- Various other related interfaces/files/classes etc. that are all now unused
2021-05-14 08:53:56 -06:00
moudgils da8f5849aa Merge branch 'main' into Atom/moudgils/FixTextureArray 2021-05-13 14:03:54 -07:00
moudgils 521a486ee4 Fixes to ios build 2021-05-10 09:13:15 -07:00
mnaumov 550d935b82 Better AP error message when missing image present 2021-05-06 15:48:39 -07: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 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -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