18 Commits

Author SHA1 Message Date
Terry Michaels d9ec159f0e Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
Gitflow 7/16/21 - O3DE
2021-07-16 17:50:44 -05: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
lumberyard-employee-dm 158e25bd23 ly_create_alias() now adds the directory it was called from to the (#2120)
LY_ALL_TARGET_DIRECTORIES property if that directory has not already
been added

This addresses an issue where if a CMakeLists.txt contains a call to
ly_create_alias(), but NOT a call to ly_add_target, it would not be
added to the generated CMakeLists.txt for the install layout

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-12 20:22:32 -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 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
guthadam e85b5a8c48 Fixing material editor startup and critical asset issues
Added builder and tool aliases
Added dependency to Atom Bridge
2021-06-09 00:35:31 -05:00
pappeste f1b688f435 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
Nicholas Van Sickle d1863c6c5b Restore Editor viewport icon rendering (#879)
This introduces an EditorViewportIconDisplayInterface that will eventually be used to outright remove CIconManager, it provides a simple interface for loading 2D image assets and rendering them on-screen. It also introduces AtomBridge::PerViewportDynamicDraw for getting a dynamic draw instance on a per-viewport basis
2021-05-26 16:36:54 -07:00
lawsonamzn 6a7a86062e Updates AutomatedTesting project and adds atom support 2021-05-20 10:48:50 -07:00
nvsickle 559798251d Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-12 11:55:51 -07:00
nvsickle 6fcd5c7817 Restore Viewport debug text
Adds the AtomViewportDisplayInfo Gem which renders debug text to the default viewport context depending on the value of r_DisplayInfo.
The gem is flagged as a dependency of AtomBridge, so all Atom projects will consume it by default.
2021-05-11 18:27:47 -07:00
Aristo7 fe24f37a70 Fixing up null.builder loading issue 2021-05-11 15:34:31 -05:00
Aristo7 703f9deee0 Testing jenkins break 2021-05-11 12:43:30 -05:00
Aristo7 1e232294d5 Added Null RHI to all targets 2021-05-10 14:36:32 -05:00
Aristo7 6dcc75ed78 AtomBridge contains all runtime deps now 2021-05-05 14:43:41 -05:00
nvsickle 1dabb39b98 Migrate fixes from CodeCommit branch 2021-04-09 12:40:43 -07:00
alexpete 36c4e827bd Integrating latest from github/staging
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00