chcurran
296fca722e
file save finished, not tested
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
0dfcc1ea42
dependency sort finished, UI updated
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
0e2f75492c
dependency sort finished, but not tested
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
f55737af11
dependency sort WIP
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
cb12d31821
Modifier step WIP
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
1badb5a31f
scan refactor is in a working state
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
cbaa2fcff5
rename view --> controller
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
fd71704894
rename view files --> controller
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp
711b332ebe
Gems/ScriptCanvas*
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran
b6eb9123e5
version explorer refactor wip
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
e0f93ea159
view traits wip before rename
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
e558e7b0ff
rename version explorer ui to view
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
30d27f23ee
rename version explorer to view
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
5cee8d1892
stubbed out refactor of version explorer
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp
9f6d4125b8
Merge branch 'development' into cmake/warn_virtual
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
carlitosan
52460189aa
Merge pull request #3964 from aws-lumberyard-dev/carlitosan/development
...
Upgrades and stability fixes for version explorer
4 years ago
chcurran
34ca9bd5ba
fix Linux error
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp
f414cd3966
More fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran
2a810c4845
fix backup file action in version explorer
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
5c0bbe7ac1
add SC cvar settings cache
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp
52607ce2c0
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran
4ed7feae5d
Keep editor alive when not in focus
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
e1e1779ec6
Fix for file size limit in JSON
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
c8ed6d287c
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
4 years ago
chcurran
f4dbeb6538
Fix list of manual inspection graphs
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
e69a5bc092
fix progress bar for upgrades
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
3822f92882
fix manual inpsection window
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
9de22d5e54
Fix dependency errors after conversion to JSON
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
b5a32e1c4c
remove temporay files in all cases
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
AMZN-Igarri
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
chcurran
f277cf59dc
multi threaded fix for upgrader
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 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>
4 years ago
chcurran
3b119b6f32
hot fix for json event input serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
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
chcurran
f5485fa675
merge lastest; add extra data to scan result
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
782c6748ae
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
4 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>
4 years ago
chcurran
9688832adc
Initial fixes for graph update tool
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Chris Galvan
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
Esteban Papp
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
Esteban Papp
b9daf7f7c3
Enabling several warnings on MSVC that are not enabled by default and are good to have
4 years ago
Esteban Papp
058f6e0f22
PR comments/fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 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
4 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
4 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
4 years ago
Luis Sempé
63cad40db2
Merge pull request #3435 from aws-lumberyard-dev/scripting/slottypeselectorwidget
...
Improved layout and behavior of the SlotTypeSelector widget
4 years ago
chcurran
be9ad98b24
remove commented out debugging artifacts
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
214700a73e
Finish repair for scanning for upgrade tool
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
lsemp3d
4545e2fb33
Improved layout and behavior of the SlotTypeSelector widget
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
chcurran
26f6a714c8
initial fix for version scan
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 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>
4 years ago
Esteban Papp
5361cf3b26
Merge branch 'development' into cmake/win_fix_wnew
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran
794c22c02e
merge latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp
31addc43dc
Windows and Linux compiling
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran
d7d2e84fee
Added all the missing serializer support, fixed up serialization notification
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp
2e228d94f0
push/pop mismatch
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp
323d642e65
Gems/ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 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
4 years ago
Jeremy Ong
cf44a4ad67
Address additional PR feedback
...
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong
a5f072f7a9
Remove statistics profiler
...
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 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>
4 years ago
chcurran
c701522adc
update error messaging, remove unnecessary comments
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
1ad182105b
fix memory leak and possible nullptr read
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
88121f3bb4
move JsonUtils to AzCore
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
0270fb7fbe
Initial saving/loading of JSON serialization of sc editor assets
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp
3522f622f3
more castings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran
5044204839
Move JsonUtils.h for support of SC serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
a56be14677
JSON saving of SC editor assets
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
carlitosan
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
chcurran
fe21b89d8e
working support for editor property json serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
lsemp3d
2b4bd10028
Updated path to icon that was emitting a warning
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
chcurran
3374b82360
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
4 years ago
chcurran
aaa847a569
Remove empty User Functions and Script Event sections
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Artur K
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
Esteban Papp
b33a4db332
Merge branch 'development' into cmake/SPEC-2513_w4267
4 years ago
chcurran
893a80a54e
Fix variables names in the property window
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
3633bf2ed0
remove accidental submission of commented out event handling
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
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
chcurran
43dfffa3fd
fix dangling component variables on cleared script, fix EntityIDNode reflection
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
pappeste
e3344bdf8d
ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran
3ad8f0dbf9
adjust location of disabling SC unit tests on Linux
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran
6f07a0b136
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
4 years ago
chcurran
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
sphrose
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
Esteban Papp
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
4 years ago
Steve Pham
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>
4 years ago
Esteban Papp
b7f71fb153
others
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp
ffb235e458
ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Chris Galvan
3b1873b045
Merged stabilization/2106 -> development (resolved merge conflicts).
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
lumberyard-employee-dm
3be4c9a393
Removing extra whitespace from the ScriptCanvas Node Library files
...
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
chcurran
65ad412f3e
The Great ScriptCanvas Purge, Part VI
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran
0a910a31aa
The Great ScriptCanvas Purge, Part V
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran
360236b89e
The Great ScriptCanvas Purge, Part IV
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
hultonha
2ea9bfb144
merge stabilization/2106 into development
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
chcurran
fa7accf2dc
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
5 years ago
Aaron Ruiz Mora
9d5a9ff925
NvCloth automated tests use default renderer to be more stable and complete ( #1850 )
...
Signed-off-by: moraaar <moraaar@amazon.com>
5 years ago
Chris Galvan
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
chcurran
88c328c6e2
The Great ScriptCanvas Purge, Part III
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran
fea83b0b51
The Great ScriptCanvas Purge, Part II
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
chcurran
59ff74f559
The Great ScriptCanvas Purge. Part I.
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago