nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

editor: script window update; improved character zone scripts;

Browse Source
This commit is contained in:
Turánszki János
2022-10-24 17:38:31 +02:00
parent 8bcd61daaa
commit 50692151cf
5 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content/Content.vcxitems
+12 -3
View File
@@ -352,7 +352,10 @@
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\character_controller\character_controller.lua" />
<None Include="$(MSBuildThisFileDirectory)scripts\character_controller\character_controller.lua">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\debug_draw.lua">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
@@ -411,7 +414,10 @@
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\dungeon_generator\dungeon_generator.lua" />
<None Include="$(MSBuildThisFileDirectory)scripts\dungeon_generator\dungeon_generator.lua">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\emitter_burst.lua">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
@@ -450,7 +456,10 @@
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\fighting_game\fighting_game.lua" />
<None Include="$(MSBuildThisFileDirectory)scripts\fighting_game\fighting_game.lua">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
</None>
<None Include="$(MSBuildThisFileDirectory)scripts\move_object.lua">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</DeploymentContent>
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</DeploymentContent>
Content/scripts/character_controller/assets/zone_angry.lua
+3 -1
View File
@@ -1,2 +1,4 @@
dofile(script_dir() .. "zone_expression.lua")
if not Script_Initialized(script_pid()) then
dofile(script_dir() .. "zone_expression.lua")
end
zone_expression(GetEntity(), ExpressionPreset.Angry, "angry")
Content/scripts/character_controller/assets/zone_happy.lua
+3 -1
View File
@@ -1,2 +1,4 @@
dofile(script_dir() .. "zone_expression.lua")
if not Script_Initialized(script_pid()) then
dofile(script_dir() .. "zone_expression.lua")
end
zone_expression(GetEntity(), ExpressionPreset.Happy, "happy")
Content/scripts/character_controller/assets/zone_sad.lua
+3 -1
View File
@@ -1,2 +1,4 @@
dofile(script_dir() .. "zone_expression.lua")
if not Script_Initialized(script_pid()) then
dofile(script_dir() .. "zone_expression.lua")
end
zone_expression(GetEntity(), ExpressionPreset.Sad, "sad")
Editor/ScriptWindow.cpp
+1
View File
@@ -114,6 +114,7 @@ void ScriptWindow::SetEntity(wi::ecs::Entity entity)
{
fileButton.SetText("Open File...");
}
playonceCheckBox.SetCheck(script->IsPlayingOnlyOnce());
}
}