Compare commits

..

No commits in common. "3d6ca8c12e3a92ee0f89e1cef0d2eeece4164806" and "0931abce560c382afee90a8743445f1d6d73cd4a" have entirely different histories.

8 changed files with 175 additions and 181 deletions

Binary file not shown.

View File

@ -562,8 +562,8 @@
"output":26
},
{
"input":12,
"interpolation":"LINEAR",
"input":7,
"interpolation":"STEP",
"output":27
},
{
@ -2099,7 +2099,7 @@
{
"bufferView":27,
"componentType":5126,
"count":90,
"count":2,
"type":"VEC3"
},
{
@ -2985,598 +2985,598 @@
},
{
"buffer":0,
"byteLength":1080,
"byteLength":24,
"byteOffset":17200
},
{
"buffer":0,
"byteLength":1440,
"byteOffset":18280
"byteOffset":17224
},
{
"buffer":0,
"byteLength":24,
"byteOffset":19720
"byteOffset":18664
},
{
"buffer":0,
"byteLength":24,
"byteOffset":19744
"byteOffset":18688
},
{
"buffer":0,
"byteLength":1440,
"byteOffset":19768
"byteOffset":18712
},
{
"buffer":0,
"byteLength":24,
"byteOffset":21208
"byteOffset":20152
},
{
"buffer":0,
"byteLength":24,
"byteOffset":21232
"byteOffset":20176
},
{
"buffer":0,
"byteLength":1440,
"byteOffset":21256
"byteOffset":20200
},
{
"buffer":0,
"byteLength":24,
"byteOffset":22696
"byteOffset":21640
},
{
"buffer":0,
"byteLength":24,
"byteOffset":22720
"byteOffset":21664
},
{
"buffer":0,
"byteLength":1440,
"byteOffset":22744
"byteOffset":21688
},
{
"buffer":0,
"byteLength":24,
"byteOffset":24184
"byteOffset":23128
},
{
"buffer":0,
"byteLength":1080,
"byteOffset":24208
"byteOffset":23152
},
{
"buffer":0,
"byteLength":32,
"byteOffset":25288
"byteOffset":24232
},
{
"buffer":0,
"byteLength":24,
"byteOffset":25320
"byteOffset":24264
},
{
"buffer":0,
"byteLength":8,
"byteOffset":25344
"byteOffset":24288
},
{
"buffer":0,
"byteLength":24,
"byteOffset":25352
"byteOffset":24296
},
{
"buffer":0,
"byteLength":32,
"byteOffset":25376
"byteOffset":24320
},
{
"buffer":0,
"byteLength":24,
"byteOffset":25408
"byteOffset":24352
},
{
"buffer":0,
"byteLength":24,
"byteOffset":25432
"byteOffset":24376
},
{
"buffer":0,
"byteLength":1920,
"byteOffset":25456
"byteOffset":24400
},
{
"buffer":0,
"byteLength":7680,
"byteOffset":27376
"byteOffset":26320
},
{
"buffer":0,
"byteLength":24,
"byteOffset":35056
"byteOffset":34000
},
{
"buffer":0,
"byteLength":24,
"byteOffset":35080
"byteOffset":34024
},
{
"buffer":0,
"byteLength":7680,
"byteOffset":35104
"byteOffset":34048
},
{
"buffer":0,
"byteLength":24,
"byteOffset":42784
"byteOffset":41728
},
{
"buffer":0,
"byteLength":24,
"byteOffset":42808
"byteOffset":41752
},
{
"buffer":0,
"byteLength":7680,
"byteOffset":42832
"byteOffset":41776
},
{
"buffer":0,
"byteLength":24,
"byteOffset":50512
"byteOffset":49456
},
{
"buffer":0,
"byteLength":24,
"byteOffset":50536
"byteOffset":49480
},
{
"buffer":0,
"byteLength":7680,
"byteOffset":50560
"byteOffset":49504
},
{
"buffer":0,
"byteLength":24,
"byteOffset":58240
"byteOffset":57184
},
{
"buffer":0,
"byteLength":5760,
"byteOffset":58264
"byteOffset":57208
},
{
"buffer":0,
"byteLength":32,
"byteOffset":64024
"byteOffset":62968
},
{
"buffer":0,
"byteLength":24,
"byteOffset":64056
"byteOffset":63000
},
{
"buffer":0,
"byteLength":24,
"byteOffset":64080
"byteOffset":63024
},
{
"buffer":0,
"byteLength":7680,
"byteOffset":64104
"byteOffset":63048
},
{
"buffer":0,
"byteLength":24,
"byteOffset":71784
"byteOffset":70728
},
{
"buffer":0,
"byteLength":24,
"byteOffset":71808
"byteOffset":70752
},
{
"buffer":0,
"byteLength":7680,
"byteOffset":71832
"byteOffset":70776
},
{
"buffer":0,
"byteLength":24,
"byteOffset":79512
"byteOffset":78456
},
{
"buffer":0,
"byteLength":24,
"byteOffset":79536
"byteOffset":78480
},
{
"buffer":0,
"byteLength":7680,
"byteOffset":79560
"byteOffset":78504
},
{
"buffer":0,
"byteLength":24,
"byteOffset":87240
"byteOffset":86184
},
{
"buffer":0,
"byteLength":24,
"byteOffset":87264
"byteOffset":86208
},
{
"buffer":0,
"byteLength":7680,
"byteOffset":87288
"byteOffset":86232
},
{
"buffer":0,
"byteLength":24,
"byteOffset":94968
"byteOffset":93912
},
{
"buffer":0,
"byteLength":5760,
"byteOffset":94992
"byteOffset":93936
},
{
"buffer":0,
"byteLength":32,
"byteOffset":100752
"byteOffset":99696
},
{
"buffer":0,
"byteLength":24,
"byteOffset":100784
"byteOffset":99728
},
{
"buffer":0,
"byteLength":4,
"byteOffset":100808
"byteOffset":99752
},
{
"buffer":0,
"byteLength":12,
"byteOffset":100812
"byteOffset":99756
},
{
"buffer":0,
"byteLength":16,
"byteOffset":100824
"byteOffset":99768
},
{
"buffer":0,
"byteLength":12,
"byteOffset":100840
"byteOffset":99784
},
{
"buffer":0,
"byteLength":12,
"byteOffset":100852
"byteOffset":99796
},
{
"buffer":0,
"byteLength":16,
"byteOffset":100864
"byteOffset":99808
},
{
"buffer":0,
"byteLength":12,
"byteOffset":100880
"byteOffset":99824
},
{
"buffer":0,
"byteLength":12,
"byteOffset":100892
"byteOffset":99836
},
{
"buffer":0,
"byteLength":16,
"byteOffset":100904
"byteOffset":99848
},
{
"buffer":0,
"byteLength":12,
"byteOffset":100920
"byteOffset":99864
},
{
"buffer":0,
"byteLength":12,
"byteOffset":100932
"byteOffset":99876
},
{
"buffer":0,
"byteLength":16,
"byteOffset":100944
"byteOffset":99888
},
{
"buffer":0,
"byteLength":12,
"byteOffset":100960
"byteOffset":99904
},
{
"buffer":0,
"byteLength":12,
"byteOffset":100972
"byteOffset":99916
},
{
"buffer":0,
"byteLength":16,
"byteOffset":100984
"byteOffset":99928
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101000
"byteOffset":99944
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101012
"byteOffset":99956
},
{
"buffer":0,
"byteLength":16,
"byteOffset":101024
"byteOffset":99968
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101040
"byteOffset":99984
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101052
"byteOffset":99996
},
{
"buffer":0,
"byteLength":16,
"byteOffset":101064
"byteOffset":100008
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101080
"byteOffset":100024
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101092
"byteOffset":100036
},
{
"buffer":0,
"byteLength":16,
"byteOffset":101104
"byteOffset":100048
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101120
"byteOffset":100064
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101132
"byteOffset":100076
},
{
"buffer":0,
"byteLength":16,
"byteOffset":101144
"byteOffset":100088
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101160
"byteOffset":100104
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101172
"byteOffset":100116
},
{
"buffer":0,
"byteLength":16,
"byteOffset":101184
"byteOffset":100128
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101200
"byteOffset":100144
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101212
"byteOffset":100156
},
{
"buffer":0,
"byteLength":16,
"byteOffset":101224
"byteOffset":100168
},
{
"buffer":0,
"byteLength":12,
"byteOffset":101240
"byteOffset":100184
},
{
"buffer":0,
"byteLength":8,
"byteOffset":101252
"byteOffset":100196
},
{
"buffer":0,
"byteLength":24,
"byteOffset":101260
"byteOffset":100204
},
{
"buffer":0,
"byteLength":32,
"byteOffset":101284
"byteOffset":100228
},
{
"buffer":0,
"byteLength":24,
"byteOffset":101316
"byteOffset":100260
},
{
"buffer":0,
"byteLength":24,
"byteOffset":101340
"byteOffset":100284
},
{
"buffer":0,
"byteLength":240,
"byteOffset":101364
"byteOffset":100308
},
{
"buffer":0,
"byteLength":960,
"byteOffset":101604
"byteOffset":100548
},
{
"buffer":0,
"byteLength":24,
"byteOffset":101508
},
{
"buffer":0,
"byteLength":24,
"byteOffset":101532
},
{
"buffer":0,
"byteLength":960,
"byteOffset":101556
},
{
"buffer":0,
"byteLength":24,
"byteOffset":102516
},
{
"buffer":0,
"byteLength":24,
"byteOffset":102540
},
{
"buffer":0,
"byteLength":960,
"byteOffset":102564
},
{
"buffer":0,
"byteLength":24,
"byteOffset":102588
},
{
"buffer":0,
"byteLength":960,
"byteOffset":102612
"byteOffset":103524
},
{
"buffer":0,
"byteLength":24,
"byteOffset":103548
},
{
"buffer":0,
"byteLength":960,
"byteOffset":103572
},
{
"buffer":0,
"byteLength":24,
"byteOffset":103596
},
{
"buffer":0,
"byteLength":960,
"byteOffset":103620
},
{
"buffer":0,
"byteLength":24,
"byteOffset":104580
},
{
"buffer":0,
"byteLength":24,
"byteOffset":104604
},
{
"buffer":0,
"byteLength":960,
"byteOffset":104628
},
{
"buffer":0,
"byteLength":24,
"byteOffset":105588
"byteOffset":104532
},
{
"buffer":0,
"byteLength":720,
"byteOffset":105612
"byteOffset":104556
},
{
"buffer":0,
"byteLength":960,
"byteOffset":106332
"byteOffset":105276
},
{
"buffer":0,
"byteLength":24,
"byteOffset":106236
},
{
"buffer":0,
"byteLength":24,
"byteOffset":106260
},
{
"buffer":0,
"byteLength":960,
"byteOffset":106284
},
{
"buffer":0,
"byteLength":24,
"byteOffset":107244
},
{
"buffer":0,
"byteLength":24,
"byteOffset":107268
},
{
"buffer":0,
"byteLength":960,
"byteOffset":107292
},
{
"buffer":0,
"byteLength":24,
"byteOffset":107316
},
{
"buffer":0,
"byteLength":960,
"byteOffset":107340
"byteOffset":108252
},
{
"buffer":0,
"byteLength":24,
"byteOffset":108276
},
{
"buffer":0,
"byteLength":960,
"byteOffset":108300
},
{
"buffer":0,
"byteLength":24,
"byteOffset":108324
},
{
"buffer":0,
"byteLength":960,
"byteOffset":108348
"byteOffset":109260
},
{
"buffer":0,
"byteLength":24,
"byteOffset":109284
},
{
"buffer":0,
"byteLength":960,
"byteOffset":109308
},
{
"buffer":0,
"byteLength":24,
"byteOffset":109332
},
{
"buffer":0,
"byteLength":960,
"byteOffset":109356
},
{
"buffer":0,
"byteLength":24,
"byteOffset":110316
},
{
"buffer":0,
"byteLength":24,
"byteOffset":110340
},
{
"buffer":0,
"byteLength":960,
"byteOffset":110364
},
{
"buffer":0,
"byteLength":24,
"byteOffset":111324
"byteOffset":110268
},
{
"buffer":0,
"byteLength":720,
"byteOffset":111348
"byteOffset":110292
},
{
"buffer":0,
"byteLength":960,
"byteOffset":112068
"byteOffset":111012
},
{
"buffer":0,
"byteLength":24,
"byteOffset":113028
"byteOffset":111972
}
],
"samplers":[
@ -3587,7 +3587,7 @@
],
"buffers":[
{
"byteLength":113052,
"byteLength":111996,
"uri":"umineko.bin"
}
]

