0dd8fce2b0
Pass on fixing LmbrCentral.Static dependencies
2021-05-27 10:30:11 -07:00
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
9b1be43367
Renamed osx_gl to mac and es3 to android for cache folders ( #949 )
2021-05-26 19:17:17 -05:00
4652d47fb3
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
db0db5c1c0
Proper dependencies to LmbrCentral/LmbrCentral.Editor, mixing those two can cause Editor modules to load non-Editor modules
2021-05-24 18:57:48 -07:00
c9d5d7fb77
The new gem registration and usage system
...
Merge from mainline (Rebase)
2021-05-20 10:47:03 -07:00
5cc0cc9ee7
Fixed the loading of uicanvas assets due to the NetBindable class being ( #755 )
...
removed from the SerializeContext.
The TransformComponent and ScriptComponent which used to Serialize a
NetBindable instance didn't have their version numbers bumped in order
to skip the old data when loading a binary ObjectStream
2021-05-14 11:03:31 -05:00
d9cb61575e
Fix up particle emitter to work with Atom ( #626 )
...
* Fix up particle emitter component to work with Atom
* PR feedback and disable render target tests until supported
2021-05-11 23:16:36 -07:00
440c40e490
Remove (almost) all references to pRenderer ( #651 )
...
Remove all references to pRenderer, except from the DebugDraw and LyShine Gems that are still being updated.
2021-05-10 10:05:15 -06:00
0f9f4be382
[LYN-3357] Cherry-pick fix to UI textures to make them process as the correct type.
2021-05-03 14:38:08 -05:00
3eed53fa27
Crash fixes in LyShine with pRenderer being nullptr now ( #496 )
2021-04-30 19:41:46 -05:00
28170ffe41
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
c66e2f4bcf
Initial phase of UI Canvas Editor rendering with Atom ( #164 )
...
* Move Draw2d.h to Include folder
* Initial phase of UI Canvas Editor rendering with Atom
* Simplify Draw2d by removing BeginDraw2d/EndDraw2d which is no longer needed
* Fix compile errors for non-unity builds
2021-04-21 23:30:11 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
pappeste
Terry Michaels
lumberyard-employee-dm
Nicholas Lawson
michabr
bosnichd
Mike Balfour
Chris Burel
alexpete