Commit Graph

299 Commits (development)

Author SHA1 Message Date
Chris Galvan 554f67f899 Resolved conflict in Gems/LmbrCentral/Code/lmbrcentral_files.cmake
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
lsemp3d 8e472a030b Added support for translating variables types in the variable manager
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
carlitosan 5794fa6c9d non-handler static initialization for runtime assets is made recursive on dependencies
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 132d06b6da fixed unit tests bugs, removed commented out code, removed loading spam
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 30bcddc694 fixed unit testing code
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran cdb858e8af Editor Script Component simplified and working
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 24b3167d48 EditorCOmponent build pipeline WIP
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 205b2c27ee SC Editor serialization update in JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 1c9c268231 Merge branch 'sc-editor-asset-redux' of https://github.com/aws-lumberyard-dev/o3de into sc-editor-asset-redux 4 years ago
chcurran 04fe1d5243 File state change include external delete detection
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Chris Galvan 68344f5a80 Updated Script Canvas component to use source handle property.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
chcurran f1632b099c editor sc component switched over to source handle, not yet connected to file notifications
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 487e2fb5bb remove typo
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 62878489a3 more aggressively release graph memory in version explorer
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 0367a3297f fixed version explorer issue
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Tommy Walton f5537b4b47
Merge pull request #5675 from aws-lumberyard-dev/amzn-tommy/gitflow_211116_o3de2
Merge stabilization/2110 as of c3dacb1 to development
4 years ago
lsemp3d a623f04f46 Applied feedback from PR
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
Tommy Walton 8fe4e7f08f Merge commit '82c83b2c5a47514956576cd336888f4354ace6a6' into amzn-tommy/gitflow_211116_o3de2 4 years ago
lsemp3d 7a279019b7 Improved generation for node generics, updated text for many math nodes
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
chcurran 0e7d732c61 fix upgrade scanner
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
lsemp3d 5072c2667f Fixed the application of translation overrides to free standing BehaviorProperty constants
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
carlitosan d0cf18e778 remove test code artifact
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan c140b882d2 Fix mis-spelled comment
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan 9898b6ee45 Move SC runtime asset static initialization out of data loading threads
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
lsemp3d abafd435ed Added C++ tooltip for custom nodes, updated text for AnimAudioComponentRequestBus
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
chcurran facfdf4e7a Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Luis Sempé 9e2a3226fd
Script Canvas, replace the text replacement system to a JSON file based one (#5228)
It is now possible to right click on nodes on the node palette to navigate to the file that holds the text data for any given node, this way it is easy to update and improve the naming of titles, subtitles, categories, tool tips and slots.
4 years ago
chcurran 47e9d5a117 multi tab close fixed
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran eefc3f9a91 new source file close button works, but not on multiple tabs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 0fa56ba5f8 new source file button works
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran a334ce09b4 source save in place first pass
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran ea5eba6e3f add file state for graphs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran b635e112fc clean up open pipeline to render graph
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran ad6dc8a3bd initial compile of detailed path of change to regular sc files
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 658da08495 Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 4 years ago
chcurran b7f6ebb708 Git MainWindow.cpp to point where it compiles, and reveals the radius of changes for everything to work without assets
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
lsemp3d bea3ee6dd0 Removed outdated and unused ScriptCanvas files
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
chcurran 0b646ac693 initial scriptcanvas source handle
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
carlitosan d7dbbe1420
Merge pull request #4329 from aws-lumberyard-dev/carlitosan/development
Refactor and bug fix Version Explorer (which automatically versions/upgrades ScriptCanvas Editor files).
5 years ago
chcurran 882e72dab3 fix for late compilation errors on untyped input
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran b2dc9aa666 merged main window changes
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
lumberyard-employee-dm f648cb1fd8
Update the FileIO Aliases (#4186)
* Update the FileIOAlias naming to make the cache, project root and engine
root paths more clear

The alias of `@root@`, `@assets@`, and `@projectplatformcache@` has been
collapsed to `@projectproductassets@`

The alias of `@devroot@` and `@engroot@` has been collapsed to
`@engroot@`

The alias of `@devassets@` and `@projectroot@` has been collapsed to
`@projectroot@`

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated use of devassets and devroot properties in python

Those properties now use projectroot and engroot

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updating the alias @engroot@ alias path comment in each platform specific LocalFileIO_*.cpp file

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed hardcoded size of 9 for the product asset alias.

The ResolvePath function now just appends the @projectproductassets@
alias with the input path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Remove duplicate @projectproductassets@ check in ProcessFileTreeRequest

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix for typos in Hydra python test

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated LocalFileIO::Copy call on Windows to use the Unicode aware CopyFileW API

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AWSMetreicsGemAllocatorFixture to properly suppress asset
cache write errors for Test file creation.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed unneeded call to set the @projectproductasstes@ alias at the bottom of the AssetSeedManagerTest SetUp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a deprecated alias map to the FileIO System

When a deprecated alias is accessed, the FileIO System logs an AZ_Error and indicates the alias that should be used

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated python test scripts to use the projectroot binding

Retrieving the AutomatedTesting project path based on "<devroot>/AutomatedTesting" has been removed.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated references to devroot and devgame within the codebase

The GetAbsoluteDevGameFolderPath functions has been replaced with direct call to AZ::Utils::GetProjectPath
The GetAbsoluteDevRootFolderPath functions has been replaced with direct calls to AZ::Utils::GetEnginePath

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated <engroot>/AutomatedTesting references to projectroot


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Replaced references that assumes the project path is <engroot>/AutomatedTesting with <projectroot> in the AutomatedTesting python test

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Correct casing in emfxworkspace file


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed newly added AppendPathParts function
Removed the Path constructors which accepts a PathIterable instance

The PathIterable isn't safe to return to a user of the Path class as it might be referencing temporary paths supplied via PathView arguments

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed unused parameter warning

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Undid change to the LexicallyProximate function to set the path result to the base path.

It needs to return the *this path if the pathResult is empty

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved the LocalFileIO ConvertToAbsolutePath implementations to AZ::Utils

Fixed the ConvertToAbsolutePath implementation for Unix platforms to use a buffer that is size PATH_MAX(4096 on all our supported Unix platforms).
Because the buffer before was AZ::IO::MaxPathLength which as a size of 1024, this was resulting in the Unix `realpath` function smashing the stack when it converts a path to an absolute path that is longer than 1024 characters

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the EditorCore.Tests to attach the AZ Environment to the EditorCore shared library that is statically loaded on launch.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed for DeprecatedAlaisesKeyVisitor Visit function causing the non string_view overloads being hidden causing a hidden base class function warning

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed the AWSMetricsGemMock to use a temporary for writing test assets

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the LocalFileIO::ResolvePath function to use HasRootPath to determine if a path starts with a root path such as "D:", "D:/" or "/"

IsAbsolute was not the corect check as the path of "D:" is a relative
path.
To be absolute according to the Windows the path must have a root
directory. i.e "D:/" or "D:\"

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed absolute path comment from LocalFile_UnixLike.cpp and LocalFile_Android.cpp FindFiles implementations
Updated the ConvertToAlias to supply an AZ::IO::FixedMaxPath

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Replaced usage of the @projectproductassets@ alias with @engroot@ when referring to the LmbrCentral source folder in the CopyDependencyBuilderTest and the SeedBuilderTests

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the ScriptCanvas Upgrade Tool to output backed up files to the
Project User Path instead of the engine root

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed whitespacing issues in Application.cpp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Remove unnecessary creation of a FixedMaxPath in the UpgradeTool.cpp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Modified testSeedFolder variable in the SeedBuilderTests to use the
@engroot@ alias instead of @projectproductassets@/.. alias when
referring to the LmbrCentral Gem source path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated references to the Project Asset Cache in the PythonTests.

Those tests no longer use the logic `azlmbr.paths.projectroot / "Cache" / "pc"` to retrieve a path to the cache root but instead the `azlmbr.paths.projectproductassets` constant

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed the FileIO Deprecated Alias test on Windows

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing @projectsourceassets@ alias, as it is only used once.

Updated the PhysX EditorSystemComponent.cpp to query the ProjectPath
form the SettingsRegistry.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Replaced @projectproductassets@ alias with @products@

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Rollback changes to the PhysX EditorSystemComponent.cpp

The changes to use the ProjectPath from the SettingsRegistry has been implemented in PR #4497

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
chcurran a870c6ad80 Fix explorer bugs and restore upgrade single option
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Artur K f44169f7fa
Cleanup SerializeContext.h pt.1 (#4264)
* Remove AssetSerializer inclusion from SerializeContext header

Moved a few Reflect methods to new cpp files.

In addition, some preparations for further header dependency reductions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix smoke test lua failures.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Windows build fixes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Missing license headers

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix white-space issues.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix inheritance list wrapping broken by older clang-format

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
Artur K bdc5cb1fff
Replace PROFILE define with AZ_PROFILE_BUILD
It now follows the schema defined by `AZ_DEBUG_BUILD` define instead.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
5 years ago
chcurran c14133e926 Remove false error for lookup on methods, that occurs during (de)serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Esteban Papp 5965760612 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 711b332ebe Gems/ScriptCanvas*
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
chcurran e3d007319d remove false error from deserializing BC nodes
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Esteban Papp 9f6d4125b8 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp d836503814 some more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
carlitosan 52460189aa
Merge pull request #3964 from aws-lumberyard-dev/carlitosan/development
Upgrades and stability fixes for version explorer
5 years ago
Esteban Papp 91e9c8d81f
Adds unused calls to Trace functions to prevent constant failures in release builds
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Steve Pham e6573766c2
Fixes for release builds for unused variable warnings (#4000)
Signed-off-by: Steve Pham <spham@amazon.com>
5 years ago
chcurran 443bf472cb removed unused function from script event handler node
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Esteban Papp d58bda5bbf WIP
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Alex Peterson 9f06bffc1b
Fix ebus node slots not checked for vars (#3994)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
5 years ago
chcurran 5c0bbe7ac1 add SC cvar settings cache
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran 64ab627f03 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 5 years ago
Esteban Papp 52607ce2c0 Gems/ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
chcurran c8ed6d287c Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 5 years ago
chcurran 9de22d5e54 Fix dependency errors after conversion to JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Esteban Papp 26d277cc14 Merge branch 'development' into issues/3202
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
chcurran 205c09e200 Better upgrade tool messaging and continuity on failure; fix for serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran 3b119b6f32 hot fix for json event input serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Esteban Papp c128760ed0 removes leftover of performance build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
chcurran f5485fa675 merge lastest; add extra data to scan result
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran 782c6748ae Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 5 years ago
chcurran 862df096db Add file information to Version; improve Method deserialization warnings; add SC unit test content to builders
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Steve Pham 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>
5 years ago
chcurran 9688832adc Initial fixes for graph update tool
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Esteban Papp 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
5 years ago
Esteban Papp 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
5 years ago
carlitosan 803bff70e4
Merge pull request #3438 from aws-lumberyard-dev/carlitosan/development
Bug fixes for SC editor asset scan in version explorer widget
5 years ago
chcurran 214700a73e Finish repair for scanning for upgrade tool
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Jeremy Ong 5e04c3737f Add preliminary budget tracking system and remove driller integration
Signed-off-by: Jeremy Ong <jcong@amazon.com>
5 years ago
Esteban Papp d91dbe3d92 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
carlitosan 4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development
JSON serialization of SC Editor Assets
5 years ago
Esteban Papp 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
5 years ago
Esteban Papp a901a41b3a Merge branch 'development' into cmake/remove_align_macros
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
chcurran 794c22c02e merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran 13188f8958 Simplify codegen of baseclass
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Luis Sempé 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
5 years ago
chcurran 95a812b238 fixup codegen, remove android errors
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Esteban Papp 23f99aeb94 more gems changes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 53dfb1a39e remove unnecessary ALIGN macros
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
chcurran d7d2e84fee Added all the missing serializer support, fixed up serialization notification
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Esteban Papp 323d642e65 Gems/ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp ea2f74dc0f more fixes for Gems
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
lsemp3d fd97a7688c Added missing reflection tag
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
5 years ago
lsemp3d 15af7e692e Removed old codegen tags and documented the only required Nodeable preprocessor definition
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
5 years ago
Esteban Papp 62a0041245 enable warning 4296: 'operator': expression is always false
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
lsemp3d ec7b76c1e9 Fixed typo in previous commit
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
5 years ago
Esteban Papp 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
5 years ago
lsemp3d 98f9f9ecbb Fixed category attribute application on NodeableNodes
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
5 years ago
Jeremy Ong 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>
5 years ago
Luis Sempé 7814d7679c
Merge pull request #3127 from aws-lumberyard-dev/scriptcanvas/codegenfix_namespace
Completed namespace support for the ScriptCanvasGrammar template
5 years ago
chcurran c701522adc update error messaging, remove unnecessary comments
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran ca8a148b63 fix Linux compile error
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago