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
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
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
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
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
e2c1477629
fix for dependency job key on ScriptEvents from SC builder
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
b7f71fb153
others
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
41dd7054b7
Restore BCO destructor delete
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
cef4e5278d
Gems/Camera
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
ffb235e458
ScriptCanvas
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
11eb920e40
Removal of dead code and bug fixes for reflection
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
e924ed0b86
Merged stabilization/2106 to development; Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
45b024bed1
Remove dead backend code
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
b63c9a87db
compile time null checks avaiable for method node
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
3b1873b045
Merged stabilization/2106 -> development (resolved merge conflicts).
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
3f231075fe
Remove last of Great ScriptCanvas purge code, fix purity categorization handler connection control
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
21b511b174
Merge branch 'carlitosan/thecleansing' of https://github.com/aws-lumberyard-dev/o3de into carlitosan/thecleansing
5 years ago
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
f9f711c039
Removing superfluous whitespace.
...
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
5 years ago
2dce2eee2d
The Great ScriptCanvas Purge, Part X
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
27577a2e49
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
5 years ago
29652994d8
The Great ScriptCanvas Purge, Part VIII
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
9bfb90a513
Merge branch 'stabilization/2106' into hultonha/gitflow_210707_o3de
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
75933ff7fd
The Great ScriptCanvas Purge, Part VII
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
65ad412f3e
The Great ScriptCanvas Purge, Part VI
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
4a42c32a4b
LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem when Profiling is on
...
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
0a910a31aa
The Great ScriptCanvas Purge, Part V
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
360236b89e
The Great ScriptCanvas Purge, Part IV
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
2ea9bfb144
merge stabilization/2106 into development
...
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
fa7accf2dc
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
5 years ago
9d5a9ff925
NvCloth automated tests use default renderer to be more stable and complete ( #1850 )
...
Signed-off-by: moraaar <moraaar@amazon.com>
5 years ago
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
5 years ago
88c328c6e2
The Great ScriptCanvas Purge, Part III
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
fea83b0b51
The Great ScriptCanvas Purge, Part II
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
59ff74f559
The Great ScriptCanvas Purge. Part I.
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
8cd07c6f4b
update license on new files
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
2281330a7c
merge latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com>
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com>
5 years ago
dcea6f47fa
linux build fix
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
59f4e865a4
whitespace and string_view fixes
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
7b149e6f90
remove unnecessary reporting values from user script variable json serializer
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
fe829bfbd4
Use 'missing' vs 'catastrophic' of missing $type field in user script variable json serializer
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
66a935dfa4
Fix missing icon issue leading to failed nightly test: LYN-4926 SPEC-6982
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
0136c92467
PR white space feedback, better Lua print error message, fix ACM static variable culling
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
917dacb61e
Added comment explaining state of progress of SC --> C++
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
df02813cd4
Hide ExecutionState methods from SC, Fixes LYN-4900
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
5b7b989733
use more constexpr in ScriptCanvasAttributes.h, remove superfluous string use in SC user data serialization
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
9d9205d067
SC user nodeables now use __index method does not report error on (allowable) nil table entries LYN-3664
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
355776d3a9
Add versioning updates for prefab conversion, and PR clean up & nitpicks
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
fb448124e2
removed uneccessary prefab senstive code
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
9f0bbf3b74
SPEC-7531 Change Code/CryEngine to Code/Legacy ( #1634 )
...
* git mv Code\CryEngine Code\Legacy
* redirecting CMakeLists.txt
* fixing uic warning
* Some more CryEngine mentions
* validation scripts
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
dcb3c71d33
Initial prefab integration
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
149863c527
Removed Amazon as Company for QSettings ( #1649 )
...
* Removed Amazon as Company for QSettings
Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
4e14c0069b
Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628
5 years ago
972c640782
Don't give a broken copy constructor to BehaviorContextObject. ( #1002 )
...
* Don't give a broken copy constructor to BehaviorContextObject.
This used to be required by the serialization system, now it handles non-copyable and non-moveable types.
* Explicitly delete the copy constructor instead of defaulting, which implicitly deletes it.
Some compilers complain about such an implicit deletion, and we should be explicit about our intent anyways
5 years ago
21ebff5709
Updated help search and all docs.o3de.org links to o3de.org ( #1594 )
5 years ago
1e457928f5
Update help URLs and remove unneeded links ( #1520 )
5 years ago
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
5 years ago
df648db62e
Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
...
# Conflicts:
# Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
# Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
# Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
5 years ago
e55580af57
Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18
5 years ago
d907c14682
Remove any null entries from AbstractCodeModel::ModAllRoots() LYN-4658
5 years ago
3ed6b318ab
Merge branch 'develop' into LYN-1767-AB
5 years ago
94edb18ed0
disabled upgrade menu until we can stabilize the tool (LYN-3799)
5 years ago
2fd985f162
Fix for unconverted once nodes
5 years ago
10081fefb9
Remove unwanted entries from node palette
5 years ago
168042dee4
Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into carlito/stabilization/2106
5 years ago
0d01ee4a4e
Merge pull request #1270 from aws-lumberyard-dev/carlito/stabilization/2106
...
Fix for running game mode with brand new graph with prefabs. Fixes: LYN-4004
5 years ago
f1b3bf4c73
Fix for running game mode with brand new graph with prefabs.
5 years ago
91fb8be535
Added toolbar icons, updated viewport header UX ( #1240 )
5 years ago
adf6d93a06
Moved toggle pivot to lower in the context menu, converted all context menu additions to use a singular mechanism ( #1209 )
5 years ago
8ab2752f42
Fix for using BC class constants LYN-3777
5 years ago
Esteban Papp
carlitosan
Luis Sempé
Jeremy Ong
pappeste
Chris Galvan
Artur K
sphrose
Steve Pham
lumberyard-employee-dm
hultonha
pereslav
Aaron Ruiz Mora
Terry Michaels
Gene Walters
yuriy0
mbalfour
nvsickle
igarri
chcurran