vergnet/pir-serious-game-ethics
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: vergnet:80fafcbb2f2cdd0d492ab4f87f7e82da823846b3
Branches Tags
vergnet:master
vergnet:Nabil
vergnet:dilemma2
..
compare: vergnet:b766b105e364cb0c2ddd779078daccd1ee1d1cf4
Branches Tags
vergnet:master
vergnet:Nabil
vergnet:dilemma2

No commits in common. "80fafcbb2f2cdd0d492ab4f87f7e82da823846b3" and "b766b105e364cb0c2ddd779078daccd1ee1d1cf4" have entirely different histories.
80fafcbb2f ... b766b105e3

2 changed files with 23 additions and 139 deletions
Show stats Expand all files Collapse all files

159
scenes/Credits.tscn
View file

@ -99,7 +99,7 @@ __meta__ = {
[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer"]
margin_right = 1668.0
margin_bottom = 2822.0
margin_bottom = 1319.0
size_flags_horizontal = 3
[node name="Équipe" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 5 )]
@ -114,7 +114,8 @@ margin_top = 87.0
margin_right = 1668.0
margin_bottom = 201.0
title = "Abir Benazzouz"
subtile = "Designs"
subtile = "Dessins et animations"
link = ""
[node name="Arnaud" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
@ -123,7 +124,8 @@ margin_top = 205.0
margin_right = 1668.0
margin_bottom = 319.0
title = "Arnaud Vergnet"
subtile = "Programmation et interface"
subtile = "Programmation"
link = ""
[node name="Auriane" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
@ -132,7 +134,8 @@ margin_top = 323.0
margin_right = 1668.0
margin_bottom = 437.0
title = "Auriane Lartigue"
subtile = "Designs et scénario"
subtile = "Dessins et scénario"
link = ""
[node name="Clémentine" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
@ -142,6 +145,7 @@ margin_right = 1668.0
margin_bottom = 555.0
title = "Clémentine Bonneau"
subtile = "Scénario"
link = ""
[node name="Élise" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
@ -150,7 +154,8 @@ margin_top = 559.0
margin_right = 1668.0
margin_bottom = 673.0
title = "Élise Barnabé"
subtile = "Scénario et musiques"
subtile = "Scénario"
link = ""
[node name="Morgane" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
@ -160,6 +165,7 @@ margin_right = 1668.0
margin_bottom = 791.0
title = "Morgane Foussats"
subtile = "Scénario"
link = ""
[node name="Nabil" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
@ -168,168 +174,47 @@ margin_top = 795.0
margin_right = 1668.0
margin_bottom = 909.0
title = "Nabil Moukhlis"
subtile = "Programmation et designs"
subtile = "Programmation et dessins"
link = ""
[node name="INSA Toulouse" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 5 )]
[node name="Technologies" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 5 )]
margin_top = 913.0
margin_right = 1668.0
margin_bottom = 996.0
text = "Tuteurs"
align = 1
[node name="Elodie" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 1000.0
margin_right = 1668.0
margin_bottom = 1114.0
title = "Élodie Chantery"
[node name="PE" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 1118.0
margin_right = 1668.0
margin_bottom = 1232.0
title = "Pierre-Emmanuel Hladik"
[node name="Béatrice" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 1236.0
margin_right = 1668.0
margin_bottom = 1350.0
title = "Béatrice Jalenques-Vigouroux"
[node name="Technologies" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 5 )]
margin_top = 1354.0
margin_right = 1668.0
margin_bottom = 1437.0
text = "Technologies"
align = 1
[node name="Godot" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 1441.0
margin_top = 1000.0
margin_right = 1668.0
margin_bottom = 1555.0
title = "Godot v3.3"
margin_bottom = 1114.0
title = "Godot v3.2.3"
subtile = "Moteur de jeu"
link = "https://godotengine.org/"
[node name="Dialogic" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 1559.0
margin_top = 1118.0
margin_right = 1668.0
margin_bottom = 1673.0
margin_bottom = 1232.0
title = "Dialogic v1.1"
subtile = "Plugin de dialogues créé par Emilio Coppola"
subtile = "Plugin de dialogues"
link = "https://github.com/coppolaemilio/dialogic"
[node name="Images" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 5 )]
margin_top = 1677.0
margin_top = 1236.0
margin_right = 1668.0
margin_bottom = 1760.0
margin_bottom = 1319.0
text = "Images"
align = 1
[node name="upklyak" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 1764.0
margin_right = 1668.0
margin_bottom = 1878.0
title = "upklyak"
subtile = "Freepik"
link = "https://freepik.com/upklyak"
[node name="pikisuperstar" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 1882.0
margin_right = 1668.0
margin_bottom = 1996.0
title = "pikisuperstar"
subtile = "Freepik"
link = "https://freepik.com/pikisuperstar"
[node name="freepik" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 2000.0
margin_right = 1668.0
margin_bottom = 2114.0
title = "freepik"
subtile = "Freepik"
link = "https://freepik.com/freepik"
[node name="vectorpocket" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 2118.0
margin_right = 1668.0
margin_bottom = 2232.0
title = "vectorpocket"
subtile = "Freepik"
link = "https://freepik.com/vectorpocket"
[node name="pchvector" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 2236.0
margin_right = 1668.0
margin_bottom = 2350.0
title = "pch.vector"
subtile = "Freepik"
link = "https://freepik.com/pch.vector"
[node name="rawpixelcom" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 2354.0
margin_right = 1668.0
margin_bottom = 2468.0
title = "rawpixel.com"
subtile = "Freepik"
link = "https://freepik.com/rawpixel.com"
[node name="catalyststuff" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 2472.0
margin_right = 1668.0
margin_bottom = 2586.0
title = "catalyststuff"
subtile = "Freepik"
link = "https://freepik.com/catalyststuff"
[node name="terdpongvector" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 2590.0
margin_right = 1668.0
margin_bottom = 2704.0
title = "terdpongvector"
subtile = "Freepik"
link = "https://freepik.com/terdpongvector"
[node name="macrovector" parent="MarginContainer/VBoxContainer/Control/MarginContainer/ScrollContainer/VBoxContainer" instance=ExtResource( 6 )]
anchor_right = 0.0
anchor_bottom = 0.0
margin_top = 2708.0
margin_right = 1668.0
margin_bottom = 2822.0
title = "macrovector"
subtile = "Freepik"
link = "https://freepik.com/macrovector"
[node name="BackButton" parent="MarginContainer/VBoxContainer" instance=ExtResource( 7 )]
margin_left = 0.0
margin_top = 1008.0
margin_right = 1720.0
margin_bottom = 1060.0
text = "Retour"
[connection signal="pressed" from="MarginContainer/VBoxContainer/BackButton" to="." method="_on_BackButton_pressed"]

3
scenes/UI.tscn
View file

@ -42,7 +42,7 @@ margin_right = 1832.0
margin_bottom = 14.0
size_flags_horizontal = 3
size_flags_vertical = 0
text = "Serious Game on Ethics v1 | INSA Toulouse 2021"
text = "Serious Game on Ethics v0.1"
__meta__ = {
"_edit_use_anchors_": false
}
@ -67,5 +67,4 @@ __meta__ = {
}
[node name="PauseMenu" parent="." instance=ExtResource( 2 )]
[connection signal="pressed" from="MarginContainer/HBoxContainer/TextureButton" to="." method="_on_TextureButton_pressed"]