Skip to content

Commit

Permalink
Update sounds + enemy character controller for VGF_Boy
Browse files Browse the repository at this point in the history
  • Loading branch information
@Benualdo
Benualdo committed Nov 3, 2024
1 parent 2486093 commit 4838028
Show file tree
Hide file tree
Showing 21 changed files with 326 additions and 104 deletions.
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Yes, yet another work-in-progress game and graphic engine project :)
| Win64 | DX12 | ![Win64_DX12_Debug.yml](https://github.com/vimontgames/vgframework/actions/workflows/Win64_DX12_Debug.yml/badge.svg) | ![Win64_DX12_Release.yml](https://github.com/vimontgames/vgframework/actions/workflows/Win64_DX12_Release.yml/badge.svg) | ![Win64_DX12_Final.yml](https://github.com/vimontgames/vgframework/actions/workflows/Win64_DX12_Final.yml/badge.svg)
| Win64 | Vulkan | ![Win64_Vulkan_Debug.yml](https://github.com/vimontgames/vgframework/actions/workflows/Win64_Vulkan_Debug.yml/badge.svg) | ![Win64_Vulkan_Release.yml](https://github.com/vimontgames/vgframework/actions/workflows/Win64_Vulkan_Release.yml/badge.svg) | ![Win64_Vulkan_Final.yml](https://github.com/vimontgames/vgframework/actions/workflows/Win64_Vulkan_Final.yml/badge.svg)

![Screenshot](doc/img/0.39.png)

[description](#description)\
[changelog](#changelog)\
[getting started](#getting-started)\
Expand Down
3 changes: 2 additions & 1 deletion data/Prefabs/Bat.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
<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_push" flags="HasRange" value="4"/>
<Property type="EnumU8" name="m_weaponType" value="Melee"/>
</Object>
<Object class="AttachToNodeComponent">
<Property type="String" name="m_name" flags="NotVisible" value="New AttachToNodeComponent"/>
Expand Down Expand Up @@ -113,7 +114,7 @@
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Sounds/Weapons/swoosh_bat.wav"/>
<Property type="EnumFlagsU32" name="m_soundSettings.m_flags" flags="Bitfield" value=""/>
<Property type="Float" name="m_soundSettings.m_volume" flags="HasRange" value="0.25"/>
<Property type="Float" name="m_soundSettings.m_volume" flags="HasRange" value="1"/>
<Property type="Float" name="m_soundSettings.m_delay" flags="HasRange" value="1"/>
</Object>
</Property>
Expand Down
21 changes: 20 additions & 1 deletion data/Prefabs/Floor/Concrete_3x3.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<Property type="String" name="m_name" flags="NotVisible" value="New RigidBodyComponent"/>
<Property type="Uint32" name="m_uid" flags="" value="2471751639"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
<Property type="EnumU8" name="m_category" value="Default"/>
<Property type="Bool" name="m_useCollisionMask" flags="NotVisible" value="false"/>
Expand Down Expand Up @@ -66,6 +66,25 @@
<Property type="Bool" name="m_snapScale" flags="NotVisible" value="false"/>
<Property type="Float" name="m_scale" flags="Optional" value="1"/>
</Object>
<Object class="PhysicsShapeComponent">
<Property type="String" name="m_name" flags="NotVisible" value="New PhysicsShapeComponent"/>
<Property type="Uint32" name="m_uid" flags="" value="2988319238"/>
<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="EnumU8" name="m_shapeType" value="Box"/>
<Property type="ObjectPtr" name="m_shapeDesc" flags="Flatten">
<Object class="BoxShapeDesc">
<Property type="String" name="m_name" flags="NotVisible" value="BoxShapeDesc #86"/>
<Property type="Uint32" name="m_uid" flags="" value="3944313381"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="Float3" name="m_rotation" flags="EulerAngle" x="0" y="0" z="0"/>
<Property type="Float3" name="m_offset" x="0" y="0" z="0"/>
<Property type="Float3" name="m_size" flags="HasRange" x="3" y="3" z="0.14"/>
</Object>
</Property>
</Object>
<Object class="MeshComponent">
<Property type="String" name="m_name" flags="NotVisible" value="New MeshComponent"/>
<Property type="Uint32" name="m_uid" flags="" value="4034055609"/>
Expand Down
32 changes: 20 additions & 12 deletions data/Prefabs/GJ.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
<Property type="String" name="m_name" flags="NotVisible" value="EnemyBehaviour #0"/>
<Property type="Uint32" name="m_uid" flags="" value="1062217233"/>
<Property type="Uint32" name="m_originalUID" flags="" value="0"/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value=""/>
<Property type="EnumFlagsU32" name="m_objectFlags" flags="" value="Opened"/>
<Property type="EnumFlagsU32" name="m_flags" flags="Bitfield" value="Enabled"/>
<Property type="Uint32" name="m_life" value="1"/>
<Property type="Float" name="m_hp" value="100"/>
<Property type="Int32" name="m_score" value="0"/>
<Property type="Float" name="m_walkSpeed" value="0.5"/>
<Property type="Float" name="m_runSpeed" value="1.5"/>
<Property type="Float" name="m_jumpSpeed" value="5.5"/>
<Property type="Float" name="m_runJumpSpeed" value="7"/>
<Property type="Float" name="m_detectionRadius" value="4"/>
</Object>
<Object class="CharacterControllerComponent">
<Property type="String" name="m_name" flags="NotVisible" value="CharacterControllerComponent #5"/>
Expand Down Expand Up @@ -103,9 +103,10 @@
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Animations/J_G/JG_Idle_1.fbx"/>
<Property type="Bool" name="m_play" flags="" value="false"/>
<Property type="Bool" name="m_loop" flags="" value="true"/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
<Property type="Uint32" name="m_layer" flags="HasRange" value="0"/>
<Property type="Bool" name="m_useBodyParts" flags="NotVisible" value="false"/>
<Property type="EnumFlagsU32" name="m_bodyParts" flags="" value=""/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
</Object>
<Object class="AnimationResource">
<Property type="String" name="m_name" value="Walk"/>
Expand All @@ -115,9 +116,10 @@
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Animations/J_G/JG_Walking.fbx"/>
<Property type="Bool" name="m_play" flags="" value="false"/>
<Property type="Bool" name="m_loop" flags="" value="false"/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
<Property type="Uint32" name="m_layer" flags="HasRange" value="0"/>
<Property type="Bool" name="m_useBodyParts" flags="NotVisible" value="false"/>
<Property type="EnumFlagsU32" name="m_bodyParts" flags="" value=""/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
</Object>
<Object class="AnimationResource">
<Property type="String" name="m_name" value="Run"/>
Expand All @@ -127,9 +129,10 @@
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Animations/J_G/JG_Run.fbx"/>
<Property type="Bool" name="m_play" flags="" value="false"/>
<Property type="Bool" name="m_loop" flags="" value="false"/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
<Property type="Uint32" name="m_layer" flags="HasRange" value="0"/>
<Property type="Bool" name="m_useBodyParts" flags="NotVisible" value="false"/>
<Property type="EnumFlagsU32" name="m_bodyParts" flags="" value=""/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
</Object>
<Object class="AnimationResource">
<Property type="String" name="m_name" value="Jump"/>
Expand All @@ -139,9 +142,10 @@
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Animations/J_G/JG_Jump.fbx"/>
<Property type="Bool" name="m_play" flags="" value="false"/>
<Property type="Bool" name="m_loop" flags="" value="false"/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
<Property type="Uint32" name="m_layer" flags="HasRange" value="0"/>
<Property type="Bool" name="m_useBodyParts" flags="NotVisible" value="false"/>
<Property type="EnumFlagsU32" name="m_bodyParts" flags="" value=""/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
</Object>
<Object class="AnimationResource">
<Property type="String" name="m_name" value="Hit"/>
Expand All @@ -151,9 +155,10 @@
<Property type="String" name="m_resourcePath" flags="NotVisible" value=""/>
<Property type="Bool" name="m_play" flags="" value="false"/>
<Property type="Bool" name="m_loop" flags="" value="false"/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
<Property type="Uint32" name="m_layer" flags="HasRange" value="0"/>
<Property type="Bool" name="m_useBodyParts" flags="NotVisible" value="false"/>
<Property type="EnumFlagsU32" name="m_bodyParts" flags="" value=""/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
</Object>
<Object class="AnimationResource">
<Property type="String" name="m_name" value="Kick"/>
Expand All @@ -163,9 +168,10 @@
<Property type="String" name="m_resourcePath" flags="NotVisible" value=""/>
<Property type="Bool" name="m_play" flags="" value="false"/>
<Property type="Bool" name="m_loop" flags="" value="false"/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
<Property type="Uint32" name="m_layer" flags="HasRange" value="0"/>
<Property type="Bool" name="m_useBodyParts" flags="NotVisible" value="false"/>
<Property type="EnumFlagsU32" name="m_bodyParts" flags="" value=""/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
</Object>
<Object class="AnimationResource">
<Property type="String" name="m_name" value="Hurt"/>
Expand All @@ -175,9 +181,10 @@
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Animations/J_G/JG_Damage.fbx"/>
<Property type="Bool" name="m_play" flags="" value="false"/>
<Property type="Bool" name="m_loop" flags="" value="false"/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
<Property type="Uint32" name="m_layer" flags="HasRange" value="0"/>
<Property type="Bool" name="m_useBodyParts" flags="NotVisible" value="false"/>
<Property type="EnumFlagsU32" name="m_bodyParts" flags="" value=""/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
</Object>
<Object class="AnimationResource">
<Property type="String" name="m_name" value="Die"/>
Expand All @@ -187,9 +194,10 @@
<Property type="String" name="m_resourcePath" flags="NotVisible" value="data/Animations/J_G/JG_Die.fbx"/>
<Property type="Bool" name="m_play" flags="" value="false"/>
<Property type="Bool" name="m_loop" flags="" value="false"/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
<Property type="Uint32" name="m_layer" flags="HasRange" value="0"/>
<Property type="Bool" name="m_useBodyParts" flags="NotVisible" value="false"/>
<Property type="EnumFlagsU32" name="m_bodyParts" flags="" value=""/>
<Property type="Float" name="m_speed" flags="HasRange" value="1"/>
</Object>
</Property>
</Object>
Expand All @@ -209,7 +217,7 @@
<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="Hit"/>
<Property type="String" name="m_name" value="Hurt"/>
<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=""/>
Expand All @@ -220,7 +228,7 @@
</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_uid" flags="" value="3933968088"/>
<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"/>
Expand Down
Loading

0 comments on commit 4838028

Please sign in to comment.