Browse Source

minor fixes

Nabzzz 3 years ago
parent
commit
4894a850e0

+ 42
- 0
dialogic/timelines/timeline-1618997085.json View File

1
+{
2
+	"events": [
3
+		{
4
+			"action": "join",
5
+			"character": "character-1616658403.json",
6
+			"mirror": false,
7
+			"portrait": "Jean-Michel_batard",
8
+			"position": {
9
+				"0": true,
10
+				"1": false,
11
+				"2": false,
12
+				"3": false,
13
+				"4": false
14
+			}
15
+		},
16
+		{
17
+			"character": "",
18
+			"portrait": "",
19
+			"text": "Attends je me prépare"
20
+		},
21
+		{
22
+			"emit_signal": "setup_minigame score 1_1_info-cafe 1_1_info-cafe"
23
+		},
24
+		{
25
+			"character": "",
26
+			"portrait": "",
27
+			"text": "Lezzgo"
28
+		},
29
+		{
30
+			"action": "leaveall",
31
+			"character": "[All]"
32
+		},
33
+		{
34
+			"emit_signal": "start_minigame"
35
+		}
36
+	],
37
+	"metadata": {
38
+		"dialogic-version": "1.2",
39
+		"file": "timeline-1618997085.json",
40
+		"name": "test_jeu"
41
+	}
42
+}

+ 1
- 1
dialogic/timelines/timeline-1619343568.json View File

1
 {
1
 {
2
 	"events": [
2
 	"events": [
3
 		{
3
 		{
4
-			"background": ""
4
+			"background": "res://backgrounds/noir.jpg"
5
 		},
5
 		},
6
 		{
6
 		{
7
 			"action": "join",
7
 			"action": "join",

+ 1
- 1
mini-game/scripts/spawner.gd View File

36
 
36
 
37
 func game_over():
37
 func game_over():
38
 	self.get_node("Timer").set_paused(true)
38
 	self.get_node("Timer").set_paused(true)
39
-	last_object.queue_free()
39
+	#last_object.queue_free()
40
 
40
 
41
 
41
 
42
 func start(difficulty, version):
42
 func start(difficulty, version):

+ 1
- 1
scenes/Credits.tscn View File

134
 margin_right = 1668.0
134
 margin_right = 1668.0
135
 margin_bottom = 437.0
135
 margin_bottom = 437.0
136
 title = "Auriane Lartigue"
136
 title = "Auriane Lartigue"
137
-subtile = "Dessins"
137
+subtile = "Dessins et scénario"
138
 link = ""
138
 link = ""
139
 
139
 
140
 [node name="Clémentine" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
140
 [node name="Clémentine" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]

Loading…
Cancel
Save