Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-10-06 16:30:39 +0000
committerStijn Buys <ingar@osirion.org>2010-10-06 16:30:39 +0000
commitefc73b23504604023816aad38028ea139d86896a (patch)
tree8a40cb5c401c3fde4a7e868a67ccab961f3fc249 /base
parent7ef31cac7acdc2d3d665120af1e8c1a71785e107 (diff)
added sky02, updated merchant intro
Diffstat (limited to 'base')
-rw-r--r--base/ini/intro.ini8
-rw-r--r--base/textures/sky/sky02_back.pngbin0 -> 208208 bytes
-rw-r--r--base/textures/sky/sky02_down.pngbin0 -> 195135 bytes
-rw-r--r--base/textures/sky/sky02_front.pngbin0 -> 190301 bytes
-rw-r--r--base/textures/sky/sky02_left.pngbin0 -> 213509 bytes
-rw-r--r--base/textures/sky/sky02_right.pngbin0 -> 188220 bytes
-rw-r--r--base/textures/sky/sky02_up.pngbin0 -> 189822 bytes
7 files changed, 4 insertions, 4 deletions
diff --git a/base/ini/intro.ini b/base/ini/intro.ini
index 39b8f71..c02fdc8 100644
--- a/base/ini/intro.ini
+++ b/base/ini/intro.ini
@@ -10,7 +10,7 @@
[intro]
label=merchant
-sky=sky25
+sky=sky02
[convoy]
; [r g b] entity primary color, values in the 0-255 range
@@ -25,9 +25,9 @@ speed=1
; convoy ships
ship=maps/merchant/matrix
ship=maps/merchant/matrix
-ship=maps/merchant/tensor
-ship=maps/merchant/tensor
-ship=maps/merchant/tensor
+ship=maps/merchant/scalar
+ship=maps/merchant/scalar
+ship=maps/merchant/scalar
ship=maps/merchant/vector
ship=maps/merchant/vector
ship=maps/merchant/vector
diff --git a/base/textures/sky/sky02_back.png b/base/textures/sky/sky02_back.png
new file mode 100644
index 0000000..b0e56fc
--- /dev/null
+++ b/base/textures/sky/sky02_back.png
Binary files differ
diff --git a/base/textures/sky/sky02_down.png b/base/textures/sky/sky02_down.png
new file mode 100644
index 0000000..0cf038b
--- /dev/null
+++ b/base/textures/sky/sky02_down.png
Binary files differ
diff --git a/base/textures/sky/sky02_front.png b/base/textures/sky/sky02_front.png
new file mode 100644
index 0000000..1ce80f0
--- /dev/null
+++ b/base/textures/sky/sky02_front.png
Binary files differ
diff --git a/base/textures/sky/sky02_left.png b/base/textures/sky/sky02_left.png
new file mode 100644
index 0000000..0a61d4e
--- /dev/null
+++ b/base/textures/sky/sky02_left.png
Binary files differ
diff --git a/base/textures/sky/sky02_right.png b/base/textures/sky/sky02_right.png
new file mode 100644
index 0000000..c742ad1
--- /dev/null
+++ b/base/textures/sky/sky02_right.png
Binary files differ
diff --git a/base/textures/sky/sky02_up.png b/base/textures/sky/sky02_up.png
new file mode 100644
index 0000000..337e2c9
--- /dev/null
+++ b/base/textures/sky/sky02_up.png
Binary files differ