List of commits:
Subject Hash Author Date (UTC)
Add freight containers f9d546676083fb36c1954a59af52ec59a0f526d2 fluffrabbit 2017-04-27 11:48:32
Add buildings, initial gyro support 873a1295514f76bf1f7b4139888173414f4b2891 fluffrabbit 2017-04-18 12:17:50
Add scoreboard, bump version to 0.0.4 39acd8a4fceae35b5a40a437f02aa9bec193fb27 fluffrabbit 2017-04-13 06:57:15
Add button panel, save VR preference, improve vignette, box player in 5355a1cfcb49dfb676394a932a9ae58bd5c7b942 fluffrabbit 2017-04-06 03:42:14
Initial commit 8112cb088917c705bda9e291d3d15aacf003dce4 fluffrabbit 2017-03-28 15:44:04
Commit f9d546676083fb36c1954a59af52ec59a0f526d2 - Add freight containers
Author: fluffrabbit
Author date (UTC): 2017-04-27 11:48
Committer name: fluffrabbit
Committer date (UTC): 2017-04-27 11:48
Parent(s): 873a1295514f76bf1f7b4139888173414f4b2891
Signing key:
Tree: 6027bab08c2f92ee9f35472e475119bacee0526e
File Lines added Lines deleted
data/scenes/12m.tscn 116 0
data/scenes/freight.blend 0 0
data/scenes/freight.dae 71 0
data/scenes/freight.png 0 0
data/scenes/freight.png.flags 0 0
data/scenes/freight.scn 0 0
data/scenes/skyhammer.tscn 66 1
File data/scenes/12m.tscn added (mode: 100644) (index 0000000..e7926f5)
1 [gd_scene load_steps=5 format=1]
2
3 [ext_resource path="res://data/scenes/freight.png" type="Texture" id=1]
4
5 [sub_resource type="BoxShape" id=3]
6
7 extents = Vector3( 1.175, 1.25, 6 )
8
9 [sub_resource type="Mesh" id=1]
10
11 resource/name = "freight"
12 surfaces/0 = {
13 "alphasort": false,
14 "arrays": [ Vector3Array( -1.175, 1.25, 6, -1.175, -1.25, -6, -1.175, -1.25, 6, -1.175, 1.25, -6, 1.175, -1.25, -6, -1.175, -1.25, -6, 1.175, 1.25, -6, 1.175, -1.25, 6, 1.175, -1.25, -6, 1.175, 1.25, 6, -1.175, -1.25, 6, 1.175, -1.25, 6, 1.175, -1.25, -6, -1.175, -1.25, 6, -1.175, -1.25, -6, -1.175, 1.25, -6, 1.175, 1.25, 6, 1.175, 1.25, -6, -1.175, 1.25, -6, 1.175, 1.25, -6, 1.175, 1.25, 6, -1.175, 1.25, 6, 1.175, -1.25, 6, -1.175, 1.25, 6 ), Vector3Array( -0.999, 0, 0, -0.999, 0, 0, -0.999, 0, 0, 0, 0, -1, 0, 0, -1, 0, 0, -1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0.999, 0, 0, 0.999, 0, 0, 0.999, 0, -0.999, 0, 0, -0.999, 0, 0, -0.999, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, -0.999, 0, 0, 0, 0, -1, 1, 0, 0, 0, 0, 0.999, 0, -0.999, 0, 0, 1, 0 ), null, null, Vector3Array( 0.5, -4.23125, 0, 12.5, -1.73125, 0, 0.5, -1.73125, 0, 1.36841, -4.23125, 0, 3.71841, -1.73125, 0, 1.36841, -1.73125, 0, 0.5, -4.23125, 0, -11.5, -1.73125, 0, 0.5, -1.73125, 0, -0.281595, -4.23125, 0, -2.63159, -1.73125, 0, -0.281595, -1.73125, 0, 6.5, 8.19375, 0, -5.5, 5.84375, 0, 6.5, 5.84375, 0, 6.5, 1.84375, 0, -5.5, 4.19375, 0, 6.5, 4.19375, 0, 12.5, -4.23125, 0, 3.71841, -4.23125, 0, -11.5, -4.23125, 0, -2.63159, -4.23125, 0, -5.5, 8.19375, 0, -5.5, 1.84375, 0 ), null, null, null, IntArray( 0, 2, 1, 3, 5, 4, 6, 8, 7, 9, 11, 10, 12, 14, 13, 15, 17, 16, 0, 1, 18, 3, 4, 19, 6, 7, 20, 9, 10, 21, 12, 13, 22, 15, 16, 23 ) ],
15 "morph_arrays": [ ],
16 "primitive": 4
17 }
18 custom_aabb/custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
19
20 [sub_resource type="FixedMaterial" id=2]
21
22 flags/visible = true
23 flags/double_sided = false
24 flags/invert_faces = false
25 flags/unshaded = false
26 flags/on_top = false
27 flags/lightmap_on_uv2 = true
28 flags/colarray_is_srgb = true
29 params/blend_mode = 0
30 params/depth_draw = 1
31 params/line_width = 0.0
32 fixed_flags/use_alpha = false
33 fixed_flags/use_color_array = false
34 fixed_flags/use_point_size = false
35 fixed_flags/discard_alpha = false
36 fixed_flags/use_xy_normalmap = false
37 params/diffuse = Color( 1, 1, 1, 1 )
38 params/specular = Color( 0, 0, 0, 1 )
39 params/emission = Color( 0, 0, 0, 1 )
40 params/specular_exp = 40
41 params/detail_mix = 1.0
42 params/normal_depth = 1
43 params/shader = 0
44 params/shader_param = 0.5
45 params/glow = 0
46 params/point_size = 1.0
47 uv_xform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
48 textures/diffuse = ExtResource( 1 )
49 textures/diffuse_tc = 0
50 textures/detail_tc = 0
51 textures/specular_tc = 0
52 textures/emission_tc = 0
53 textures/specular_exp_tc = 0
54 textures/glow_tc = 0
55 textures/normal_tc = 0
56 textures/shade_param_tc = 0
57
58 [node name="12m" type="RigidBody"]
59
60 _import_path = NodePath(".")
61 _import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
62 input/ray_pickable = true
63 input/capture_on_drag = false
64 shape_count = 1
65 shapes/0/shape = SubResource( 3 )
66 shapes/0/transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
67 shapes/0/trigger = false
68 collision/layers = 1
69 collision/mask = 1
70 mode = 0
71 mass = 105.0
72 friction = 1.0
73 bounce = 0.0
74 gravity_scale = 1.0
75 custom_integrator = false
76 continuous_cd = false
77 contacts_reported = 0
78 contact_monitor = false
79 sleeping = false
80 can_sleep = true
81 axis_lock = 0
82 velocity/linear = Vector3( 0, 0, 0 )
83 velocity/angular = Vector3( 0, 0, 0 )
84 damp_override/linear = -1.0
85 damp_override/angular = -1.0
86
87 [node name="CollisionShape" type="CollisionShape" parent="."]
88
89 _import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
90 shape = SubResource( 3 )
91 trigger = false
92 _update_shape_index = 0
93
94 [node name="freight" type="MeshInstance" parent="."]
95
96 _import_path = NodePath("freight")
97 _import_transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
98 layers = 1
99 geometry/visible = true
100 geometry/material_override = null
101 geometry/cast_shadow = 1
102 geometry/receive_shadows = true
103 geometry/range_begin = 0.0
104 geometry/range_end = 0.0
105 geometry/extra_cull_margin = 0.0
106 geometry/billboard = false
107 geometry/billboard_y = false
108 geometry/depth_scale = false
109 geometry/visible_in_all_rooms = false
110 geometry/use_baked_light = true
111 geometry/baked_light_tex_id = 0
112 mesh/mesh = SubResource( 1 )
113 mesh/skeleton = NodePath("..")
114 material/0 = SubResource( 2 )
115
116
File data/scenes/freight.blend copied from file data/scenes/saucer.blend (similarity 74%) (mode: 100644) (index 7cefa50..140cecf)
File data/scenes/freight.dae added (mode: 100644) (index 0000000..f77bef3)
1 <?xml version="1.0" encoding="utf-8"?>
2 <COLLADA xmlns="http://www.collada.org/2005/11/COLLADASchema" version="1.4.1">
3 <asset>
4 <contributor>
5 <author>Blender User</author>
6 <authoring_tool>Blender 2.78.0 commit date:2016-09-26, commit time:12:42, hash:4bb1e22</authoring_tool>
7 </contributor>
8 <created>2017-04-27T03:54:25</created>
9 <modified>2017-04-27T03:54:25</modified>
10 <unit name="meter" meter="1"/>
11 <up_axis>Z_UP</up_axis>
12 </asset>
13 <library_images/>
14 <library_geometries>
15 <geometry id="freight-mesh" name="freight">
16 <mesh>
17 <source id="freight-mesh-positions">
18 <float_array id="freight-mesh-positions-array" count="24">-1.175 -6 -1.25 -1.175 -6 1.25 -1.175 6 -1.25 -1.175 6 1.25 1.175 -6 -1.25 1.175 -6 1.25 1.175 6 -1.25 1.175 6 1.25</float_array>
19 <technique_common>
20 <accessor source="#freight-mesh-positions-array" count="8" stride="3">
21 <param name="X" type="float"/>
22 <param name="Y" type="float"/>
23 <param name="Z" type="float"/>
24 </accessor>
25 </technique_common>
26 </source>
27 <source id="freight-mesh-normals">
28 <float_array id="freight-mesh-normals-array" count="18">-1 0 0 0 1 0 1 0 0 0 -1 0 0 0 -1 0 0 1</float_array>
29 <technique_common>
30 <accessor source="#freight-mesh-normals-array" count="6" stride="3">
31 <param name="X" type="float"/>
32 <param name="Y" type="float"/>
33 <param name="Z" type="float"/>
34 </accessor>
35 </technique_common>
36 </source>
37 <source id="freight-mesh-map-0">
38 <float_array id="freight-mesh-map-0-array" count="72">0.5 5.23125 12.5 2.73125 0.5 2.73125 1.368406 5.23125 3.718406 2.73125 1.368406 2.73125 0.5 5.23125 -11.5 2.73125 0.5 2.73125 -0.2815945 5.23125 -2.631594 2.73125 -0.2815945 2.73125 6.5 -7.19375 -5.5 -4.84375 6.5 -4.84375 6.5 -0.84375 -5.5 -3.19375 6.5 -3.19375 0.5 5.23125 12.5 5.23125 12.5 2.73125 1.368406 5.23125 3.718406 5.23125 3.718406 2.73125 0.5 5.23125 -11.5 5.23125 -11.5 2.73125 -0.2815945 5.23125 -2.631594 5.23125 -2.631594 2.73125 6.5 -7.19375 -5.5 -7.19375 -5.5 -4.84375 6.5 -0.84375 -5.5 -0.8437498 -5.5 -3.19375</float_array>
39 <technique_common>
40 <accessor source="#freight-mesh-map-0-array" count="36" stride="2">
41 <param name="S" type="float"/>
42 <param name="T" type="float"/>
43 </accessor>
44 </technique_common>
45 </source>
46 <vertices id="freight-mesh-vertices">
47 <input semantic="POSITION" source="#freight-mesh-positions"/>
48 </vertices>
49 <polylist count="12">
50 <input semantic="VERTEX" source="#freight-mesh-vertices" offset="0"/>
51 <input semantic="NORMAL" source="#freight-mesh-normals" offset="1"/>
52 <input semantic="TEXCOORD" source="#freight-mesh-map-0" offset="2" set="0"/>
53 <vcount>3 3 3 3 3 3 3 3 3 3 3 3 </vcount>
54 <p>1 0 0 2 0 1 0 0 2 3 1 3 6 1 4 2 1 5 7 2 6 4 2 7 6 2 8 5 3 9 0 3 10 4 3 11 6 4 12 0 4 13 2 4 14 3 5 15 5 5 16 7 5 17 1 0 18 3 0 19 2 0 20 3 1 21 7 1 22 6 1 23 7 2 24 5 2 25 4 2 26 5 3 27 1 3 28 0 3 29 6 4 30 4 4 31 0 4 32 3 5 33 1 5 34 5 5 35</p>
55 </polylist>
56 </mesh>
57 </geometry>
58 </library_geometries>
59 <library_controllers/>
60 <library_visual_scenes>
61 <visual_scene id="Scene" name="Scene">
62 <node id="freight" name="freight" type="NODE">
63 <matrix sid="transform">1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1</matrix>
64 <instance_geometry url="#freight-mesh" name="freight"/>
65 </node>
66 </visual_scene>
67 </library_visual_scenes>
68 <scene>
69 <instance_visual_scene url="#Scene"/>
70 </scene>
71 </COLLADA>
File data/scenes/freight.png added (mode: 100644) (index 0000000..ffb3b5e)
File data/scenes/freight.png.flags copied from file data/scenes/snow.png.flags (similarity 100%)
File data/scenes/freight.scn added (mode: 100644) (index 0000000..6835080)
File data/scenes/skyhammer.tscn changed (mode: 100644) (index 877d52c..caab14b)
1 [gd_scene load_steps=37 format=1]
1 [gd_scene load_steps=38 format=1]
2 2
3 3 [ext_resource path="res://data/cubemaps/night.cbm" type="CubeMap" id=1] [ext_resource path="res://data/cubemaps/night.cbm" type="CubeMap" id=1]
4 4 [ext_resource path="res://data/audio/wind.ogg" type="AudioStream" id=2] [ext_resource path="res://data/audio/wind.ogg" type="AudioStream" id=2]
 
