Valcuda/project_teddy
1
0
Fork 0
forked from the_adventures_of_teddy/project_teddy
Code Pull requests Activity

added gun

Browse source
This commit is contained in:
Paul Black 2023-05-04 13:35:20 -06:00
parent 5049cfb588
commit 537c85d017
5 changed files with 70 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
characters/teddy/Teddy.gd
View file

@ -39,6 +39,7 @@ func _ready():
Global.teddyAuthorityID = teddyAuthority Global.teddyAuthorityID = teddyAuthority
if is_multiplayer_authority(): if is_multiplayer_authority():
$CollisionShape3D/Neck/Teddy.visible = false $CollisionShape3D/Neck/Teddy.visible = false
$CollisionShape3D/Neck/Camera3D/Gun.visible = true
if not Global.addedMenuScene: if not Global.addedMenuScene:
Global.addedMenuScene = true Global.addedMenuScene = true
var scene_trs = load("res://scenes/mainmenu.tscn") var scene_trs = load("res://scenes/mainmenu.tscn")

18
objects/train/train_animated.tscn
View file

@ -211,6 +211,24 @@ data = PackedVector3Array(0.5636, 2.2435, -1.2119, 0.6523, 0.8607, -1.2119, 0.65
[node name="trainANIMATED" instance=ExtResource("1_kc403")] [node name="trainANIMATED" instance=ExtResource("1_kc403")]
[node name="Cylinder006" parent="Cylinder019" index="0"]
transform = Transform3D(0.999966, -0.00675785, 0, 0.00675755, 1.00001, 0, 0, 0, 1, 2.3469, 1.20641, -0.125609)
[node name="Cylinder007" parent="Cylinder019" index="1"]
transform = Transform3D(0.999966, -0.00675785, 0, 0.00675755, 1.00001, 0, 0, 0, 1, -0.17053, 1.19787, -0.125609)
[node name="Cylinder008" parent="Cylinder019" index="2"]
transform = Transform3D(0.999966, -0.00675785, 0, 0.00675755, 1.00001, 0, 0, 0, 1, 4.85403, -0.729502, -0.125608)
[node name="Cylinder009" parent="Cylinder019" index="3"]
transform = Transform3D(0.999966, -0.00675785, 0, 0.00675755, 1.00001, 0, 0, 0, 1, -0.150835, -0.746473, -0.125609)
[node name="Cylinder010" parent="Cylinder019" index="4"]
transform = Transform3D(0.999966, -0.00675785, 0, 0.00675755, 1.00001, 0, 0, 0, 1, 2.36658, -0.737938, -0.125608)
[node name="Cylinder012" parent="Cylinder019" index="5"]
transform = Transform3D(0.999966, -0.00675785, -1.26877e-07, 0.00675755, 1.00001, 1.9758e-07, 1.25537e-07, -1.9844e-07, 1, 4.83434, 1.21484, -0.125608)
[node name="StaticBody3D" type="StaticBody3D" parent="Cylinder019" index="6"] [node name="StaticBody3D" type="StaticBody3D" parent="Cylinder019" index="6"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Cylinder019/StaticBody3D" index="0"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Cylinder019/StaticBody3D" index="0"]

7
scenes/Teddy.tscn
View file

@ -1,6 +1,7 @@
[gd_scene load_steps=7 format=3 uid="uid://dp1q51kvd8uow"] [gd_scene load_steps=8 format=3 uid="uid://dp1q51kvd8uow"]
[ext_resource type="Script" path="res://characters/teddy/Teddy.gd" id="1_ywxo5"] [ext_resource type="Script" path="res://characters/teddy/Teddy.gd" id="1_ywxo5"]
[ext_resource type="PackedScene" uid="uid://dabv0m7iiccid" path="res://objects/gun/Gun.glb" id="2_gh1pb"]
[ext_resource type="Script" path="res://scripts/nameLabel.gd" id="3_1v4js"] [ext_resource type="Script" path="res://scripts/nameLabel.gd" id="3_1v4js"]
[ext_resource type="PackedScene" uid="uid://b4eo3c2ux18r1" path="res://characters/teddy/teddy_model.tscn" id="4_q0pxc"] [ext_resource type="PackedScene" uid="uid://b4eo3c2ux18r1" path="res://characters/teddy/teddy_model.tscn" id="4_q0pxc"]
[ext_resource type="ArrayMesh" uid="uid://b26a54y2fd5n8" path="res://characters/teddy/cotton/cotton.obj" id="4_qbair"] [ext_resource type="ArrayMesh" uid="uid://b26a54y2fd5n8" path="res://characters/teddy/cotton/cotton.obj" id="4_qbair"]
@ -31,6 +32,10 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.859224, 0)
[node name="BulletGenerator" type="Marker3D" parent="CollisionShape3D/Neck/Camera3D"] [node name="BulletGenerator" type="Marker3D" parent="CollisionShape3D/Neck/Camera3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.104801, -0.858231) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.104801, -0.858231)
[node name="Gun" parent="CollisionShape3D/Neck/Camera3D" instance=ExtResource("2_gh1pb")]
transform = Transform3D(-0.0344415, 0, 0.422806, 0, 0.424206, 0, -0.422806, 0, -0.0344415, 0.892882, -1.09288, -1.20165)
visible = false
[node name="Teddy" parent="CollisionShape3D/Neck" instance=ExtResource("4_q0pxc")] [node name="Teddy" parent="CollisionShape3D/Neck" instance=ExtResource("4_q0pxc")]
transform = Transform3D(-0.328533, 1.14588e-16, -2.87213e-08, 1.14588e-16, 0.328533, -1.14588e-16, 2.87213e-08, -1.14588e-16, -0.328533, 2.08165e-12, -1.87888, 2.08165e-12) transform = Transform3D(-0.328533, 1.14588e-16, -2.87213e-08, 1.14588e-16, 0.328533, -1.14588e-16, 2.87213e-08, -1.14588e-16, -0.328533, 2.08165e-12, -1.87888, 2.08165e-12)

2
scenes/mainmenu.tscn
View file

@ -123,7 +123,7 @@ offset_left = 4.0
offset_top = 622.0 offset_top = 622.0
offset_right = 94.0 offset_right = 94.0
offset_bottom = 648.0 offset_bottom = 648.0
text = "Version: 1.0" text = "Version: 1.5 BETA"
[node name="OurTimeIsNowSolo" type="Sprite2D" parent="."] [node name="OurTimeIsNowSolo" type="Sprite2D" parent="."]
position = Vector2(123, 104) position = Vector2(123, 104)

45
scenes/toyfactory-map.tscn
View file

File diff suppressed because one or more lines are too long