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/old-models/arbre/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/ebike/color.png

LFS

BIN

Binary file not shown.

public/old-models/ebike/model.bin

LFS

BIN

Binary file not shown.

public/old-models/ebike/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/ebike/normal.png

LFS

BIN

Binary file not shown.

public/old-models/ecole/color.png

LFS

BIN

Binary file not shown.

public/old-models/ecole/model.bin

LFS

BIN

Binary file not shown.

public/old-models/ecole/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/ecole/normal.png

LFS

BIN

Binary file not shown.

public/old-models/eolienne/color.png

LFS

BIN

Binary file not shown.

public/old-models/eolienne/model.bin

LFS

BIN

Binary file not shown.

public/old-models/eolienne/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/eolienne/normal.png

LFS

BIN

Binary file not shown.

public/old-models/gant_l/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/gant_l_pad/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/gant_r_pad/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/immeuble1/color.png

LFS

BIN

Binary file not shown.

public/old-models/immeuble1/model.bin

LFS

BIN

Binary file not shown.

public/old-models/immeuble1/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/immeuble1/normal.png

LFS

BIN

Binary file not shown.

public/old-models/lafabrik/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/maison1/color.png

LFS

BIN

Binary file not shown.

public/old-models/maison1/model.bin

LFS

BIN

Binary file not shown.

public/old-models/maison1/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/maison1/normal.png

LFS

BIN

Binary file not shown.

public/old-models/packderelance/color_inf.png

LFS

BIN

Binary file not shown.

public/old-models/packderelance/color_marteau.png

LFS

BIN

Binary file not shown.

public/old-models/packderelance/color_puce.png

LFS

BIN

Binary file not shown.

public/old-models/packderelance/color_sup.png

LFS

BIN

Binary file not shown.

public/old-models/packderelance/model.bin

LFS

BIN

Binary file not shown.

public/old-models/packderelance/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/packderelance/normal_inf.png

LFS

BIN

Binary file not shown.

public/old-models/packderelance/normal_marteau.png

LFS

BIN

Binary file not shown.

public/old-models/packderelance/normal_puce.png

LFS

BIN

Binary file not shown.

public/old-models/packderelance/normal_sup.png

LFS

BIN

Binary file not shown.

public/old-models/panneauaffichage/color.png

LFS

BIN

Binary file not shown.

public/old-models/panneauaffichage/model.bin

LFS

BIN

Binary file not shown.

public/old-models/panneauaffichage/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/panneauaffichage/normal.png

LFS

BIN

Binary file not shown.

public/old-models/pylone/color.png

LFS

BIN

Binary file not shown.

public/old-models/pylone/model.bin

LFS

BIN

Binary file not shown.

public/old-models/pylone/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/pylone/normal.png

LFS

BIN

Binary file not shown.

public/old-models/sapin/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/skybox/model.gltf

LFS

BIN

Binary file not shown.

public/old-models/skybox/skybox.glb

LFS

BIN

Binary file not shown.

public/old-models/skybox/skybox_baseColor.png

LFS

BIN

Binary file not shown.

public/old-models/skybox/skybox_normal.png

LFS

BIN

Binary file not shown.

public/old-models/skybox/skybox_occlusionRoughnessMetallic.png

LFS

BIN

Binary file not shown.