Skip to content

Commit

Permalink
Digitals Boxing Ring collision hands demo
Browse files Browse the repository at this point in the history
Co-Authored-By: Miodrag Sejic <56046022+DigitalN8m4r3@users.noreply.github.com>
  • Loading branch information
BastiaanOlij and DigitalN8m4r3 committed Nov 13, 2024
1 parent f9701c5 commit dda0cf8
Show file tree
Hide file tree
Showing 134 changed files with 3,292 additions and 43 deletions.
1 change: 1 addition & 0 deletions VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
- Add SnapPath
- Improvements to collision hands so collision shapes of picked up objects
are added and we no longer have hands collide with dropped objects
- Added boxing ring demo for showing collision hand functionality.

# 4.3.3
- Fix Viewport2Din3D property forwarding
Expand Down
7 changes: 7 additions & 0 deletions assets/Kevin MacLeod/License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
License: Public Domain CC0

Source: https://freepd.com/

Author: Kevin MacLeod

Title: Neon and Kickboxing
Binary file added assets/Kevin MacLeod/Neon and Kickboxing.mp3
Binary file not shown.
19 changes: 19 additions & 0 deletions assets/Kevin MacLeod/Neon and Kickboxing.mp3.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://bknr7ftar4n0d"
path="res://.godot/imported/Neon and Kickboxing.mp3-0d916dead3d2362424645eaa25d1c0e8.mp3str"

[deps]

source_file="res://assets/Kevin MacLeod/Neon and Kickboxing.mp3"
dest_files=["res://.godot/imported/Neon and Kickboxing.mp3-0d916dead3d2362424645eaa25d1c0e8.mp3str"]

[params]

loop=true
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
10 changes: 9 additions & 1 deletion assets/digitaln8m4r3/License.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@

Arcade Hoops 3D Model
Basketball 3D Model
Boxing Glove Left/Right 3D Model
Boxing Ring 3D Model
Climbing Grips 3D Model
(added the Boxing Gloves to the XR Tools as well, located res://addons/godot-xr-tools/hands/model/Boxing_Glove_L.glb and Boxing_Glove_R.glb)

Muscleboy 3D Model
PingPong Ball 3D Model
Ping Pong Racket 3D Model
Punching Bag 3D Model
Punching Ball 3D Model
Table 3D Model
Token 3D Model

1kg/3kg/5kgWeight 3D Model

Created/distributed by DigitalN8m4r3 aka Miodrag Sejic
https://www.digitalnightmare.eu/en/privacy.html
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added assets/digitaln8m4r3/materials/pallete.material
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dt5uomhqyclmn"
path="res://.godot/imported/boxing_glove_left.glb-a2c0f51ee33dcdbe8513fcbf69598e77.scn"

[deps]

source_file="res://assets/digitaln8m4r3/models/boxing gloves/boxing_glove_left.glb"
dest_files=["res://.godot/imported/boxing_glove_left.glb-a2c0f51ee33dcdbe8513fcbf69598e77.scn"]

[params]

nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://c4f3ghyc7b16d"
path="res://.godot/imported/boxing_glove_right.glb-e5e5569b62e92d44dee4015033917540.scn"

[deps]

source_file="res://assets/digitaln8m4r3/models/boxing gloves/boxing_glove_right.glb"
dest_files=["res://.godot/imported/boxing_glove_right.glb-e5e5569b62e92d44dee4015033917540.scn"]

[params]

nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Binary file not shown.
34 changes: 34 additions & 0 deletions assets/digitaln8m4r3/models/boxing ring/boxing_ring.glb.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://c1e7a5x7i6781"
path="res://.godot/imported/boxing_ring.glb-11140985e9b6461d5d8d151e2e6e6310.scn"

[deps]

source_file="res://assets/digitaln8m4r3/models/boxing ring/boxing_ring.glb"
dest_files=["res://.godot/imported/boxing_ring.glb-11140985e9b6461d5d8d151e2e6e6310.scn"]

[params]

nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://b6r13shibv5l6"
path="res://.godot/imported/climbing_grips.glb-f92be666fa742c56b017d2680c51451d.scn"

[deps]

source_file="res://assets/digitaln8m4r3/models/climbing grips/climbing_grips.glb"
dest_files=["res://.godot/imported/climbing_grips.glb-f92be666fa742c56b017d2680c51451d.scn"]

[params]

nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Binary file not shown.
34 changes: 34 additions & 0 deletions assets/digitaln8m4r3/models/gym bags/punching_bag.glb.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://brrmec2fhu2s6"
path="res://.godot/imported/punching_bag.glb-3c863bcb464655529d8754c034cdeff2.scn"

[deps]

source_file="res://assets/digitaln8m4r3/models/gym bags/punching_bag.glb"
dest_files=["res://.godot/imported/punching_bag.glb-3c863bcb464655529d8754c034cdeff2.scn"]

[params]

nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Binary file not shown.
34 changes: 34 additions & 0 deletions assets/digitaln8m4r3/models/gym bags/punching_ball.glb.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://drb0jije4gwkr"
path="res://.godot/imported/punching_ball.glb-3c3fccbf7dc7a734585e0fd22081e3f0.scn"

[deps]

source_file="res://assets/digitaln8m4r3/models/gym bags/punching_ball.glb"
dest_files=["res://.godot/imported/punching_ball.glb-3c3fccbf7dc7a734585e0fd22081e3f0.scn"]

[params]

nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Binary file not shown.
34 changes: 34 additions & 0 deletions assets/digitaln8m4r3/models/gym weights/1kgweight.glb.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://b35b4oi3lo63s"
path="res://.godot/imported/1kgweight.glb-f76b0b8e7603e2f561d2205442b27d84.scn"

[deps]

source_file="res://assets/digitaln8m4r3/models/gym weights/1kgweight.glb"
dest_files=["res://.godot/imported/1kgweight.glb-f76b0b8e7603e2f561d2205442b27d84.scn"]

[params]

nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Binary file not shown.
34 changes: 34 additions & 0 deletions assets/digitaln8m4r3/models/gym weights/3kgweight.glb.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://bv115s1h8n1am"
path="res://.godot/imported/3kgweight.glb-de196b4d7c1018e7c1669380fe94d7f7.scn"

[deps]

source_file="res://assets/digitaln8m4r3/models/gym weights/3kgweight.glb"
dest_files=["res://.godot/imported/3kgweight.glb-de196b4d7c1018e7c1669380fe94d7f7.scn"]

[params]

nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Binary file not shown.
34 changes: 34 additions & 0 deletions assets/digitaln8m4r3/models/gym weights/5kgweight.glb.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="scene"
importer_version=1
type="PackedScene"
uid="uid://dimw2psym3b5i"
path="res://.godot/imported/5kgweight.glb-7d7331ed558ca1c931617dd76a2d5c4d.scn"

[deps]

source_file="res://assets/digitaln8m4r3/models/gym weights/5kgweight.glb"
dest_files=["res://.godot/imported/5kgweight.glb-7d7331ed558ca1c931617dd76a2d5c4d.scn"]

[params]

nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=1.0
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Binary file not shown.
Loading

0 comments on commit dda0cf8

Please sign in to comment.