Skip to content

Commit a38b315

Browse files
committed
Port audio, gui, mono, networking and viewport demos to Godot 3.1
1 parent faae60a commit a38b315

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+483
-3093
lines changed

audio/mic_record/Node2D.tscn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
[sub_resource type="AudioStreamMicrophone" id=1]
77

8-
98
[node name="Node2D" type="Node2D"]
109
script = ExtResource( 1 )
1110

audio/mic_record/default_bus_layout.tres

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
[gd_resource type="AudioBusLayout" load_steps=2 format=2]
22

33
[sub_resource type="AudioEffectRecord" id=1]
4-
54
resource_name = "Record"
65

76
[resource]
8-
97
bus/1/name = "Record"
108
bus/1/solo = false
119
bus/1/mute = true

audio/mic_record/default_env.tres

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
[gd_resource type="Environment" load_steps=2 format=2]
22

33
[sub_resource type="ProceduralSky" id=1]
4-
54
sky_top_color = Color( 0.647059, 0.839216, 0.945098, 1 )
65
sky_horizon_color = Color( 0.839216, 0.917647, 0.980392, 1 )
76
ground_bottom_color = Color( 0.156863, 0.184314, 0.211765, 1 )
87
ground_horizon_color = Color( 0.423529, 0.396078, 0.372549, 1 )
98

109
[resource]
11-
1210
background_mode = 2
1311
background_sky = SubResource( 1 )
1412

gui/drag_and_drop/drag_and_drop.tscn

Lines changed: 11 additions & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -2,273 +2,111 @@
22

33
[ext_resource path="res://drag_drop_script.gd" type="Script" id=1]
44

5-
[node name="Control" type="Control" index="0"]
6-
7-
anchor_left = 0.0
8-
anchor_top = 0.0
5+
[node name="Control" type="Control"]
96
anchor_right = 1.0
107
anchor_bottom = 1.0
11-
rect_pivot_offset = Vector2( 0, 0 )
12-
mouse_filter = 0
13-
mouse_default_cursor_shape = 0
148
size_flags_horizontal = 2
159
size_flags_vertical = 2
1610
__meta__ = {
1711
"__editor_plugin_screen__": "2D"
1812
}
1913

20-
[node name="ColorPickerButton0" type="ColorPickerButton" parent="." index="0"]
21-
22-
anchor_left = 0.0
23-
anchor_top = 0.0
24-
anchor_right = 0.0
25-
anchor_bottom = 0.0
14+
[node name="ColorPickerButton0" type="ColorPickerButton" parent="."]
2615
margin_left = 64.0
2716
margin_top = 64.0
2817
margin_right = 160.0
2918
margin_bottom = 128.0
30-
rect_pivot_offset = Vector2( 0, 0 )
31-
focus_mode = 2
32-
mouse_filter = 0
33-
mouse_default_cursor_shape = 0
3419
size_flags_horizontal = 2
3520
size_flags_vertical = 2
36-
toggle_mode = false
37-
enabled_focus_mode = 2
38-
shortcut = null
39-
group = null
40-
flat = false
41-
align = 1
4221
color = Color( 0.671032, 0.605183, 0, 1 )
43-
edit_alpha = true
4422
script = ExtResource( 1 )
4523

46-
[node name="ColorPickerButton1" type="ColorPickerButton" parent="." index="1"]
47-
48-
anchor_left = 0.0
49-
anchor_top = 0.0
50-
anchor_right = 0.0
51-
anchor_bottom = 0.0
24+
[node name="ColorPickerButton1" type="ColorPickerButton" parent="."]
5225
margin_left = 224.0
5326
margin_top = 64.0
5427
margin_right = 320.0
5528
margin_bottom = 128.0
56-
rect_pivot_offset = Vector2( 0, 0 )
57-
focus_mode = 2
58-
mouse_filter = 0
59-
mouse_default_cursor_shape = 0
6029
size_flags_horizontal = 2
6130
size_flags_vertical = 2
62-
toggle_mode = false
63-
enabled_focus_mode = 2
64-
shortcut = null
65-
group = null
66-
flat = false
67-
align = 1
6831
color = Color( 0, 0.797347, 0.741037, 1 )
69-
edit_alpha = true
7032
script = ExtResource( 1 )
7133

