projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
77a95e5
)
forgot to commit custom shaders ... also some compile values tweaks.
author
kuniuthefrogg <ekuniu@gmail.com>
Tue, 16 Apr 2013 07:15:02 +0000
(09:15 +0200)
committer
kuniuthefrogg <ekuniu@gmail.com>
Tue, 16 Apr 2013 07:15:02 +0000
(09:15 +0200)
20 files changed:
maps/fuse.map.options
patch
|
blob
|
history
textures/map_fuse/ad_xonotic.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/env/fuse_heaven_bk.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/env/fuse_heaven_dn.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/env/fuse_heaven_ft.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/env/fuse_heaven_lf.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/env/fuse_heaven_rt.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/env/fuse_heaven_up.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/fuse_bird.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/fuse_bird_alpha.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/fuse_heaven.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/fuse_scanlines.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/fuse_scanlines_alpha.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/fuse_teleporter_beam.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/fuse_teleporter_numbers_01.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/fuse_teleporter_numbers_01_alpha.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/fuse_teleporter_numbers_02.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/fuse_teleporter_numbers_02_alpha.jpg
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/logo_2_1.png
[new file with mode: 0644]
patch
|
blob
textures/map_fuse/xonotic_board.xcf
[new file with mode: 0644]
patch
|
blob
diff --git
a/maps/fuse.map.options
b/maps/fuse.map.options
index 45eb66508245ecb6c2d9120ec28392b4b58e2b32..7a09725ebdcd0bf31a26f08a5da1eb47ca38248b 100644
(file)
--- a/
maps/fuse.map.options
+++ b/
maps/fuse.map.options
@@
-3,4
+3,4
@@
-vis +
-minimap +
-sRGB
-Version:
1
+Version:
2
diff --git a/textures/map_fuse/ad_xonotic.jpg
b/textures/map_fuse/ad_xonotic.jpg
new file mode 100644
(file)
index 0000000..
3cdee34
Binary files /dev/null and b/textures/map_fuse/ad_xonotic.jpg differ
diff --git a/textures/map_fuse/env/fuse_heaven_bk.jpg
b/textures/map_fuse/env/fuse_heaven_bk.jpg
new file mode 100644
(file)
index 0000000..
272d5bb
Binary files /dev/null and b/textures/map_fuse/env/fuse_heaven_bk.jpg differ
diff --git a/textures/map_fuse/env/fuse_heaven_dn.jpg
b/textures/map_fuse/env/fuse_heaven_dn.jpg
new file mode 100644
(file)
index 0000000..
4f1beac
Binary files /dev/null and b/textures/map_fuse/env/fuse_heaven_dn.jpg differ
diff --git a/textures/map_fuse/env/fuse_heaven_ft.jpg
b/textures/map_fuse/env/fuse_heaven_ft.jpg
new file mode 100644
(file)
index 0000000..
ef523df
Binary files /dev/null and b/textures/map_fuse/env/fuse_heaven_ft.jpg differ
diff --git a/textures/map_fuse/env/fuse_heaven_lf.jpg
b/textures/map_fuse/env/fuse_heaven_lf.jpg
new file mode 100644
(file)
index 0000000..
e08c8b5
Binary files /dev/null and b/textures/map_fuse/env/fuse_heaven_lf.jpg differ
diff --git a/textures/map_fuse/env/fuse_heaven_rt.jpg
b/textures/map_fuse/env/fuse_heaven_rt.jpg
new file mode 100644
(file)
index 0000000..
7f81d7c
Binary files /dev/null and b/textures/map_fuse/env/fuse_heaven_rt.jpg differ
diff --git a/textures/map_fuse/env/fuse_heaven_up.jpg
b/textures/map_fuse/env/fuse_heaven_up.jpg
new file mode 100644
(file)
index 0000000..
9b69524
Binary files /dev/null and b/textures/map_fuse/env/fuse_heaven_up.jpg differ
diff --git a/textures/map_fuse/fuse_bird.jpg
b/textures/map_fuse/fuse_bird.jpg
new file mode 100644
(file)
index 0000000..
df1f18a
Binary files /dev/null and b/textures/map_fuse/fuse_bird.jpg differ
diff --git a/textures/map_fuse/fuse_bird_alpha.jpg
b/textures/map_fuse/fuse_bird_alpha.jpg
new file mode 100644
(file)
index 0000000..
b7b85ee
Binary files /dev/null and b/textures/map_fuse/fuse_bird_alpha.jpg differ
diff --git a/textures/map_fuse/fuse_heaven.jpg
b/textures/map_fuse/fuse_heaven.jpg
new file mode 100644
(file)
index 0000000..
a757660
Binary files /dev/null and b/textures/map_fuse/fuse_heaven.jpg differ
diff --git a/textures/map_fuse/fuse_scanlines.jpg
b/textures/map_fuse/fuse_scanlines.jpg
new file mode 100644
(file)
index 0000000..
0c4d7ff
Binary files /dev/null and b/textures/map_fuse/fuse_scanlines.jpg differ
diff --git a/textures/map_fuse/fuse_scanlines_alpha.jpg
b/textures/map_fuse/fuse_scanlines_alpha.jpg
new file mode 100644
(file)
index 0000000..
0c4d7ff
Binary files /dev/null and b/textures/map_fuse/fuse_scanlines_alpha.jpg differ
diff --git a/textures/map_fuse/fuse_teleporter_beam.jpg
b/textures/map_fuse/fuse_teleporter_beam.jpg
new file mode 100644
(file)
index 0000000..
c707cd1
Binary files /dev/null and b/textures/map_fuse/fuse_teleporter_beam.jpg differ
diff --git a/textures/map_fuse/fuse_teleporter_numbers_01.jpg
b/textures/map_fuse/fuse_teleporter_numbers_01.jpg
new file mode 100644
(file)
index 0000000..
bcc31b7
Binary files /dev/null and b/textures/map_fuse/fuse_teleporter_numbers_01.jpg differ
diff --git a/textures/map_fuse/fuse_teleporter_numbers_01_alpha.jpg
b/textures/map_fuse/fuse_teleporter_numbers_01_alpha.jpg
new file mode 100644
(file)
index 0000000..
bcc31b7
Binary files /dev/null and b/textures/map_fuse/fuse_teleporter_numbers_01_alpha.jpg differ
diff --git a/textures/map_fuse/fuse_teleporter_numbers_02.jpg
b/textures/map_fuse/fuse_teleporter_numbers_02.jpg
new file mode 100644
(file)
index 0000000..
c9803f7
Binary files /dev/null and b/textures/map_fuse/fuse_teleporter_numbers_02.jpg differ
diff --git a/textures/map_fuse/fuse_teleporter_numbers_02_alpha.jpg
b/textures/map_fuse/fuse_teleporter_numbers_02_alpha.jpg
new file mode 100644
(file)
index 0000000..
c9803f7
Binary files /dev/null and b/textures/map_fuse/fuse_teleporter_numbers_02_alpha.jpg differ
diff --git a/textures/map_fuse/logo_2_1.png
b/textures/map_fuse/logo_2_1.png
new file mode 100644
(file)
index 0000000..
ce19f79
Binary files /dev/null and b/textures/map_fuse/logo_2_1.png differ
diff --git a/textures/map_fuse/xonotic_board.xcf
b/textures/map_fuse/xonotic_board.xcf
new file mode 100644
(file)
index 0000000..
01ae67d
Binary files /dev/null and b/textures/map_fuse/xonotic_board.xcf differ