Skip to content

Commit

Permalink
Enemy death animation + draw shapes from physics body component (no m…
Browse files Browse the repository at this point in the history
…ore physics shape udpate)
  • Loading branch information
Benualdo committed Oct 15, 2024
1 parent c12c25c commit c329d97
Show file tree
Hide file tree
Showing 30 changed files with 216 additions and 167 deletions.
3 changes: 2 additions & 1 deletion data/Prefabs/Bat.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
<Property type="Float" name="m_damage" flags="HasRange" value="40"/>
<Property type="Float" name="m_damage" flags="HasRange" value="30"/>
<Property type="Float" name="m_push" flags="HasRange" value="4"/>
</Object>
<Object class="AttachToNodeComponent">
<Property type="String" name="m_name" flags="NotVisible" value="New AttachToNodeComponent"/>
Expand Down
18 changes: 14 additions & 4 deletions data/Prefabs/GJ.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,21 @@
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="ResourceVector" name="m_resources" flags="Resource">
<Object class="SoundResource">
<Property type="String" name="m_name" value="TakeDamage"/>
<Property type="String" name="m_name" value="Hit"/>
<Property type="Uint32" name="m_uid" flags="" value="758274351"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Sounds/GJ/arg.wav"/>
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Sounds/GJ/hit.wav"/>
<Property type="EnumFlagsU32" name="m_soundSettings.m_flags" flags="Bitfield" value=""/>
<Property type="Float" name="m_soundSettings.m_volume" flags="HasRange" value="1"/>
<Property type="Float" name="m_soundSettings.m_delay" flags="HasRange" value="0"/>
</Object>
<Object class="SoundResource">
<Property type="String" name="m_name" value="Die"/>
<Property type="Uint32" name="m_uid" flags="" value="0"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Sounds/GJ/die.wav"/>
<Property type="EnumFlagsU32" name="m_soundSettings.m_flags" flags="Bitfield" value=""/>
<Property type="Float" name="m_soundSettings.m_volume" flags="HasRange" value="1"/>
<Property type="Float" name="m_soundSettings.m_delay" flags="HasRange" value="0"/>
Expand Down Expand Up @@ -260,7 +270,7 @@
<Property type="ObjectPtrVector" name="m_children" flags="NotVisible">
<Object class="PrefabGameObject">
<Property type="String" name="m_name" value="HealthBar"/>
<Property type="Uint32" name="m_uid" flags="" value="0"/>
<Property type="Uint32" name="m_uid" flags="" value="2982878408"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Prefab"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
Expand All @@ -272,7 +282,7 @@
<Property type="Resource" name="m_prefabResource" flags="Resource">
<Object class="PrefabResource">
<Property type="String" name="m_name" flags="NotVisible" value=""/>
<Property type="Uint32" name="m_uid" flags="" value="0"/>
<Property type="Uint32" name="m_uid" flags="" value="3482621814"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Prefabs/HealthBar.prefab"/>
Expand Down
33 changes: 18 additions & 15 deletions data/Prefabs/HealthBar.prefab
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Root>
<Object class="PrefabScene">
<Property type="String" name="m_name" flags="NotVisible" value="HealthBar"/>
<Property type="Uint32" name="m_uid" flags="" value="708253636"/>
<Property type="Uint32" name="m_uid" flags="" value="4218047207"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="ObjectPtr" name="m_root" flags="NotVisible">
<Object class="GameObject">
<Property type="String" name="m_name" value="Root"/>
<Property type="Uint32" name="m_uid" flags="" value="223997847"/>
<Property type="Uint32" name="m_uid" flags="" value="2936680143"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
Expand All @@ -18,7 +18,7 @@
<Property type="ObjectPtrVector" name="m_children" flags="NotVisible">
<Object class="GameObject">
<Property type="String" name="m_name" value="HealthBar"/>
<Property type="Uint32" name="m_uid" flags="" value="3774566955"/>
<Property type="Uint32" name="m_uid" flags="" value="2197187471"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
Expand All @@ -28,14 +28,17 @@
<Property type="ObjectPtrVector" name="m_components">
<Object class="HealthBarBehaviour">
<Property type="String" name="m_name" flags="NotVisible" value="New HealthBarBehaviour"/>
<Property type="Uint32" name="m_uid" flags="" value="0"/>
<Property type="Uint32" name="m_uid" flags="" value="3833046945"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
<Property type="Float" name="m_width" flags="ReadOnly" value="0"/>
<Property type="Float" name="m_currentHP" flags="ReadOnly" value="0"/>
<Property type="Float" name="m_maxHP" flags="ReadOnly" value="0"/>
</Object>
<Object class="UICanvasComponent">
<Property type="String" name="m_name" flags="NotVisible" value="New UICanvasComponent"/>
<Property type="Uint32" name="m_uid" flags="" value="2247927410"/>
<Property type="Uint32" name="m_uid" flags="" value="52539760"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
Expand All @@ -60,7 +63,7 @@
<Property type="ObjectPtrVector" name="m_children" flags="NotVisible">
<Object class="GameObject">
<Property type="String" name="m_name" value="Backround"/>
<Property type="Uint32" name="m_uid" flags="" value="4098226337"/>
<Property type="Uint32" name="m_uid" flags="" value="2439692122"/>
<Property type="Uint32" name="m_originalUID" flags="" value="3226805358"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
Expand All @@ -70,7 +73,7 @@
<Property type="ObjectPtrVector" name="m_components">
<Object class="UIImageComponent">
<Property type="String" name="m_name" flags="NotVisible" value="New UIImageComponent"/>
<Property type="Uint32" name="m_uid" flags="" value="1102179565"/>
<Property type="Uint32" name="m_uid" flags="" value="2171310607"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
Expand All @@ -83,11 +86,11 @@
<Property type="Bool" name="m_useOffset" flags="NotVisible" value="false"/>
<Property type="Float3" name="m_offset" flags="Optional" x="0" y="0" z="0"/>
<Property type="Bool" name="m_useColor" flags="NotVisible" value="true"/>
<Property type="Float4" name="m_color" flags="" x="1" y="0" z="0" w="1"/>
<Property type="Float4" name="m_color" flags="" x="1" y="0" z="0" w="0.78431374"/>
<Property type="Resource" name="m_image" flags="Resource">
<Object class="TextureResource">
<Property type="String" name="m_name" flags="NotVisible" value=""/>
<Property type="Uint32" name="m_uid" flags="" value="1698613284"/>
<Property type="Uint32" name="m_uid" flags="" value="719438103"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Textures/White.tga"/>
Expand All @@ -99,7 +102,7 @@
</Object>
<Object class="GameObject">
<Property type="String" name="m_name" value="Life"/>
<Property type="Uint32" name="m_uid" flags="" value="1262616298"/>
<Property type="Uint32" name="m_uid" flags="" value="876803178"/>
<Property type="Uint32" name="m_originalUID" flags="" value="3226805358"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
Expand All @@ -109,7 +112,7 @@
<Property type="ObjectPtrVector" name="m_components">
<Object class="UIImageComponent">
<Property type="String" name="m_name" flags="NotVisible" value="New UIImageComponent"/>
<Property type="Uint32" name="m_uid" flags="" value="2855271767"/>
<Property type="Uint32" name="m_uid" flags="" value="2611496819"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
Expand All @@ -122,11 +125,11 @@
<Property type="Bool" name="m_useOffset" flags="NotVisible" value="false"/>
<Property type="Float3" name="m_offset" flags="Optional" x="0" y="0" z="0"/>
<Property type="Bool" name="m_useColor" flags="NotVisible" value="true"/>
<Property type="Float4" name="m_color" flags="" x="0" y="1" z="0" w="1"/>
<Property type="Float4" name="m_color" flags="" x="0" y="1" z="0" w="0.78431374"/>
<Property type="Resource" name="m_image" flags="Resource">
<Object class="TextureResource">
<Property type="String" name="m_name" flags="NotVisible" value=""/>
<Property type="Uint32" name="m_uid" flags="" value="3232949564"/>
<Property type="Uint32" name="m_uid" flags="" value="4274968656"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Textures/White.tga"/>
Expand All @@ -135,7 +138,7 @@
</Object>
<Object class="UITextComponent">
<Property type="String" name="m_name" flags="NotVisible" value="New UITextComponent"/>
<Property type="Uint32" name="m_uid" flags="" value="2087134915"/>
<Property type="Uint32" name="m_uid" flags="" value="1958517721"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
Expand All @@ -148,7 +151,7 @@
<Property type="Bool" name="m_useOffset" flags="NotVisible" value="true"/>
<Property type="Float3" name="m_offset" flags="Optional" x="0" y="-1" z="0"/>
<Property type="Bool" name="m_useColor" flags="NotVisible" value="true"/>
<Property type="Float4" name="m_color" flags="" x="0" y="0" z="0" w="1"/>
<Property type="Float4" name="m_color" flags="" x="0" y="0" z="0" w="0.66666669"/>
<Property type="EnumU8" name="m_font" value="Rowndies"/>
<Property type="EnumU8" name="m_style" value="Regular"/>
<Property type="String" name="m_text" value="100 HP"/>
Expand Down
3 changes: 2 additions & 1 deletion data/Prefabs/Katana.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
<Property type="Float" name="m_damage" flags="HasRange" value="30"/>
<Property type="Float" name="m_damage" flags="HasRange" value="40"/>
<Property type="Float" name="m_push" flags="HasRange" value="3"/>
</Object>
<Object class="AttachToNodeComponent">
<Property type="String" name="m_name" flags="NotVisible" value="New AttachToNodeComponent"/>
Expand Down
3 changes: 2 additions & 1 deletion data/Prefabs/KatanaRomeo.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
<Property type="Float" name="m_damage" flags="HasRange" value="30"/>
<Property type="Float" name="m_damage" flags="HasRange" value="40"/>
<Property type="Float" name="m_push" flags="HasRange" value="3"/>
</Object>
<Object class="AttachToNodeComponent">
<Property type="String" name="m_name" flags="NotVisible" value="New AttachToNodeComponent"/>
Expand Down
File renamed without changes.
Binary file added data/Sounds/GJ/hit.wav
Binary file not shown.
Loading

0 comments on commit c329d97

Please sign in to comment.