15 15 [ext_resource path="res://data/scenes/ship.tscn" type="PackedScene" id=13] [ext_resource path="res://data/scenes/ship.tscn" type="PackedScene" id=13]
16 16 [ext_resource path="res://data/scenes/box.tscn" type="PackedScene" id=14] [ext_resource path="res://data/scenes/box.tscn" type="PackedScene" id=14]
17 17 [ext_resource path="res://data/scenes/mall.tscn" type="PackedScene" id=15] [ext_resource path="res://data/scenes/mall.tscn" type="PackedScene" id=15]
18 [ext_resource path="res://data/scenes/12m.tscn" type="PackedScene" id=16]
18 19
19 20 [sub_resource type="Environment" id=1] [sub_resource type="Environment" id=1]
20 21
 
... ... transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -50, 0, -59.5 )
1139 1140
1140 1141 transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -72.5142 ) transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -72.5142 )
1141 1142
1143 [node name="12m" parent="." instance=ExtResource( 16 )]
1144
1145 transform/local = Transform( 0.863719, 0, 0.503974, 0, 1, 0, -0.503974, 0, 0.863719, -11.9867, 1.25, 18.7344 )
1146
1147 [node name="12m1" parent="." instance=ExtResource( 16 )]
1148
1149 transform/local = Transform( 0.879777, 0, 0.475387, 0, 1, 0, -0.475387, 0, 0.879777, -12.2318, 3.75, 18.8253 )
1150
1151 [node name="12m2" parent="." instance=ExtResource( 16 )]
1152
1153 transform/local = Transform( 0.863719, 0, 0.503974, 0, 1, 0, -0.503974, 0, 0.863719, -11.9867, 1.25, 31.6446 )
1154
1155 [node name="12m3" parent="." instance=ExtResource( 16 )]
1156
1157 transform/local = Transform( 0.879777, 0, 0.475387, 0, 1, 0, -0.475387, 0, 0.879777, -12.2318, 3.75, 31.698 )
1158
1159 [node name="12m4" parent="." instance=ExtResource( 16 )]
1160
1161 transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -8.3198, 3.75, 4.99271 )
1162
1163 [node name="12m5" parent="." instance=ExtResource( 16 )]
1164
1165 transform/local = Transform( 0.999391, 0, 0.0348995, 0, 1, 0, -0.0348995, 0, 0.999391, -8.39912, 1.25, 5.59807 )
1166
1167 [node name="12m6" parent="." instance=ExtResource( 16 )]
1168
1169 transform/local = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5342, 3.75, -4.40673 )
1170
1171 [node name="12m7" parent="." instance=ExtResource( 16 )]
1172
1173 transform/local = Transform( 0.999391, 0, 0.0348995, 0, 1, 0, -0.0348995, 0, 0.999391, -5.63391, 1.25, -4.51095 )
1174
1175 [node name="12m8" parent="." instance=ExtResource( 16 )]
1176
1177 transform/local = Transform( 0.91463, 0, 0.404291, 0, 1, 0, -0.404291, 0, 0.91463, 8.60559, 1.25, -4.51095 )
1178
1179 [node name="12m9" parent="." instance=ExtResource( 16 )]
1180
1181 transform/local = Transform( 0.896128, 0, 0.443795, 0, 1, 0, -0.443795, 0, 0.896128, 8.95867, 3.75, -4.40673 )
1182
1183 [node name="12m10" parent="." instance=ExtResource( 16 )]
1184
1185 transform/local = Transform( 0.998526, 0, -0.0542822, 0, 1, 0, 0.0542822, 0, 0.998526, 15.8973, 3.75, 2.96221 )
1186
1187 [node name="12m11" parent="." instance=ExtResource( 16 )]
1188
1189 transform/local = Transform( 0.99909, 0, -0.0426532, 0, 1, 0, 0.0426532, 0, 0.99909, 16.31, 1.25, 2.67815 )
1190
1191 [node name="12m12" parent="." instance=ExtResource( 16 )]
1192
1193 transform/local = Transform( 0.827995, 0, -0.560736, 0, 1, 0, 0.560736, 0, 0.827995, 18.3893, 1.25, 12.1039 )
1194
1195 [node name="12m13" parent="." instance=ExtResource( 16 )]
1196
1197 transform/local = Transform( 0.822497, 0, -0.56877, 0, 1, 0, 0.56877, 0, 0.822497, 18.3929, 3.75, 12.0472 )
1198
1199 [node name="12m14" parent="." instance=ExtResource( 16 )]
1200
1201 transform/local = Transform( -0.0248817, 0, -0.99969, 0, 1, 0, 0.99969, 0, -0.0248817, -0.995706, 3.75, 25.7587 )
1202
1203 [node name="12m15" parent="." instance=ExtResource( 16 )]
1204
1205 transform/local = Transform( -0.0423021, 0, -0.999105, 0, 1, 0, 0.999105, 0, -0.0423021, -0.986939, 1.25, 25.7487 )
1206
1142 1207
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/fluffrabbit/SkyHammer

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/fluffrabbit/SkyHammer

Clone this repository using git:
git clone git://git.rocketgit.com/user/fluffrabbit/SkyHammer

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main