5965760612
Merge branch 'development' into cmake/warn_virtual
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
fd71704894
rename view files --> controller
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
711b332ebe
Gems/ScriptCanvas*
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
b6eb9123e5
version explorer refactor wip
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
e0f93ea159
view traits wip before rename
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
e558e7b0ff
rename version explorer ui to view
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
30d27f23ee
rename version explorer to view
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
5cee8d1892
stubbed out refactor of version explorer
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
e3d007319d
remove false error from deserializing BC nodes
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
9f6d4125b8
Merge branch 'development' into cmake/warn_virtual
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
d836503814
some more fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
52460189aa
Merge pull request #3964 from aws-lumberyard-dev/carlitosan/development
...
Upgrades and stability fixes for version explorer
4 years ago
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>
4 years ago
34ca9bd5ba
fix Linux error
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
e6573766c2
Fixes for release builds for unused variable warnings ( #4000 )
...
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
f414cd3966
More fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
443bf472cb
removed unused function from script event handler node
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
d58bda5bbf
WIP
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
9f06bffc1b
Fix ebus node slots not checked for vars ( #3994 )
...
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
4 years ago
2a810c4845
fix backup file action in version explorer
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
5c0bbe7ac1
add SC cvar settings cache
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
64ab627f03
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
4 years ago
52607ce2c0
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
4ed7feae5d
Keep editor alive when not in focus
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
e1e1779ec6
Fix for file size limit in JSON
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
c8ed6d287c
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
4 years ago
f4dbeb6538
Fix list of manual inspection graphs
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
e69a5bc092
fix progress bar for upgrades
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
3822f92882
fix manual inpsection window
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
a353005296
only track dependent assets with valid ids, as sanity check
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
9de22d5e54
Fix dependency errors after conversion to JSON
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
b5a32e1c4c
remove temporay files in all cases
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
26d277cc14
Merge branch 'development' into issues/3202
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
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>
4 years ago
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>
4 years ago
f277cf59dc
multi threaded fix for upgrader
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
205c09e200
Better upgrade tool messaging and continuity on failure; fix for serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
3b119b6f32
hot fix for json event input serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
c128760ed0
removes leftover of performance build
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
16ed1e1882
More status reporting, fixed widget row index tracking for upgrader tool
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
f5485fa675
merge lastest; add extra data to scan result
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
782c6748ae
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
4 years ago
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>
4 years ago
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>
4 years ago
9688832adc
Initial fixes for graph update tool
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
d590a91fe7
Implemented helper method of QFileDialog::getSaveFileName to prevent user from saving files with invalid names.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
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
4 years ago
b9daf7f7c3
Enabling several warnings on MSVC that are not enabled by default and are good to have
4 years ago
058f6e0f22
PR comments/fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
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
4 years ago
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
4 years ago
803bff70e4
Merge pull request #3438 from aws-lumberyard-dev/carlitosan/development
...
Bug fixes for SC editor asset scan in version explorer widget
4 years ago
63cad40db2
Merge pull request #3435 from aws-lumberyard-dev/scripting/slottypeselectorwidget
...
Improved layout and behavior of the SlotTypeSelector widget
4 years ago
be9ad98b24
remove commented out debugging artifacts
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
214700a73e
Finish repair for scanning for upgrade tool
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
4545e2fb33
Improved layout and behavior of the SlotTypeSelector widget
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
26f6a714c8
initial fix for version scan
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
5e04c3737f
Add preliminary budget tracking system and remove driller integration
...
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
d91dbe3d92
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
5361cf3b26
Merge branch 'development' into cmake/win_fix_wnew
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development
...
JSON serialization of SC Editor Assets
4 years ago
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
4 years ago
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
4 years ago
a901a41b3a
Merge branch 'development' into cmake/remove_align_macros
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
794c22c02e
merge latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
13188f8958
Simplify codegen of baseclass
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
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
4 years ago
95a812b238
fixup codegen, remove android errors
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
31addc43dc
Windows and Linux compiling
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
23f99aeb94
more gems changes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
53dfb1a39e
remove unnecessary ALIGN macros
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
d7d2e84fee
Added all the missing serializer support, fixed up serialization notification
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
2e228d94f0
push/pop mismatch
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
323d642e65
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
b96b99363c
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
ea2f74dc0f
more fixes for Gems
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
fd97a7688c
Added missing reflection tag
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
15af7e692e
Removed old codegen tags and documented the only required Nodeable preprocessor definition
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
62a0041245
enable warning 4296: 'operator': expression is always false
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
ec7b76c1e9
Fixed typo in previous commit
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
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
4 years ago
cf44a4ad67
Address additional PR feedback
...
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
98f9f9ecbb
Fixed category attribute application on NodeableNodes
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
a5f072f7a9
Remove statistics profiler
...
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
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>
4 years ago
7814d7679c
Merge pull request #3127 from aws-lumberyard-dev/scriptcanvas/codegenfix_namespace
...
Completed namespace support for the ScriptCanvasGrammar template
4 years ago
c701522adc
update error messaging, remove unnecessary comments
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
ca8a148b63
fix Linux compile error
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
b813f2fbf4
add compiler flag for object stream support of SC editor assets
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
1ad182105b
fix memory leak and possible nullptr read
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
de9e991ccc
merge development
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
778ebc39a2
add listener to cmake files
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
88121f3bb4
move JsonUtils to AzCore
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
0270fb7fbe
Initial saving/loading of JSON serialization of sc editor assets
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
f22d2d736b
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
14e7754334
More fixes for warnings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
67a5bc98ce
ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
e9b4f48f71
more fixes, will merge fixes for w4245 and w4389
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
3522f622f3
more castings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
f914f7680a
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
b52516cdec
ScripCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
88bef1074b
Replaced some Lumberyard references with O3DE.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
9ecb746563
Completed namespace support for the ScriptCanvasGrammar template
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
5044204839
Move JsonUtils.h for support of SC serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
a56be14677
JSON saving of SC editor assets
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
8c21c85972
Merge pull request #3028 from aws-lumberyard-dev/carlitosan/development
...
Addes JSON serialization support for properties stored in the EditorScriptCanvasComponent. Add tool tips to explain repeater node behavior, remove empty "User Functions" and "Script Event" headings from Editor.
4 years ago
fe21b89d8e
working support for editor property json serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
d2c87fd21f
initial json serialization for editor sc properties
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
2b4bd10028
Updated path to icon that was emitting a warning
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
584c125fbc
rename serializer
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
3374b82360
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
4 years ago
aaa847a569
Remove empty User Functions and Script Event sections
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
4cee263033
Minimal TypeInfo header/reduce std interdependencies. ( #2688 )
...
* Minimal TypeInfo header/reduce std interdependencies.
TypeInfoSimple.h is a small header that can replace the use of
TypeInfo.h in some cases.
Signed-off-by: Nemerle <nemerle5+git@gmail.com>
* Windows build fixed
Removed algorithm.h from string_view.h
smoke-test passed
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Resotore dynamic_pointer_cast in intrusive_ptr
Requested by reviewer.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
* Fix CI build
string.h - missed alogorithm.h, since it was removed from string_view
NodeWrapper.h - missing smart_ptr.h
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
Co-authored-by: Nemerle <nemerle5+git@gmail.com>
4 years ago
c0ed0a7925
Added more tool tip data to repeater.
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
2c7f6f9742
Adds Links to Gem Directory and Documentation for Gems ( #2922 )
...
* Changed blue text to white that is not meant as a link, made 'View in Director' link work for gems in the inspector, added parsing for gem documentation link
Signed-off-by: nggieber <nggieber@amazon.com>
* Added documentation links for gems, changed markup for urls in summaries and requirements so they are clickable
Signed-off-by: nggieber <nggieber@amazon.com>
* Fixed a couple of the documentation links
Signed-off-by: nggieber <nggieber@amazon.com>
* Added documentation url to edit gem properties script and updated unit tests
Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
19d79f1559
Merge branch 'development' into cmake/SPEC-2513_w4267
4 years ago
2c96556576
Removed unnecessary argument in node generic macro
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
1f0fcf2aa2
Updates GetDirectionVector nodes to also return the distance between the points
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
20515c46be
Updated DirectionTo node's tooltips to match the translation file
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
6188df4b49
Added Get Direction Vector node for Vector2,3 and 4
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
b33a4db332
Merge branch 'development' into cmake/SPEC-2513_w4267
4 years ago
24607df8f3
Added .gitignore so that Script Canvas debug logs don't get picked up as untracked files.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
893a80a54e
Fix variables names in the property window
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
3633bf2ed0
remove accidental submission of commented out event handling
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
0313b16a85
display unused variables in the editor; bump builder version for recent change to EntityId nodes
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
41421d82fc
Merge pull request #2589 from aws-lumberyard-dev/carlitosan/development
...
fix dangling component variables on cleared script, fix EntityIDNode …
4 years ago
43dfffa3fd
fix dangling component variables on cleared script, fix EntityIDNode reflection
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
9475d1612b
Merge branch 'development' into carlitosan_fix_for
4 years ago
d7a4b0d930
fix for double asset registration and multiple outs from loop nodes
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
e3344bdf8d
ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
055915ec4f
merge from latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
1e3c55246a
Merge pull request #2490 from aws-lumberyard-dev/carlitosan/fix_null_check
...
remove null data check from connected slots
4 years ago
76a3195487
remove null data check from connected slots
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
223654c41b
Add fix and unit tests for pure on graph start functions and direct entity id input
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
b8300c6248
fix entity reference removal when not in a variable
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
3ad8f0dbf9
adjust location of disabling SC unit tests on Linux
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
6f07a0b136
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
4 years ago
a87318c52a
temporarily disable SC unit tests on Linux until a file case issue is solved
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
9a4a7bc156
Script Canvas: Fixed Scope and Initial Value selection boxes
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
9639003a7d
LYN-4774 Fix missing box icons inside the main Viewport ( #2297 )
...
* LYN-4774 Fix missing box icons inside the main Viewport
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
* V2 icons
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
* Bug fixes
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
4 years ago
eb24edbce7
Merge pull request #2304 from aws-lumberyard-dev/scripting/contract_crash_fix
...
Crash guard when the data has a list with an empty contract
4 years ago
6c4fdd3af5
Missing early out if no contract exists
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
8d56a031ef
crash guard when the data has a list with an empty contract
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
82f89d596e
Merge branch 'development' into cmake/SPEC-7179
5 years ago
d9ec159f0e
Merge pull request #2235 from aws-lumberyard-dev/daimini/gitflow_210716_o3de
...
Gitflow 7/16/21 - O3DE
5 years ago
1f9b284de2
Merge branch 'development' into cmake/SPEC-7179
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
# Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
# Code/Editor/Plugins/EditorCommon/stdafx.cpp
# Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
# Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
# Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
# Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
# Code/Tools/AssetProcessor/native/precompiled.h
# Code/Tools/Standalone/StandaloneTools_precompiled.h
# Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
# Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
# Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
# Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
# Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
# Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
# Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
# Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
# Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
# Gems/Blast/Code/Source/StdAfx.cpp
# Gems/Camera/Code/Source/Camera_precompiled.h
# Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
# Gems/FastNoise/Code/Source/FastNoise_precompiled.h
# Gems/Gestures/Code/Source/Gestures_precompiled.h
# Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
# Gems/GraphCanvas/Code/precompiled.h
# Gems/ImGui/Code/Source/ImGui_precompiled.h
# Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
# Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
# Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
# Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
# Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
# Gems/LyShine/Code/Source/LyShine_precompiled.h
# Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
# Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
# Gems/Maestro/Code/Source/Maestro_precompiled.h
# Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
# Gems/Metastream/Code/Source/Metastream_precompiled.h
# Gems/Microphone/Code/Source/Microphone_precompiled.h
# Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
# Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
# Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
# Gems/PhysX/Code/Source/PhysX_precompiled.h
# Gems/PhysX/Code/physx_unsupported_files.cmake
# Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
# Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
# Gems/ScriptCanvas/Code/Editor/precompiled.h
# Gems/ScriptCanvas/Code/Source/precompiled.h
# Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
# Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
# Gems/ScriptEvents/Code/Source/precompiled.h
# Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
# Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
# Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
# Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
# Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
# Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
# Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
# Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
# Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
# Gems/Twitch/Code/Source/Twitch_precompiled.h
# Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
5 years ago
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>
5 years ago
e9270e491a
Merge branch 'stabilization/2106' into daimini/gitflow_210716_o3de
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
# Conflicts:
# scripts/build/bootstrap/incremental_build_util.py
5 years ago
e2c1477629
fix for dependency job key on ScriptEvents from SC builder
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
b7f71fb153
others
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp
chcurran
Steve Pham
Alex Peterson
lumberyard-employee-dm
AMZN-Igarri
Chris Galvan
Luis Sempé
Jeremy Ong
pappeste
Artur K
AMZN-nggieber
sphrose
Terry Michaels
Danilo Aimini