72-
[node name="ColorPickerButton2" type="ColorPickerButton" parent="." index="2"]
73-
74-
anchor_left = 0.0
75-
anchor_top = 0.0
76-
anchor_right = 0.0
77-
anchor_bottom = 0.0
34+
[node name="ColorPickerButton2" type="ColorPickerButton" parent="."]
7835
margin_left = 384.0
7936
margin_top = 64.0
8037
margin_right = 480.0
8138
margin_bottom = 128.0
82-
rect_pivot_offset = Vector2( 0, 0 )
83-
focus_mode = 2
84-
mouse_filter = 0
85-
mouse_default_cursor_shape = 0
8639
size_flags_horizontal = 2
8740
size_flags_vertical = 2
88-
toggle_mode = false
89-
enabled_focus_mode = 2
90-
shortcut = null
91-
group = null
92-
flat = false
93-
align = 1
9441
color = Color( 0.443924, 0, 0.632923, 1 )
95-
edit_alpha = true
9642
script = ExtResource( 1 )
9743

98-
[node name="ColorPickerButton3" type="ColorPickerButton" parent="." index="3"]
99-
100-
anchor_left = 0.0
101-
anchor_top = 0.0
102-
anchor_right = 0.0
103-
anchor_bottom = 0.0
44+
[node name="ColorPickerButton3" type="ColorPickerButton" parent="."]
10445
margin_left = 64.0
10546
margin_top = 160.0
10647
margin_right = 160.0
10748
margin_bottom = 224.0
108-
rect_pivot_offset = Vector2( 0, 0 )
109-
focus_mode = 2
110-
mouse_filter = 0
111-
mouse_default_cursor_shape = 0
11249
size_flags_horizontal = 2
11350
size_flags_vertical = 2
114-
toggle_mode = false
115-
enabled_focus_mode = 2
116-
shortcut = null
117-
group = null
118-
flat = false
119-
align = 1
12051
color = Color( 1, 1, 1, 1 )
121-
edit_alpha = true
12252
script = ExtResource( 1 )
12353

124-
[node name="ColorPickerButton4" type="ColorPickerButton" parent="." index="4"]
125-
126-
anchor_left = 0.0
127-
anchor_top = 0.0
128-
anchor_right = 0.0
129-
anchor_bottom = 0.0
54+
[node name="ColorPickerButton4" type="ColorPickerButton" parent="."]
13055
margin_left = 224.0
13156
margin_top = 160.0
13257
margin_right = 320.0
13358
margin_bottom = 224.0
134-
rect_pivot_offset = Vector2( 0, 0 )
135-
focus_mode = 2
136-
mouse_filter = 0
137-
mouse_default_cursor_shape = 0
13859
size_flags_horizontal = 2
13960
size_flags_vertical = 2
140-
toggle_mode = false
141-
enabled_focus_mode = 2
142-
shortcut = null
143-
group = null
144-
flat = false
145-
align = 1
14661
color = Color( 1, 0.933842, 0, 1 )
147-
edit_alpha = true
14862
script = ExtResource( 1 )
14963

150-
[node name="ColorPickerButton5" type="ColorPickerButton" parent="." index="5"]
151-
152-
anchor_left = 0.0
153-
anchor_top = 0.0
154-
anchor_right = 0.0
155-
anchor_bottom = 0.0
64+
[node name="ColorPickerButton5" type="ColorPickerButton" parent="."]
15665
margin_left = 384.0
15766
margin_top = 160.0
15867
margin_right = 480.0
15968
margin_bottom = 224.0
160-
rect_pivot_offset = Vector2( 0, 0 )
161-
focus_mode = 2
162-
mouse_filter = 0
163-
mouse_default_cursor_shape = 0
16469
size_flags_horizontal = 2
16570
size_flags_vertical = 2
166-
toggle_mode = false
167-
enabled_focus_mode = 2
168-
shortcut = null
169-
group = null
170-
flat = false
171-
align = 1
17271
color = Color( 0.287293, 0.886362, 0.122933, 1 )
173-
edit_alpha = true
17472
script = ExtResource( 1 )
17573

176-
[node name="ColorPickerButton6" type="ColorPickerButton" parent="." index="6"]
177-
178-
anchor_left = 0.0
179-
anchor_top = 0.0
180-
anchor_right = 0.0
181-
anchor_bottom = 0.0
74+
[node name="ColorPickerButton6" type="ColorPickerButton" parent="."]
18275
margin_left = 64.0
18376
margin_top = 256.0
18477
margin_right = 160.0
18578
margin_bottom = 320.0
186-
rect_pivot_offset = Vector2( 0, 0 )
187-
focus_mode = 2
188-
mouse_filter = 0
189-
mouse_default_cursor_shape = 0
19079
size_flags_horizontal = 2
19180
size_flags_vertical = 2
192-
toggle_mode = false
193-
enabled_focus_mode = 2
194-
shortcut = null
195-
group = null
196-
flat = false
197-
align = 1
19881
color = Color( 0.908461, 0, 0.88789, 1 )
199-
edit_alpha = true
20082
script = ExtResource( 1 )
20183

