merge develop into feat/galerie - resolve model and code conflicts

Browse Source

...

This commit is contained in:

Tom Boullay

2026-05-29 02:25:46 +02:00

parent 47e50d9318 c7df58099a

commit ade301389e

940 changed files with 92419 additions and 37567 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

public/assets/PDF/Gilbert Le Fermier - Doublage Altera.pdf

BIN

Binary file not shown.

public/assets/PDF/Le Gérant - Doublage Altera.pdf

BIN

Binary file not shown.

public/assets/PDF/Leonie Electricienne - Doublage Altera.pdf

BIN

Binary file not shown.

public/assets/cinematics/outro.mp4

LFS

BIN

Binary file not shown.

public/assets/gps/map_background.png

LFS

BIN

Binary file not shown.

public/map.json

+40549 -35030

File diff suppressed because it is too large Load Diff

public/map_raw.json

+35051

File diff suppressed because it is too large Load Diff

public/models/arbre-animated/arbre2.bin

LFS

BIN

Binary file not shown.

public/models/arbre-animated/feuilles_baseColor.png

LFS

BIN

Binary file not shown.

public/models/arbre-animated/feuilles_normal.png

LFS

BIN

Binary file not shown.

public/models/arbre-animated/feuilles_occlusionRoughnessMetallic.png

LFS

BIN

Binary file not shown.

public/models/arbre-animated/model.gltf

LFS

BIN

Binary file not shown.

public/models/arbre-animated/tronc_baseColor.png

LFS

BIN

Binary file not shown.

public/models/arbre-animated/tronc_normal.png

LFS

BIN

Binary file not shown.

public/models/arbre-animated/tronc_occlusionRoughnessMetallic.png

LFS

BIN

Binary file not shown.

public/models/arbre/arbre.bin

LFS

BIN

Binary file not shown.

public/models/arbre/arbre.glb

LFS

BIN

Binary file not shown.

public/models/arbre/feuilles_baseColor.png

LFS

BIN

Binary file not shown.

public/models/arbre/feuilles_normal.png

LFS

BIN

Binary file not shown.

public/models/arbre/feuilles_occlusionRoughnessMetallic.png

LFS

BIN

Binary file not shown.

public/models/arbre/model.gltf

LFS

BIN

Binary file not shown.

public/models/arbre/tronc_baseColor.png

LFS

BIN

Binary file not shown.

public/models/arbre/tronc_normal.png

LFS

BIN

Binary file not shown.

public/models/arbre/tronc_occlusionRoughnessMetallic.png

LFS

BIN

Binary file not shown.

public/models/blocking/model.gltf

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/boite_Base_color.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/boite_Height.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/boite_Metallic.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/boite_Mixed_AO.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/boite_Normal.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/boite_Normal_OpenGL.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/boite_Roughness.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/model.gltf

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/notif_Base_color.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/notif_Height.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/notif_Metallic.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/notif_Mixed_AO.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/notif_Normal.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/notif_Normal_OpenGL.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/notif_Roughness.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/pied_Base_color.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/pied_Height.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/pied_Metallic.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/pied_Mixed_AO.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/pied_Normal.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/pied_Normal_OpenGL.png

LFS

BIN

Binary file not shown.

public/models/boiteauxlettres/pied_Roughness.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/boite_Base_color.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/boite_Height.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/boite_Metallic.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/boite_Mixed_AO.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/boite_Normal.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/boite_Normal_OpenGL.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/boite_Roughness.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/model.gltf

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/pied_Base_color.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/pied_Height.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/pied_Metallic.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/pied_Mixed_AO.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/pied_Normal.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/pied_Normal_OpenGL.png

LFS

BIN

Binary file not shown.

public/models/boiteimmeuble/pied_Roughness.png

LFS

BIN

Binary file not shown.

public/models/buisson-animated/buisson.bin

LFS

BIN

Binary file not shown.

public/models/buisson-animated/buisson.glb

LFS

BIN

Binary file not shown.

public/models/buisson-animated/buisson.spp

BIN

Binary file not shown.

public/models/buisson-animated/feuilles_baseColor.png

LFS

BIN

Binary file not shown.

public/models/buisson-animated/feuilles_normal.png

LFS

BIN

Binary file not shown.

public/models/buisson-animated/feuilles_occlusionRoughnessMetallic.png

LFS

BIN

Binary file not shown.

public/models/buisson-animated/model.gltf

LFS

BIN

Binary file not shown.

public/models/buisson/buisson.bin

LFS

BIN

Binary file not shown.

public/models/buisson/feuilles_baseColor.png

LFS

BIN

Binary file not shown.

public/models/buisson/feuilles_normal.png

LFS

BIN

Binary file not shown.

public/models/buisson/feuilles_occlusionRoughnessMetallic.png

LFS

BIN

Binary file not shown.

public/models/buisson/model.gltf

LFS

BIN

Binary file not shown.

public/models/cable1/cabledroit_Base_color.png

LFS

BIN

Binary file not shown.

public/models/cable1/cabledroit_Height.png

LFS

BIN

Binary file not shown.

public/models/cable1/cabledroit_Metallic.png

LFS

BIN

Binary file not shown.

public/models/cable1/cabledroit_Mixed_AO.png

LFS

BIN

Binary file not shown.

public/models/cable1/cabledroit_Normal.png

LFS

BIN

Binary file not shown.

public/models/cable1/cabledroit_Normal_OpenGL.png

LFS

BIN

Binary file not shown.

public/models/cable1/cabledroit_Roughness.png

LFS

BIN

Binary file not shown.

public/models/cable1/model.gltf

LFS

BIN

Binary file not shown.

public/models/cable2/cablegauche_Base_color.png

LFS

BIN

Binary file not shown.

public/models/cable2/cablegauche_Height.png

LFS

BIN

Binary file not shown.

public/models/cable2/cablegauche_Metallic.png

LFS

BIN

Binary file not shown.

public/models/cable2/cablegauche_Mixed_AO.png

LFS

BIN

Binary file not shown.

public/models/cable2/cablegauche_Normal.png

LFS

BIN

Binary file not shown.

public/models/cable2/cablegauche_Normal_OpenGL.png

LFS

BIN

Binary file not shown.

public/models/cable2/cablegauche_Roughness.png

LFS

BIN

Binary file not shown.

public/models/cable2/model.gltf

LFS

BIN

Binary file not shown.

public/models/champdeble-animated/champdeble.bin

LFS

BIN

Binary file not shown.

public/models/champdeble-animated/grain_baseColor.png

LFS

BIN

Binary file not shown.

public/models/champdeble-animated/grain_normal.png

LFS

BIN

Binary file not shown.

public/models/champdeble-animated/grain_occlusionRoughnessMetallic.png

LFS

BIN

Binary file not shown.

public/models/champdeble-animated/model.gltf

LFS

BIN

Binary file not shown.

public/models/champdeble-animated/tige_baseColor.png

LFS

BIN

Binary file not shown.

public/models/champdeble-animated/tige_normal.png

LFS

BIN

Binary file not shown.

public/models/champdeble-animated/tige_occlusionRoughnessMetallic.png

LFS

BIN

Binary file not shown.

public/models/champdeble/champdeble.bin

LFS

BIN

Binary file not shown.

public/models/champdeble/grain_baseColor.png

LFS

BIN

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More