Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25

feat: lvl2 decor
Déco scène 1 (buildings fond)
2025-06-29 12:02:41 +02:00 · 2025-06-29 12:02:37 +02:00 · 2025-06-29 12:01:04 +02:00 · 2025-06-29 11:28:33 +02:00 · 2025-06-29 11:27:45 +02:00 · 2025-06-29 10:41:32 +02:00
130 changed files with 6321 additions and 150 deletions
--- a/assets/Audio/VO_ALL_EVENT_Temps
+++ b/assets/Audio/VO_ALL_EVENT_Temps
--- a/assets/Audio/VO_ALL_EVENT_Temps
+++ b/assets/Audio/VO_ALL_EVENT_Temps
--- a/assets/Audio/VO_ALL_EVENT_Temps
+++ b/assets/Audio/VO_ALL_EVENT_Temps
--- a/assets/Audio/VO_ALL_EVENT_Trop
+++ b/assets/Audio/VO_ALL_EVENT_Trop
--- a/assets/Audio/VO_ALL_EVENT_Trop
+++ b/assets/Audio/VO_ALL_EVENT_Trop
--- a/assets/Audio/VO_ALL_EVENT_Trop
+++ b/assets/Audio/VO_ALL_EVENT_Trop
--- a/assets/Audio/VO_ALL_Interjection_01.ogg
+++ b/assets/Audio/VO_ALL_Interjection_01.ogg
--- a/assets/Audio/VO_ALL_Interjection_02.ogg
+++ b/assets/Audio/VO_ALL_Interjection_02.ogg
--- a/assets/Audio/VO_ALL_Interjection_03.ogg
+++ b/assets/Audio/VO_ALL_Interjection_03.ogg
--- a/assets/Audio/VO_ALL_Interjection_04.ogg
+++ b/assets/Audio/VO_ALL_Interjection_04.ogg
--- a/assets/Audio/VO_ALL_Interjection_05.ogg
+++ b/assets/Audio/VO_ALL_Interjection_05.ogg
--- a/assets/Audio/VO_ALL_Interjection_06.ogg
+++ b/assets/Audio/VO_ALL_Interjection_06.ogg
--- a/assets/Audio/VO_ALL_Interjection_07.ogg
+++ b/assets/Audio/VO_ALL_Interjection_07.ogg
--- a/assets/Audio/VO_ALL_Interjection_08.ogg
+++ b/assets/Audio/VO_ALL_Interjection_08.ogg
--- a/assets/Audio/VO_ALL_Interjection_09.ogg
+++ b/assets/Audio/VO_ALL_Interjection_09.ogg
--- a/assets/Audio/VO_ALL_Interjection_10.ogg
+++ b/assets/Audio/VO_ALL_Interjection_10.ogg
--- a/assets/Audio/VO_ALL_Interjection_11.ogg
+++ b/assets/Audio/VO_ALL_Interjection_11.ogg
--- a/assets/Audio/VO_ALL_Interjection_12.ogg
+++ b/assets/Audio/VO_ALL_Interjection_12.ogg
--- a/assets/Audio/VO_ALL_Interjection_13.ogg
+++ b/assets/Audio/VO_ALL_Interjection_13.ogg
--- a/assets/Audio/VO_ALL_Interjection_14.ogg
+++ b/assets/Audio/VO_ALL_Interjection_14.ogg
--- a/assets/Audio/VO_ALL_Interjection_15.ogg
+++ b/assets/Audio/VO_ALL_Interjection_15.ogg
--- a/assets/Audio/VO_ALL_Interjection_16.ogg
+++ b/assets/Audio/VO_ALL_Interjection_16.ogg
--- a/assets/Audio/VO_ALL_Interjection_17.ogg
+++ b/assets/Audio/VO_ALL_Interjection_17.ogg
--- a/assets/Audio/VO_ALL_Interjection_18.ogg
+++ b/assets/Audio/VO_ALL_Interjection_18.ogg
--- a/assets/Audio/VO_ALL_Interjection_19.ogg
+++ b/assets/Audio/VO_ALL_Interjection_19.ogg
--- a/assets/Audio/VO_LVL1_A_01.ogg
+++ b/assets/Audio/VO_LVL1_A_01.ogg
--- a/assets/Audio/VO_LVL1_A_02.ogg
+++ b/assets/Audio/VO_LVL1_A_02.ogg
--- a/assets/Audio/VO_LVL1_A_03.ogg
+++ b/assets/Audio/VO_LVL1_A_03.ogg
--- a/assets/Audio/VO_LVL1_A_04.ogg
+++ b/assets/Audio/VO_LVL1_A_04.ogg
--- a/assets/Audio/VO_LVL1_A_05.ogg
+++ b/assets/Audio/VO_LVL1_A_05.ogg
--- a/assets/Audio/VO_LVL1_A_06.ogg
+++ b/assets/Audio/VO_LVL1_A_06.ogg
--- a/assets/Audio/VO_LVL1_A_07.ogg
+++ b/assets/Audio/VO_LVL1_A_07.ogg
--- a/assets/Audio/VO_LVL1_A_08.ogg
+++ b/assets/Audio/VO_LVL1_A_08.ogg
--- a/assets/Audio/VO_LVL1_A_09.ogg
+++ b/assets/Audio/VO_LVL1_A_09.ogg
--- a/assets/Audio/VO_LVL1_A_10.ogg
+++ b/assets/Audio/VO_LVL1_A_10.ogg
--- a/assets/Audio/VO_LVL1_A_11.ogg
+++ b/assets/Audio/VO_LVL1_A_11.ogg
--- a/assets/Audio/VO_LVL1_A_12.ogg
+++ b/assets/Audio/VO_LVL1_A_12.ogg
--- a/assets/Audio/VO_LVL1_A_13.ogg
+++ b/assets/Audio/VO_LVL1_A_13.ogg
--- a/assets/Audio/VO_LVL1_B_01.ogg
+++ b/assets/Audio/VO_LVL1_B_01.ogg
--- a/assets/Audio/VO_LVL1_B_02.ogg
+++ b/assets/Audio/VO_LVL1_B_02.ogg
--- a/assets/Audio/VO_LVL1_B_03.ogg
+++ b/assets/Audio/VO_LVL1_B_03.ogg
--- a/assets/Audio/VO_LVL1_B_04.ogg
+++ b/assets/Audio/VO_LVL1_B_04.ogg
--- a/assets/Audio/VO_LVL1_B_05.ogg
+++ b/assets/Audio/VO_LVL1_B_05.ogg
--- a/assets/Audio/VO_LVL1_B_06.ogg
+++ b/assets/Audio/VO_LVL1_B_06.ogg
--- a/assets/Audio/VO_LVL1_B_07.ogg
+++ b/assets/Audio/VO_LVL1_B_07.ogg
--- a/assets/Audio/VO_LVL1_B_08.ogg
+++ b/assets/Audio/VO_LVL1_B_08.ogg
--- a/assets/Audio/VO_LVL1_B_09.ogg
+++ b/assets/Audio/VO_LVL1_B_09.ogg
--- a/assets/Audio/VO_LVL1_B_10.ogg
+++ b/assets/Audio/VO_LVL1_B_10.ogg
--- a/assets/Audio/VO_LVL1_B_11.ogg
+++ b/assets/Audio/VO_LVL1_B_11.ogg
--- a/assets/Audio/VO_LVL1_B_12.ogg
+++ b/assets/Audio/VO_LVL1_B_12.ogg
--- a/assets/Audio/VO_LVL1_B_13.ogg
+++ b/assets/Audio/VO_LVL1_B_13.ogg
--- a/assets/Audio/VO_LVL1_EVENT_Mauvais
+++ b/assets/Audio/VO_LVL1_EVENT_Mauvais
--- a/assets/Audio/VO_LVL1_EVENT_Mauvais
+++ b/assets/Audio/VO_LVL1_EVENT_Mauvais
--- a/assets/Audio/VO_LVL1_EVENT_Mauvais
+++ b/assets/Audio/VO_LVL1_EVENT_Mauvais
--- a/assets/Audio/VO_LVL1_EVENT_Mauvais
+++ b/assets/Audio/VO_LVL1_EVENT_Mauvais
--- a/assets/Audio/VO_LVL2_A_01.ogg
+++ b/assets/Audio/VO_LVL2_A_01.ogg
--- a/assets/Audio/VO_LVL2_A_02.ogg
+++ b/assets/Audio/VO_LVL2_A_02.ogg
--- a/assets/Audio/VO_LVL2_A_03.ogg
+++ b/assets/Audio/VO_LVL2_A_03.ogg
--- a/assets/Audio/VO_LVL2_A_04.ogg
+++ b/assets/Audio/VO_LVL2_A_04.ogg
--- a/assets/Audio/VO_LVL2_A_05.ogg
+++ b/assets/Audio/VO_LVL2_A_05.ogg
--- a/assets/Audio/VO_LVL2_A_06.ogg
+++ b/assets/Audio/VO_LVL2_A_06.ogg
--- a/assets/Audio/VO_LVL2_A_07.ogg
+++ b/assets/Audio/VO_LVL2_A_07.ogg
--- a/assets/Audio/VO_LVL2_A_08.ogg
+++ b/assets/Audio/VO_LVL2_A_08.ogg
--- a/assets/Audio/VO_LVL2_A_09.ogg
+++ b/assets/Audio/VO_LVL2_A_09.ogg
--- a/assets/Audio/VO_LVL2_A_10.ogg
+++ b/assets/Audio/VO_LVL2_A_10.ogg
--- a/assets/Audio/VO_LVL2_A_11.ogg
+++ b/assets/Audio/VO_LVL2_A_11.ogg
--- a/assets/Audio/VO_LVL2_A_12.ogg
+++ b/assets/Audio/VO_LVL2_A_12.ogg
--- a/assets/Audio/VO_LVL2_B_01.ogg
+++ b/assets/Audio/VO_LVL2_B_01.ogg
--- a/assets/Audio/VO_LVL2_B_02.ogg
+++ b/assets/Audio/VO_LVL2_B_02.ogg
--- a/assets/Audio/VO_LVL2_B_03.ogg
+++ b/assets/Audio/VO_LVL2_B_03.ogg
--- a/assets/Audio/VO_LVL2_B_04.ogg
+++ b/assets/Audio/VO_LVL2_B_04.ogg
--- a/assets/Audio/VO_LVL2_B_05.ogg
+++ b/assets/Audio/VO_LVL2_B_05.ogg
--- a/assets/Audio/VO_LVL2_B_06.ogg
+++ b/assets/Audio/VO_LVL2_B_06.ogg
--- a/assets/Audio/VO_LVL2_B_07.ogg
+++ b/assets/Audio/VO_LVL2_B_07.ogg
--- a/assets/Audio/VO_LVL2_B_08.ogg
+++ b/assets/Audio/VO_LVL2_B_08.ogg
--- a/assets/Audio/VO_LVL2_B_09.ogg
+++ b/assets/Audio/VO_LVL2_B_09.ogg
--- a/assets/Audio/VO_LVL2_B_10.ogg
+++ b/assets/Audio/VO_LVL2_B_10.ogg
--- a/assets/Audio/VO_LVL2_B_11.ogg
+++ b/assets/Audio/VO_LVL2_B_11.ogg
--- a/assets/Audio/VO_LVL2_B_12.ogg
+++ b/assets/Audio/VO_LVL2_B_12.ogg
--- a/assets/Audio/VO_LVL3_A_01.ogg
+++ b/assets/Audio/VO_LVL3_A_01.ogg
--- a/assets/Audio/VO_LVL3_A_02.ogg
+++ b/assets/Audio/VO_LVL3_A_02.ogg
--- a/assets/Audio/VO_LVL3_A_03.ogg
+++ b/assets/Audio/VO_LVL3_A_03.ogg
--- a/assets/Audio/VO_LVL3_A_04.ogg
+++ b/assets/Audio/VO_LVL3_A_04.ogg
--- a/assets/Audio/VO_LVL3_A_05.ogg
+++ b/assets/Audio/VO_LVL3_A_05.ogg
--- a/assets/Audio/VO_LVL3_A_06.ogg
+++ b/assets/Audio/VO_LVL3_A_06.ogg
--- a/assets/Audio/VO_LVL3_A_07.ogg
+++ b/assets/Audio/VO_LVL3_A_07.ogg
--- a/assets/Audio/VO_LVL3_A_08.ogg
+++ b/assets/Audio/VO_LVL3_A_08.ogg
--- a/assets/Audio/VO_LVL3_A_09.ogg
+++ b/assets/Audio/VO_LVL3_A_09.ogg
--- a/assets/Audio/VO_LVL3_A_10.ogg
+++ b/assets/Audio/VO_LVL3_A_10.ogg
--- a/assets/Audio/VO_LVL3_B_01.ogg
+++ b/assets/Audio/VO_LVL3_B_01.ogg
--- a/assets/Audio/VO_LVL3_B_02.ogg
+++ b/assets/Audio/VO_LVL3_B_02.ogg
--- a/assets/Audio/VO_LVL3_B_03.ogg
+++ b/assets/Audio/VO_LVL3_B_03.ogg
--- a/assets/Audio/VO_LVL3_B_04.ogg
+++ b/assets/Audio/VO_LVL3_B_04.ogg
--- a/assets/Audio/VO_LVL3_B_05.ogg
+++ b/assets/Audio/VO_LVL3_B_05.ogg
--- a/assets/Audio/VO_LVL3_B_06.ogg
+++ b/assets/Audio/VO_LVL3_B_06.ogg
--- a/assets/Audio/VO_LVL3_B_07.ogg
+++ b/assets/Audio/VO_LVL3_B_07.ogg
--- a/assets/Audio/VO_LVL3_B_08.ogg
+++ b/assets/Audio/VO_LVL3_B_08.ogg
--- a/assets/Audio/VO_LVL3_B_09.ogg
+++ b/assets/Audio/VO_LVL3_B_09.ogg
--- a/assets/Audio/VO_LVL3_B_10.ogg
+++ b/assets/Audio/VO_LVL3_B_10.ogg
--- a/assets/Audio/VO_LVL3_EVENT_Aha
+++ b/assets/Audio/VO_LVL3_EVENT_Aha
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
minimata	9b781ac431	Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25 All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 13s Details Create tag and build when new code gets to main / Export (push) Successful in 2m33s Details	2025-06-29 12:02:41 +02:00
minimata	42fa5edecf	feat: lvl2 decor	2025-06-29 12:02:37 +02:00
Garance	d478f81fc0	Déco scène 1 (buildings fond) Some checks failed Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Has been cancelled Details	2025-06-29 12:01:04 +02:00
Garance	84cf2d3131	Asset mur uni	2025-06-29 11:28:33 +02:00
Garance	12cd9a5232	Déco scène 1	2025-06-29 11:27:45 +02:00
minimata	c12009c6d5	Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25 All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 9s Details Create tag and build when new code gets to main / Export (push) Successful in 2m30s Details	2025-06-29 10:41:32 +02:00
minimata	2eab16feab	feat: tableau	2025-06-29 10:41:26 +02:00
Garance	62afaea51d	trap door import All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Successful in 2m34s Details	2025-06-29 10:33:12 +02:00
Garance	d92d6203cf	Trap door asset All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 9s Details Create tag and build when new code gets to main / Export (push) Successful in 2m28s Details first version	2025-06-29 10:21:28 +02:00
minimata	7d9dfc40a6	Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25 All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Successful in 2m35s Details	2025-06-29 10:05:31 +02:00
minimata	cc93f8dfc4	fix: change floor	2025-06-29 10:05:23 +02:00
Garance	de8079f0da	Merge branch 'main' of http://sgda.game-dev.space/SGDA/EGJ25 All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Successful in 2m32s Details # Conflicts: # assets/garance/EGJ-Green-tiles.png # assets/garance/EGJ-Green-tiles.png.import	2025-06-29 09:54:51 +02:00
Garance	ad040b4940	Green tiles (correct)	2025-06-29 09:49:48 +02:00
minimata	5275d63aa9	feat: lvl 3 skeleton and logic All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Successful in 2m40s Details	2025-06-29 09:40:40 +02:00
minimata	16e0db2f9c	fix: smalle fixes All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 9s Details Create tag and build when new code gets to main / Export (push) Successful in 2m27s Details	2025-06-28 22:37:16 +02:00
minimata	76ee5d19be	feat: audio listener for spatialisation All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 9s Details Create tag and build when new code gets to main / Export (push) Successful in 2m33s Details	2025-06-28 21:50:58 +02:00
minimata	6fdee5f41e	fix: new audio files and fixed a UX issue on intro All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 10s Details Create tag and build when new code gets to main / Export (push) Successful in 2m36s Details	2025-06-28 21:44:47 +02:00