202-
[node name="ColorPickerButton7" type="ColorPickerButton" parent="." index="7"]
203-
204-
anchor_left = 0.0
205-
anchor_top = 0.0
206-
anchor_right = 0.0
207-
anchor_bottom = 0.0
84+
[node name="ColorPickerButton7" type="ColorPickerButton" parent="."]
20885
margin_left = 224.0
20986
margin_top = 256.0
21087
margin_right = 320.0
21188
margin_bottom = 320.0
212-
rect_pivot_offset = Vector2( 0, 0 )
213-
focus_mode = 2
214-
mouse_filter = 0
215-
mouse_default_cursor_shape = 0
21689
size_flags_horizontal = 2
21790
size_flags_vertical = 2
218-
toggle_mode = false
219-
enabled_focus_mode = 2
220-
shortcut = null
221-
group = null
222-
flat = false
223-
align = 1
22491
color = Color( 0, 0.283703, 0, 1 )
225-
edit_alpha = true
22692
script = ExtResource( 1 )
22793

228-
[node name="ColorPickerButton8" type="ColorPickerButton" parent="." index="8"]
229-
230-
anchor_left = 0.0
231-
anchor_top = 0.0
232-
anchor_right = 0.0
233-
anchor_bottom = 0.0
94+
[node name="ColorPickerButton8" type="ColorPickerButton" parent="."]
23495
margin_left = 384.0
23596
margin_top = 256.0
23697
margin_right = 480.0
23798
margin_bottom = 320.0
238-
rect_pivot_offset = Vector2( 0, 0 )
239-
focus_mode = 2
240-
mouse_filter = 0
241-
mouse_default_cursor_shape = 0
24299
size_flags_horizontal = 2
243100
size_flags_vertical = 2
244-
toggle_mode = false
245-
enabled_focus_mode = 2
246-
shortcut = null
247-
group = null
248-
flat = false
249-
align = 1
250101
color = Color( 0, 0, 0.178211, 1 )
251-
edit_alpha = true
252102
script = ExtResource( 1 )
253103

254-
[node name="Label" type="Label" parent="." index="9"]
255-
256-
anchor_left = 0.0
257-
anchor_top = 0.0
258-
anchor_right = 0.0
259-
anchor_bottom = 0.0
104+
[node name="Label" type="Label" parent="."]
260105
margin_left = 10.0
261106
margin_top = 11.0
262107
margin_right = 470.0
263108
margin_bottom = 24.0
264-
rect_pivot_offset = Vector2( 0, 0 )
265-
mouse_filter = 2
266-
mouse_default_cursor_shape = 0
267109
size_flags_horizontal = 2
268110
size_flags_vertical = 0
269111
text = "Drag colors from button to button, or change button colors and drag them again."
270-
percent_visible = 1.0
271-
lines_skipped = 0
272-
max_lines_visible = -1
273-
274112

gui/drag_and_drop/drag_drop_script.gd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
extends ColorPickerButton
33

44

5-
func get_drag_data(pos):
5+
func get_drag_data(_pos):
66
# Use another colorpicker as drag preview
77
var cpb = ColorPickerButton.new()
88
cpb.color = color
@@ -12,9 +12,9 @@ func get_drag_data(pos):
1212
return color
1313

1414

15-
func can_drop_data(pos, data):
15+
func can_drop_data(_pos, data):
1616
return typeof(data) == TYPE_COLOR
1717

1818

19-
func drop_data(pos, data):
20-
color=data
19+
func drop_data(_pos, data):
20+
color = data

gui/drag_and_drop/icon.png.import

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
77
[deps]
88

99
source_file="res://icon.png"
10-
source_md5="9cb7b2d10396f1f208c56fb5126b023d"
11-
1210
dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
13-
dest_md5="3a238454b327f15f0e03ddf32f186730"
1411

1512
[params]
1613

1714
compress/mode=0
1815
compress/lossy_quality=0.7
1916
compress/hdr_mode=0
17+
compress/bptc_ldr=0
2018
compress/normal_map=0
2119
flags/repeat=0
2220
flags/filter=true
@@ -26,6 +24,7 @@ flags/srgb=2
2624
process/fix_alpha_border=true
2725
process/premult_alpha=false
2826
process/HDR_as_SRGB=false
27+
process/invert_color=false
2928
stream=false
3029
size_limit=0
3130
detect_3d=true

gui/drag_and_drop/project.godot

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66
; [section] ; section goes between []
77
; param=value ; assign values to parameters
88

9-
config_version=3
9+
config_version=4
10+
11+
_global_script_classes=[ ]
12+
_global_script_class_icons={
13+
14+
}
1015

1116
[application]
1217

0 commit comments

Comments
 (0)