diff options
| author | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-17 16:47:59 +0100 |
|---|---|---|
| committer | Rudy Bousset <rbousset@z2r4p3.le-101.fr> | 2020-02-17 16:47:59 +0100 |
| commit | 5c908cdcd9c09ee4e5656ddc62ca1153f630354a (patch) | |
| tree | f9efc3e226ca87904cab92716c65b051b11c304d /map/map_one.cub | |
| parent | Removed "vim" map (diff) | |
| parent | small but important changes (diff) | |
| download | 42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.gz 42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.bz2 42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.xz 42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.tar.zst 42-cub3d-5c908cdcd9c09ee4e5656ddc62ca1153f630354a.zip | |
Merge branch 'tex_fmoen' of gitlab.com into tex_fmoen
Diffstat (limited to '')
| -rw-r--r-- | map/map_one.cub | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/map/map_one.cub b/map/map_one.cub index e4704c7..c3b5bdf 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,10 +1,18 @@ R 1200 800 +<<<<<<< HEAD NO ./path_to_the_north_texture.xpm SO ./path_to_the_south_texture.xpm EA ./path_to_the_east_texture.xpm WE ./path_to_the_west_texture.xpm S ./path_to_the_sprite_texture.xpm +======= +NO ./map/img/crapaud.xpm +SO ./map/img/linus.xpm +EA ./map/img/linuz.xpm +WE ./map/img/segfault2.xpm +S ./map/img/segfot.xpm +>>>>>>> 8a89388d397b50f2c70cef05f8fa6cfa10cc213c C 50,100,200 F 150,150,124 |