52607ce2c0
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-03 20:38:07 -07:00
26d277cc14
Merge branch 'development' into issues/3202
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-01 15:19:32 -07:00
0ad2fe2294
Set enable gem variants feature ( #3631 )
...
* Implemented the RFC to allow projects to need to specify the Gems
Projects no longer need to specify CMake Targets to associate a Gem
variant with.
In order to associate a CMake Target with a gem variant a new
`ly_set_gem_variant_to_load` function has been added that maps CMake
Targets -> Gem Variants.
This allows CMake Targets to self describe which gem variants they
desire to build and load
This implementation is backwards compatible:
The `ly_enable_gems` function still accepts the TARGETS and VARIANTS
arguments which it will forward to the new `ly_set_gem_variant_to_load`
function to allow the input Targets to be associated with input Gem
Variants
This changes fixes the issue with gems that are required by an
Application regardless of the Project in use, not replicating it's
"requiredness" to the SDK layout
Fixes #3430
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Added an LY_PROJECT_NAME property to the Launcher targets
The `ly_enable_gems_delayed` now command queries the LY_PROJECT_NAME property
associated with each target to determine if the gems being enabled are
match the project the target is associated with.
In this case the target only adds dependencies if the gems is being enabled
without a specific project or if the gems is being enabled for the
matching project.
If the LY_PROJECT_NAME property is not set for target, it indicates the
gems for each project can be added as dependencies to the target.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* The INSTALL step now forwards the LY_PROJECT_NAME property for a target
The Install_common.cmake has been updated to support configuring
TARGET_PROPERTIES into the generated CMakeLists.txt for install targets.
Furthermore the indentation of the generated CMakeLists.txt has been
normalized to help with readability
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updating the Atom_Bootstrap CMakeLists.txt to enable the Atom_Bootstrap Gem
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Added a deprecation message to ly_enable_gems when supplying TARGETS and
VARIANTS
Added a define_property call for the LY_PROJECT_NAME target property
Removed the .Builders alias for the PrefabBuilder and renamed the
GEM_MODULE target o PrefabBuilder.Builders.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removed superflous space from AutomatedTesting Gem CMakeLists.txt
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-09-01 11:01:50 -05:00
2d45a6b4cb
[Experimental] Asset Picker Flatten View ( #3589 )
...
* Adding Asset Browser Table View to AssetPicker
Signed-off-by: igarri <igarri@amazon.com >
* Adding connections
Signed-off-by: igarri <igarri@amazon.com >
* Adding CVar to hide/show path column
Signed-off-by: igarri <igarri@amazon.com >
* Added Feedback from codereview
Signed-off-by: igarri <igarri@amazon.com >
* Changed m_showColumn name to m_ShownColumns
Signed-off-by: igarri <igarri@amazon.com >
2021-09-01 09:39:44 +01:00
3b119b6f32
hot fix for json event input serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-31 14:07:19 -07:00
c128760ed0
removes leftover of performance build
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-31 09:31:42 -07:00
fa0f2a1007
Fix unused warnings release ( #3677 )
...
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Linux
* Release build fix for Mac
* Release build fix for iOS
Signed-off-by: Steve Pham <spham@amazon.com >
2021-08-30 13:10:41 -07:00
d590a91fe7
Implemented helper method of QFileDialog::getSaveFileName to prevent user from saving files with invalid names.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-08-27 11:24:05 -05:00
ae4cfc3bd3
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Framework/AzCore/AzCore/Math/Guid.h
# cmake/Platform/Common/MSVC/Configurations_msvc.cmake
2021-08-25 15:40:41 -07:00
b9daf7f7c3
Enabling several warnings on MSVC that are not enabled by default and are good to have
2021-08-25 15:38:09 -07:00
058f6e0f22
PR comments/fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-25 14:06:26 -07:00
b8aab28759
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
2021-08-25 11:52:55 -07:00
6b96be82ea
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Legacy/CrySystem/Log.cpp
# Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
# Code/Tools/Standalone/Source/Driller/AreaChart.cpp
# Code/Tools/Standalone/Source/Driller/AreaChart.hxx
# Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
# Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
# Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
2021-08-25 11:47:19 -07:00
803bff70e4
Merge pull request #3438 from aws-lumberyard-dev/carlitosan/development
...
Bug fixes for SC editor asset scan in version explorer widget
2021-08-25 11:41:22 -07:00
63cad40db2
Merge pull request #3435 from aws-lumberyard-dev/scripting/slottypeselectorwidget
...
Improved layout and behavior of the SlotTypeSelector widget
2021-08-25 11:06:41 -07:00
be9ad98b24
remove commented out debugging artifacts
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-24 17:46:25 -07:00
214700a73e
Finish repair for scanning for upgrade tool
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-24 17:38:34 -07:00
4545e2fb33
Improved layout and behavior of the SlotTypeSelector widget
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-08-24 16:27:55 -07:00
26f6a714c8
initial fix for version scan
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-24 15:14:20 -07:00
5e04c3737f
Add preliminary budget tracking system and remove driller integration
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-24 15:07:29 -06:00
d91dbe3d92
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-24 11:49:35 -07:00
5361cf3b26
Merge branch 'development' into cmake/win_fix_wnew
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-24 11:49:07 -07:00
4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development
...
JSON serialization of SC Editor Assets
2021-08-24 11:45:18 -07:00
5ca84cb07e
Merge branch 'development' into cmake/win_fix_wnew
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Legacy/CryCommon/Cry_Camera.h
# Code/Legacy/CryCommon/IShader.h
2021-08-24 10:46:18 -07:00
9c7b55a31d
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
# Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
# Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
# Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
2021-08-24 10:43:48 -07:00
a901a41b3a
Merge branch 'development' into cmake/remove_align_macros
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-24 08:27:07 -07:00
794c22c02e
merge latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-23 16:02:58 -07:00
13188f8958
Simplify codegen of baseclass
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-23 15:56:45 -07:00
6ab776a3a6
Merge pull request #3354 from aws-lumberyard-dev/scripting/autogenfixes
...
Fixed categories not being properly applied for Nodeables & removed old code generator tags
> LG, I guess old NodeableCodegen definitions have all been migrated to new xml format file?
correct
2021-08-23 15:09:57 -07:00
95a812b238
fixup codegen, remove android errors
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-23 15:07:42 -07:00
31addc43dc
Windows and Linux compiling
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 14:02:45 -07:00
23f99aeb94
more gems changes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 13:03:37 -07:00
53dfb1a39e
remove unnecessary ALIGN macros
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 20:36:11 -07:00
d7d2e84fee
Added all the missing serializer support, fixed up serialization notification
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-20 19:35:38 -07:00
2e228d94f0
push/pop mismatch
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 18:39:40 -07:00
323d642e65
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 18:01:54 -07:00
b96b99363c
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:51:35 -07:00
ea2f74dc0f
more fixes for Gems
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:51:12 -07:00
fd97a7688c
Added missing reflection tag
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-08-19 17:02:39 -07:00
15af7e692e
Removed old codegen tags and documented the only required Nodeable preprocessor definition
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-08-19 16:38:19 -07:00
62a0041245
enable warning 4296: 'operator': expression is always false
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-19 16:16:28 -07:00
ec7b76c1e9
Fixed typo in previous commit
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-08-19 15:14:52 -07:00
f8e99cd7dd
Merge branch 'development' into cmake/SPEC-2513_w4244
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/CryEditDoc.cpp
# Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
# Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
# Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-19 08:53:41 -07:00
cf44a4ad67
Address additional PR feedback
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 19:16:05 -06:00
98f9f9ecbb
Fixed category attribute application on NodeableNodes
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-08-18 17:37:03 -07:00
a5f072f7a9
Remove statistics profiler
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:10 -06:00
df9b4d4a2f
Deprecate profiler categories based on global enum
...
(to be supplanted by registered budgets in the future)
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:09 -06:00
7814d7679c
Merge pull request #3127 from aws-lumberyard-dev/scriptcanvas/codegenfix_namespace
...
Completed namespace support for the ScriptCanvasGrammar template
2021-08-18 14:40:37 -07:00
c701522adc
update error messaging, remove unnecessary comments
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-18 13:28:01 -07:00
ca8a148b63
fix Linux compile error
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-18 12:16:39 -07:00
Esteban Papp
lumberyard-employee-dm
AMZN-Igarri
chcurran
Steve Pham
Chris Galvan
Luis Sempé
Jeremy Ong