Commit graph

29 commits

Author SHA1 Message Date
1e956a54d2 Merge pull request 'Game feature complete' (#7) from game into main
Reviewed-on: #7
2024-12-06 02:41:27 +00:00
9ee9ae8cb7 Merge branch 'main' into game 2024-12-06 02:40:26 +00:00
iMax
f8c4481c88 - Feature Complete -> Gray Boxing a faire. 2024-12-06 03:37:26 +01:00
ee692fec27 Actualiser back/src/main.rs 2024-12-06 01:50:00 +00:00
ac20ecc932 Merge pull request 'back_end' (#6) from back_end into main
Reviewed-on: #6
2024-12-06 00:54:17 +00:00
iMax
60a12d9cf9 - Ajout d'un océan.
- Ajout d'un personnage manequin.
--> *Modèle 3D du manequin inclus*
- Ajout d'une représentation des axes x,y,z.
- Ajout d'une entité Marker pour mettre des markers sur le manequin.
- Maj du CSS de GamePage.tsx
2024-12-06 01:51:30 +01:00
e2575b55b6 Actualiser back/Cargo.toml 2024-12-06 00:43:11 +00:00
3688d031b4 Actualiser back/src/main.rs
finito ?
2024-12-06 00:42:10 +00:00
9b91a5acf3 Updated docker-compose.yml 2024-12-06 01:33:19 +01:00
85ab4aba4f Fixed databse init function again 2024-12-06 01:31:27 +01:00
8f8fc0c46e Fixed databse init function 2024-12-06 01:30:34 +01:00
902e96b205 Added database init function 2024-12-06 01:00:02 +01:00
241a783092 Merge pull request 'Merged back_end to main branch' (#5) from back_end into main
Reviewed-on: #5
2024-12-05 23:29:13 +00:00
6461ebc629 Merged back_end and back_end_json 2024-12-06 00:26:12 +01:00
8316a35e9e Added json usage 2024-12-06 00:22:01 +01:00
c3a7d0ee7b Merge pull request 'Actualiser back/src/main.rs' (#4) from back_end into main
Reviewed-on: #4
2024-12-05 23:03:41 +00:00
c3888c61f9 Actualiser back/src/main.rs
added the service bc i forgot oupsie

Signed-off-by: linlkin <ilyass.ajdira@hotmail.com>
2024-12-05 23:02:43 +00:00
9fca283ab1 Merge pull request 'i added db and articles end points' (#1) from back_end into main
Reviewed-on: #1
2024-12-05 22:42:28 +00:00
efe0b6b410 Merge branch 'main' into back_end 2024-12-05 22:42:15 +00:00
669c710f89 Added json usage 2024-12-05 23:38:43 +01:00
57d574d143 i added db and articles end points 2024-12-05 23:19:15 +01:00
iMax
5d156416c9 Recollage au main 2024-12-05 22:15:23 +01:00
iMax
358681da38 Merge branch 'main' into game 2024-12-05 22:12:59 +01:00
iMax
525ce0515c remove vanilla css 2024-12-05 21:46:04 +01:00
iMax
706d491236 - implémentation de threejs.
- Création environnement 3D océan.
2024-12-05 21:42:37 +01:00
iMax
c992014d53 Mise en place du routeur 2024-12-05 19:19:41 +01:00
=
583b14ce0d add lock files to gitignore 2024-12-05 19:18:15 +01:00
iMax
2bd75babff [Front] Structuration des fichiers 2024-12-05 19:10:01 +01:00
RedCrab
e7dbe84ea5 Initial commit 2024-12-05 16:58:13 +00:00