Merge branch 'feature/0015_ajout_nouveau_objet' into 'master'

ajout de plein d'objet :) See merge request !10
2017-05-15 09:41:55 +02:00 · 2017-05-15 09:41:55 +02:00 · 14b578f945
commit 14b578f945
parent e84afdfd56 15a7a5b0ff
53 changed files with 0 additions and 0 deletions
--- a/data/kh/kh_construction/038.png
+++ b/data/kh/kh_construction/038.png
--- a/data/kh/kh_construction/FyAccBouteilleB
+++ b/data/kh/kh_construction/FyAccBouteilleB
--- a/data/kh/kh_construction/FyAccBouteilleB.png
+++ b/data/kh/kh_construction/FyAccBouteilleB.png
--- a/data/kh/kh_construction/FyAccGobelet02.png
+++ b/data/kh/kh_construction/FyAccGobelet02.png
--- a/data/kh/kh_construction/agorabasrelief.png
+++ b/data/kh/kh_construction/agorabasrelief.png
--- a/data/kh/kh_construction/autel.png
+++ b/data/kh/kh_construction/autel.png
--- a/data/kh/kh_construction/braziertube.png
+++ b/data/kh/kh_construction/braziertube.png
--- a/data/kh/kh_construction/ca_ship_front1.png
+++ b/data/kh/kh_construction/ca_ship_front1.png
--- a/data/kh/kh_construction/ca_ship_top.png
+++ b/data/kh/kh_construction/ca_ship_top.png
--- a/data/kh/kh_construction/carpet_delta_aaa_d.png
+++ b/data/kh/kh_construction/carpet_delta_aaa_d.png
--- a/data/kh/kh_construction/concrete.tga
+++ b/data/kh/kh_construction/concrete.tga
--- a/data/kh/kh_construction/cooker.shape
+++ b/data/kh/kh_construction/cooker.shape
--- a/data/kh/kh_construction/counterdoor.png
+++ b/data/kh/kh_construction/counterdoor.png
--- a/data/kh/kh_construction/cruche_diffuse.png
+++ b/data/kh/kh_construction/cruche_diffuse.png
--- a/data/kh/kh_construction/delta_chest_closed.shape
+++ b/data/kh/kh_construction/delta_chest_closed.shape
--- a/data/kh/kh_construction/delta_chest_open.shape
+++ b/data/kh/kh_construction/delta_chest_open.shape
--- a/data/kh/kh_construction/delta_closet_001.shape
+++ b/data/kh/kh_construction/delta_closet_001.shape
--- a/data/kh/kh_construction/delta_cupboard.shape
+++ b/data/kh/kh_construction/delta_cupboard.shape
--- a/data/kh/kh_construction/delta_style_carpet.shape
+++ b/data/kh/kh_construction/delta_style_carpet.shape
--- a/data/kh/kh_construction/delta_tent_1.png
+++ b/data/kh/kh_construction/delta_tent_1.png
--- a/data/kh/kh_construction/diffus.tga
+++ b/data/kh/kh_construction/diffus.tga
--- a/data/kh/kh_construction/encyclopedia_book.png
+++ b/data/kh/kh_construction/encyclopedia_book.png
--- a/data/kh/kh_construction/food_table_A.shape
+++ b/data/kh/kh_construction/food_table_A.shape
--- a/data/kh/kh_construction/food_table_B.shape
+++ b/data/kh/kh_construction/food_table_B.shape
--- a/data/kh/kh_construction/fy_acc_tronc.png
+++ b/data/kh/kh_construction/fy_acc_tronc.png
--- a/data/kh/kh_construction/fyacccaissetriangulaire.png
+++ b/data/kh/kh_construction/fyacccaissetriangulaire.png
--- a/data/kh/kh_construction/ge_mission_stele_karavan.png
+++ b/data/kh/kh_construction/ge_mission_stele_karavan.png
--- a/data/kh/kh_construction/green_texture.jpg
+++ b/data/kh/kh_construction/green_texture.jpg
--- a/data/kh/kh_construction/holopod.png
+++ b/data/kh/kh_construction/holopod.png
--- a/data/kh/kh_construction/iron_diffuse.tga
+++ b/data/kh/kh_construction/iron_diffuse.tga
--- a/data/kh/kh_construction/klum_pie.png
+++ b/data/kh/kh_construction/klum_pie.png
--- a/data/kh/kh_construction/lantern_hanging.shape
+++ b/data/kh/kh_construction/lantern_hanging.shape
--- a/data/kh/kh_construction/liftshaftwood2.png
+++ b/data/kh/kh_construction/liftshaftwood2.png
--- a/data/kh/kh_construction/ma_acc_ban_bois.png
+++ b/data/kh/kh_construction/ma_acc_ban_bois.png
--- a/data/kh/kh_construction/metal_01.png
+++ b/data/kh/kh_construction/metal_01.png
--- a/data/kh/kh_construction/metal_link.png
+++ b/data/kh/kh_construction/metal_link.png
--- a/data/kh/kh_construction/metal_pipe_01.png
+++ b/data/kh/kh_construction/metal_pipe_01.png
--- a/data/kh/kh_construction/mossy.tga
+++ b/data/kh/kh_construction/mossy.tga
--- a/data/kh/kh_construction/oven.shape
+++ b/data/kh/kh_construction/oven.shape
--- a/data/kh/kh_construction/pasta.png
+++ b/data/kh/kh_construction/pasta.png
--- a/data/kh/kh_construction/pump.png
+++ b/data/kh/kh_construction/pump.png
--- a/data/kh/kh_construction/pump.shape
+++ b/data/kh/kh_construction/pump.shape
--- a/data/kh/kh_construction/rope.png
+++ b/data/kh/kh_construction/rope.png
--- a/data/kh/kh_construction/stable_001.shape
+++ b/data/kh/kh_construction/stable_001.shape
--- a/data/kh/kh_construction/stones.png
+++ b/data/kh/kh_construction/stones.png
--- a/data/kh/kh_construction/wall_exterior_wood_03.png
+++ b/data/kh/kh_construction/wall_exterior_wood_03.png
--- a/data/kh/kh_construction/wallwood01.png
+++ b/data/kh/kh_construction/wallwood01.png
--- a/data/kh/kh_construction/water_tank.png
+++ b/data/kh/kh_construction/water_tank.png
--- a/data/kh/kh_construction/watertank.shape
+++ b/data/kh/kh_construction/watertank.shape
--- a/data/kh/kh_construction/wooden_fence_A.shape
+++ b/data/kh/kh_construction/wooden_fence_A.shape
--- a/data/kh/kh_construction/wooden_fence_B.shape
+++ b/data/kh/kh_construction/wooden_fence_B.shape
--- a/data/kh/kh_construction/wooden_fence_C.shape
+++ b/data/kh/kh_construction/wooden_fence_C.shape
--- a/data/kh/kh_construction/wooden_hanging.shape
+++ b/data/kh/kh_construction/wooden_hanging.shape