diff options
| author | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-24 19:08:03 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-24 19:08:03 +0100 |
| commit | 7b7d5343c6042ce90ed213e967c34a07875e2e85 (patch) | |
| tree | 0943f8592c6d480a85099750dbbd6b9b045e66eb /map/map_one.cub | |
| parent | Bug fix, 1px bug is back (diff) | |
| parent | oy (diff) | |
| download | 42-cub3d-7b7d5343c6042ce90ed213e967c34a07875e2e85.tar.gz 42-cub3d-7b7d5343c6042ce90ed213e967c34a07875e2e85.tar.bz2 42-cub3d-7b7d5343c6042ce90ed213e967c34a07875e2e85.tar.xz 42-cub3d-7b7d5343c6042ce90ed213e967c34a07875e2e85.tar.zst 42-cub3d-7b7d5343c6042ce90ed213e967c34a07875e2e85.zip | |
Merge branch 'sprites'
Diffstat (limited to '')
| -rw-r--r-- | map/map_one.cub | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/map/map_one.cub b/map/map_one.cub index 22f3bc5..cc4b774 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,10 +1,18 @@ R 1400 900 +<<<<<<< HEAD NO ./media/img/BRIQUASSES.xpm SO ./media/img/BRIQUASSE_3.xpm EA ./media/img/BRIQUASSES_2.xpm WE ./media/img/MURLOL.xpm S ./media/img/MURLOL.xpm +======= +NO ./map/img/BRIQUASSES.xpm +SO ./map/img/BRIQUASSE_3.xpm +EA ./map/img/BRIQUASSES_2.xpm +WE ./map/img/MURLOL.xpm +S ./map/img/pillar.xpm +>>>>>>> sprites C 50,100,200 F 50,190,124 @@ -12,7 +20,11 @@ F 50,190,124 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 +<<<<<<< HEAD 1 S 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 +======= +1 E 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 +>>>>>>> sprites 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 |