Commit graph

74 commits

Author SHA1 Message Date
2437814f4b Merge branch 'master' of https://git.etud.insa-toulouse.fr/vergnet/pir-serious-game-ethics 2021-04-25 00:31:17 +02:00
2cbb6d1414 added even more fades 2021-04-25 00:30:26 +02:00
488e3e818e hide exit button on web 2021-04-25 00:09:42 +02:00
c1d28ea050 add fancy scene change fades 2021-04-25 00:07:38 +02:00
002c310025 Half dilemma 3 + new design 2021-04-25 00:03:05 +02:00
7540b9d506 Half dilemma 3 2021-04-24 23:41:12 +02:00
3fb58be4b3 Merge branch 'master' of https://git.etud.insa-toulouse.fr/vergnet/pir-serious-game-ethics 2021-04-24 23:08:13 +02:00
8345359a64 Dilemma 3 started 2021-04-24 23:04:21 +02:00
f1fa580f05 Merge branch 'master' of https://git.etud.insa-toulouse.fr/vergnet/pir-serious-game-ethics 2021-04-24 22:42:34 +02:00
a6738f2ff6 add basic infoboxes 2021-04-24 22:42:12 +02:00
ae8520cddc Dilemma 3 started 2021-04-24 21:16:29 +02:00
b6c0618883 properly compute percentages
This is based on min and max gauge values
2021-04-24 21:13:16 +02:00
7dec78e1ed Merge branch 'dilemma2' 2021-04-24 18:53:15 +02:00
084d44287a Dilemma 2 done 2021-04-24 12:45:56 +02:00
9c335b19d0 Dilemma 2 almost done 2021-04-23 23:40:10 +02:00
1275b624a8 improve end screen 2021-04-23 23:25:32 +02:00
b9c2985632 improve input handling 2021-04-23 16:12:06 +02:00
444a0ec1d5 add background music support 2021-04-23 15:59:32 +02:00
cff154d14c change controls 2021-04-23 14:24:15 +02:00
dae247b1f9 use custom buttons for choices 2021-04-21 16:33:37 +02:00
a79c4ba65b update dialogic 2021-04-21 00:03:44 +02:00
4cc560cb1c add end recap scene 2021-04-21 00:03:07 +02:00
7704070814 change menu background 2021-04-20 23:47:26 +02:00
75471bfd8d update characters 2021-04-20 23:40:32 +02:00
bd7dd9a81f add gauges 2021-04-20 23:36:36 +02:00
c4fa05cfb5 update character images 2021-04-20 20:24:04 +02:00
f9dc4e25ef re-enable saves 2021-04-20 15:49:17 +02:00
767bf24a51 rework first dilemma 2021-04-20 12:37:32 +02:00
a36a9b8a09 improve UI and add credits 2021-04-20 11:36:39 +02:00
Nabzzz
c44096c894 MiniGame restart bug fixed 2021-04-19 19:14:02 +02:00
519475a5ba update dialogic 2021-04-16 16:35:07 +02:00
Nabzzz
a84ceea08d freeing objects when then leave the screen 2021-04-12 11:40:02 +02:00
c1a1e9aadf update dialogic 2021-04-12 10:59:12 +02:00
c47ca10569 fix ui behind game 2021-04-12 10:59:06 +02:00
18a459f2c6 stop foreground on init 2021-04-12 10:52:18 +02:00
91500ed2e8 improve minigame timings 2021-04-12 10:48:46 +02:00
Nabzzz
e894808313 Added missing files for mini-game 2021-04-12 10:41:20 +02:00
42c27a5e5f free timer after use 2021-04-12 10:34:11 +02:00
4a7d0656e5 Merge branch 'master' of https://git.etud.insa-toulouse.fr/vergnet/pir-serious-game-ethics 2021-04-12 10:27:54 +02:00
91fa0160d2 update dialogic 2021-04-12 10:26:50 +02:00
Nabzzz
2434d7371c minigame mode and restart option added 2021-04-11 18:09:08 +02:00
e14eb9eb1d Add main menu logic 2021-04-10 18:29:03 +02:00
83258ccaab add basic main menu 2021-04-09 11:52:05 +02:00
332ad6382d allow pausing with escape 2021-04-09 11:33:19 +02:00
df6a44bc8e improve pause menu behavior 2021-04-09 11:25:11 +02:00
ef5e8268c5 implement pause system 2021-04-09 11:19:10 +02:00
c1ba98a91b remove unused resource 2021-04-09 10:29:16 +02:00
a1cd380a18 Improve UI on larger displays 2021-04-09 10:27:35 +02:00
0ddf1802c4 Improve game on larger displays 2021-04-09 10:27:22 +02:00
1af9952b43 remove tests 2021-04-08 12:17:55 +02:00