Commit Graph

63 Commits

Author SHA1 Message Date
michabr 6584e1290b Reenable LyShine mask support now using Atom (#1218)
* Add option to set stencil ref in Dynamic Draw Context

* Add depth/stencil attachment slot to UI pass

* Rework mask rendering to use Atom

* Add missing circle mask image
2021-06-11 10:03:06 -07:00
Terry Michaels 91fb8be535 Added toolbar icons, updated viewport header UX (#1240) 2021-06-10 11:42:25 -05:00
Terry Michaels aa7bab1027 Make SimpleAssetPropertyHandler handle showing the edit button on component cards (#1221) 2021-06-09 17:47:35 -05:00
Esteban Papp 36cb0f6d40 SPEC-7178 Removal of precompiled cpp files (#1171)
* SPEC-7178  Removal of precompiled cpp files

* Missing files...
2021-06-07 15:59:58 -07:00
Esteban Papp 76a6df341b SPEC-2513 Fixes to enable w4457 2021-06-04 10:51:47 -07:00
Esteban Papp 5d7aae9bd8 SPEC-2513 Fixes to enable w4459 (#1107)
* fixing w4459

* Fixes for nounity

* putting OLD_APARAM_USER in a common place to avoid duplicated declarations
2021-06-03 11:12:54 -07:00
Esteban Papp 29c71b4e53 SPEC-2513 Fixes to enable w4701 (#1105)
* Some fixes

* more fixes

* fixes for debug
2021-06-03 09:30:33 -07:00
Terry Michaels f2a7cd9a2d Fixed monolithic build warning/error (#1116) 2021-06-03 08:29:24 -05:00
michabr 5884fc1096 Fix LyShine instance not being initialized (#1078) 2021-06-01 15:48:57 -07:00
michabr aedc270304 Fix path not showing up in asset property control (#1037) 2021-05-28 13:40:08 -07:00
pappeste 01933f45b1 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
2021-05-27 10:39:37 -07:00
pappeste 0dd8fce2b0 Pass on fixing LmbrCentral.Static dependencies 2021-05-27 10:30:11 -07: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
michabr 8bd4c8d974 Add back text drawing using Draw2d (#928)
This is used by the UI Editor's viewport and also by LyShine to display debug text.
2021-05-26 20:51:05 -07:00
SJ 8ca3b078a2 Remove bootstrap.cfg and some references to it.
Merge pull request #836 from aws-lumberyard-dev/LYN-2461
2021-05-26 09:32:57 -07:00
pappeste a421b4cb71 Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/LYN-2948
# Conflicts:
#	scripts/o3de.py
2021-05-26 09:06:49 -07:00
lumberyard-employee-dm 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
lumberyard-employee-dm 76fe7f3666 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 23:48:55 -05:00
michabr 29163fba1a Replace call to Cry renderer to get viewport height (#939) 2021-05-25 18:51:37 -07:00
pappeste df44f782f2 More dependencies fixes 2021-05-25 18:11:48 -07:00
pappeste 19adbf2f41 Removing adding runtime dependencies for gems that are in the BUILD_DEPENDENCIES 2021-05-25 15:12:17 -07:00
michabr 713a3fd885 Convert TextureAtlas gem/builder to use Atom (#853)
* Convert TextureAtlas gem/builder to use Atom
* Convert image markup to use Atom image
2021-05-25 14:05:03 -07:00
pappeste 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
amzn-sj f4e6508347 Test fix for some failing tests on Linux 2021-05-24 09:50:19 -07:00
Nicholas Lawson c9d5d7fb77 The new gem registration and usage system
Merge from mainline (Rebase)
2021-05-20 10:47:03 -07:00
Terry Michaels 8cfe16c06f Added null check for m_font (#801) 2021-05-18 11:42:31 -05:00
bosnichd e2f5677bbc Remove a number of unused CryCommon interfaces and docs related folders. (#788) 2021-05-17 14:32:44 -06:00
phistere 0a8621ba0a Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-16 11:51:00 -05:00
lumberyard-employee-dm 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
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
michabr 67a1e4dc4f Merge pull request #711 from aws-lumberyard-dev/michabr/lyshine_viewport_fixes
UI Editor Viewport fixes
2021-05-13 10:25:44 -07:00
michabr 9cde3d60e9 Merge pull request #712 from aws-lumberyard-dev/michabr/lyshine_merge
LyShine/UI Editor fixes for Atom
2021-05-13 10:21:01 -07:00
phistere debbfc38d8 Merge branch 'main' into ly-as-sdk/LYN-2948 2021-05-13 11:25:03 -05:00
bosnichd 7cec2d8b07 Remove more unused things from CryCommon and CrySystem. (#709)
Lots of unrelated removals, I basically tried to remove everything exposed via gEnv that isn't used anymore, and following the threads found a few other things to remove also.
2021-05-12 08:30:15 -06:00
michabr 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
michabr 3219c787ac UI cursor Atom conversion (#607) 2021-05-11 23:00:26 -07:00
michabr 905bdf9627 Fix sprite asset selection in property editor (#384)
* Fix sprite asset selection in property editor

* Linux compile fix

* More fixes for the custom Sprite property handler

* PR feedback to use existing constant image extension
2021-05-11 22:53:29 -07:00
abrmich d98a691994 UI Editor Viewport fixes 2021-05-11 21:38:15 -07:00
phistere 5eecd2d5f7 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948 2021-05-11 17:27:10 -05:00
pappeste 083849b444 Fixing initialization of LyShin and removing a macro and ISystemEventListner that were not doing anything 2021-05-11 14:41:28 -07:00
bosnichd 3defbce31b Remove legacy serialization and QPropertyTree (#684)
Remove:
- CryCommon/CryExtension/*
- CryCommon/Serialization/*
- Sandbox/Plugins/EditorCommon/QPropertyTree/*
- All related CryCommon interfaces
- All CrySystem implementations
- Various related Editor classes
2021-05-11 09:31:02 -06:00
Terry Michaels 8ddfcabae7 Removed unneeded comments (#673) 2021-05-10 22:02:30 -05:00
bosnichd 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
bosnichd d7b796fd73 Remove I3DEngine CryCommon Interface (#567)
Delete:

- I3DEngine
- Missions
- Time of day
- GameEffectsSystem Gem
- ImageProcessing Gem
- SVOGI Gem
- Various other things that don't do anything now that the legacy renderer has been removed.
2021-05-05 09:07:28 -06:00
cgalvan 15c2203e01 Merge pull request #528 from aws-lumberyard-dev/cgalvan/RemoveLegacyMaterial
[LYN-3078] Removed legacy CMaterial and all related/unused classes.
2021-05-03 19:18:19 -05:00
Chris Galvan 8b0b3f4d02 [LYN-3078] Removed legacy CMaterial and all related/unused classes. 2021-05-03 16:42:11 -05:00
michabr 6b08719466 Fix UI Canvas loading in Launcher (#468) (#515)
* Fix UI Canvas loading in Launcher (#468)

* Resolve merge conflict
2021-05-03 13:58:54 -07:00
AMZN-koppersr 5eeeaf4346 Fixed several release build compile errors. 2021-05-01 13:26:54 -07:00
Terry Michaels 3eed53fa27 Crash fixes in LyShine with pRenderer being nullptr now (#496) 2021-04-30 19:41:46 -05:00
Vicky 1681e97a0c ATOM-15369 LYN-3352 Expose sorting paramers to DynamicDrawContext's draw functions (#451) (#463)
* ATOM-15369 Expose sorting paramers to DynamicDrawContext's draw functions
 LYN-3352 LyShine: First element in Hierarchy does not properly draw in UI Editor

Add function to DynamicDrawContext to support set sort key for followed draw calls.
Use different sort key for background draw and top layer draw in UI canvas.
2021-04-30 11:19:13 -07:00