birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/StartingPointInput/Code/CMakeLists.txt
+2 -2
View File
@@ -28,8 +28,8 @@ ly_add_target(
CryCommon
Gem::ScriptCanvas
AUTOGEN_RULES
*.ScriptCanvasNode.xml,ScriptCanvasNode_Header.jinja,$path/$fileprefix.generated.h
*.ScriptCanvasNode.xml,ScriptCanvasNode_Source.jinja,$path/$fileprefix.generated.cpp
*.ScriptCanvasGrammar.xml,ScriptCanvasGrammar_Header.jinja,$path/$fileprefix.generated.h
*.ScriptCanvasGrammar.xml,ScriptCanvasGrammar_Source.jinja,$path/$fileprefix.generated.cpp
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Header.jinja,$path/$fileprefix.generated.h
*.ScriptCanvasNodeable.xml,ScriptCanvasNodeable_Source.jinja,$path/$fileprefix.generated.cpp
)
Gems/StartingPointInput/Code/Source/InputHandlerNodeable.ScriptCanvasNodeable.xml
+3 -6
View File
@@ -21,11 +21,8 @@
<Output Name="Released" Description="Signaled when the input event ends." >
<Parameter Name="value" Type="float" Shared="true"/>
</Output>
<Property Name="Event Name"
Description="The input event name as defined in an inputbinding asset. Example 'Fireball'"
Type="AZStd::string"
IsInput="True"
IsOutput="False" />
<Input Name="Connect Event" Description="Connect to input event name as defined in an input binding asset.">
<Parameter Name="Event Name" Type="AZStd::string" Description="Event name as defined in an input binding asset. Example 'Fireball'."/>
</Input>/>
</Class>
</ScriptCanvas>
Gems/StartingPointInput/Code/Source/InputHandlerNodeable.h
-2
View File
@@ -35,8 +35,6 @@ namespace StartingPointInput
InputHandlerNodeable(const InputHandlerNodeable&) = default;
InputHandlerNodeable& operator=(const InputHandlerNodeable&) = default;
void ConnectEvent(AZStd::string eventName);
protected:
void OnDeactivate() override;
Gems/StartingPointInput/Code/Source/InputNode.ScriptCanvasNode.xml → Gems/StartingPointInput/Code/Source/InputNode.ScriptCanvasGrammar.xml
View File
Gems/StartingPointInput/Code/startingpointinput_autogen_files.cmake
+2 -2
View File
@@ -10,8 +10,8 @@
#
set(FILES
${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNode_Header.jinja
${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNode_Source.jinja
${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Header.jinja
${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja
${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Header.jinja
${LY_ROOT_FOLDER}/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja
)
Gems/StartingPointInput/Code/startingpointinput_files.cmake
+1 -1
View File
@@ -25,7 +25,7 @@ set(FILES
Source/InputHandlerNodeable.h
Source/InputHandlerNodeable.cpp
Source/InputHandlerNodeable.ScriptCanvasNodeable.xml
Source/InputNode.ScriptCanvasNode.xml
Source/InputNode.ScriptCanvasGrammar.xml
Source/StartingPointInput_precompiled.h
Source/StartingPointInput_precompiled.cpp
)