View File

@ -414,6 +414,3 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.4011, 0.530239, -13.6932)
[node name="Umineko3" parent="Lakeside/Flock2" instance=ExtResource("21_ch6qk")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.56348, -0.274033, -7.70535)
[node name="DemoCamera" type="Camera3D" parent="."]
transform = Transform3D(-0.317113, 0.433573, -0.843477, 0, 0.88938, 0.457168, 0.948388, 0.144974, -0.282034, 461.268, 30.8271, 256.17)

View File

@ -30,8 +30,8 @@ gdscript/warnings/unsafe_call_argument=2
[display]
window/size/viewport_width=1920
window/size/viewport_height=1080
window/size/viewport_width=1280
window/size/viewport_height=720
window/size/borderless=true
window/stretch/aspect="ignore"
@ -42,7 +42,6 @@ project/assembly_name="Gfolf2"
[editor]
movie_writer/movie_file="demos/demo.avi"
movie_writer/fps=40
[editor_plugins]

View File

@ -50,7 +50,6 @@ bones/4/rotation = Quaternion(-2.06306e-08, 9.3445e-15, -0.13663, 0.990622)
bones/5/position = Vector3(1.46719, 0.319025, -2.26868e-07)
bones/5/rotation = Quaternion(1.45288e-07, 2.54822e-14, 0.9622, -0.272343)
bones/5/scale = Vector3(1, 1, 1)
bones/6/position = Vector3(-3.69807e-09, 1, 4.25861e-10)
bones/6/rotation = Quaternion(1.78182e-14, 1.00686e-07, 0.745227, 0.66681)
bones/6/scale = Vector3(1, 1, 1)
bones/7/rotation = Quaternion(-1.21153e-08, -4.65491e-15, 0.0802357, 0.996776)

View File

@ -98,7 +98,6 @@ _data = {
[node name="Game" type="Node" groups=["GameGroup"]]
process_mode = 3
script = ExtResource("1_4qa87")
start_scene = "res://levels/debug_level/debug_level.tscn"
[node name="RootControl" type="Control" parent="."]
unique_name_in_owner = true
@ -188,7 +187,7 @@ handle_input_locally = false
msaa_3d = 3
screen_space_aa = 1
use_taa = true
size = Vector2i(1920, 1080)
size = Vector2i(1280, 720)
render_target_update_mode = 4
[node name="Content" type="Node" parent="RootControl/Rumbler/ViewportContainer/Viewport"]