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>2012-10-28 14:34:27 +0000
committerStijn Buys <ingar@osirion.org>2012-10-28 14:34:27 +0000
commit20b94253038d038e0d28c88075ae2b3cedd14b26 (patch)
tree36ca428fc55c0563deed9b5cf2ba777e237abbd7 /base
parent24306f24a859583fbdf6b1858331d25ef1272b0b (diff)
Updated sky01, added sky18 and sky19.
Diffstat (limited to 'base')
-rw-r--r--base/ini/zones/argos.ini16
-rw-r--r--base/ini/zones/gibraltar.ini3
-rw-r--r--base/textures/sky/sky01_back.pngbin1557820 -> 2026947 bytes
-rw-r--r--base/textures/sky/sky01_down.pngbin1477057 -> 1864614 bytes
-rw-r--r--base/textures/sky/sky01_front.pngbin1436416 -> 1800419 bytes
-rw-r--r--base/textures/sky/sky01_left.pngbin1506506 -> 1900946 bytes
-rw-r--r--base/textures/sky/sky01_right.pngbin1425923 -> 1844798 bytes
-rw-r--r--base/textures/sky/sky01_up.pngbin1572259 -> 1956817 bytes
-rw-r--r--base/textures/sky/sky18_back.pngbin0 -> 1120663 bytes
-rw-r--r--base/textures/sky/sky18_down.pngbin0 -> 1249125 bytes
-rw-r--r--base/textures/sky/sky18_front.pngbin0 -> 1533871 bytes
-rw-r--r--base/textures/sky/sky18_left.pngbin0 -> 1502973 bytes
-rw-r--r--base/textures/sky/sky18_right.pngbin0 -> 1266356 bytes
-rw-r--r--base/textures/sky/sky18_up.pngbin0 -> 861463 bytes
-rw-r--r--base/textures/sky/sky19_back.pngbin0 -> 2232849 bytes
-rw-r--r--base/textures/sky/sky19_down.pngbin0 -> 2216819 bytes
-rw-r--r--base/textures/sky/sky19_front.pngbin0 -> 2148209 bytes
-rw-r--r--base/textures/sky/sky19_left.pngbin0 -> 2075561 bytes
-rw-r--r--base/textures/sky/sky19_right.pngbin0 -> 1998794 bytes
-rw-r--r--base/textures/sky/sky19_up.pngbin0 -> 2005035 bytes
20 files changed, 15 insertions, 4 deletions
diff --git a/base/ini/zones/argos.ini b/base/ini/zones/argos.ini
index 0d20727..716c186 100644
--- a/base/ini/zones/argos.ini
+++ b/base/ini/zones/argos.ini
@@ -2,28 +2,38 @@
; argos.ini
; world description for the Morrigan system
;
+
; ------------------------------------------------------------------
; ZONE IDENTIFICATION
-
+;
[zone]
name=Argos system
-;sky=
+sky=sky19
; [x y z] galactic location
location=629 451 0
ambient=0.1 0.1 0.1
-
info=The Argos system.
+; ------------------------------------------------------------------
+; MORRIGAN JUMPGATE
+;
[jumpgate]
label=jumpgate_morrigan
location=-348 740 0
angles=0 290 0
target=morrigan:jumpgate_argos
faction=independent
+
+; ------------------------------------------------------------------
+; HELLAS JUMPGATE
+;
[jumpgate]
label=jumpgate_hellas
location=-952 -180 0
+; ------------------------------------------------------------------
+; GIBRALTAR JUMPPOINT
+;
[jumppoint]
label=jumppoint_gibraltar
location=1080 200 0
diff --git a/base/ini/zones/gibraltar.ini b/base/ini/zones/gibraltar.ini
index 99cc06a..361b0cd 100644
--- a/base/ini/zones/gibraltar.ini
+++ b/base/ini/zones/gibraltar.ini
@@ -5,7 +5,7 @@
[zone]
name=Gibraltar system
-;sky=
+sky=sky18
; [x y z] galactic location
location=584 512 0
ambient=0.1 0.1 0.1
@@ -18,6 +18,7 @@ label=jumppoint_argos
location=-952 -312 0
angles=0 10 0
target=argos:jumppoint_gibraltar
+
[jumpgate]
label=jumpgate_burton
location=-208 720 0
diff --git a/base/textures/sky/sky01_back.png b/base/textures/sky/sky01_back.png
index 62e710f..3a8c512 100644
--- a/base/textures/sky/sky01_back.png
+++ b/base/textures/sky/sky01_back.png
Binary files differ
diff --git a/base/textures/sky/sky01_down.png b/base/textures/sky/sky01_down.png
index 5fa4341..6e468cf 100644
--- a/base/textures/sky/sky01_down.png
+++ b/base/textures/sky/sky01_down.png
Binary files differ
diff --git a/base/textures/sky/sky01_front.png b/base/textures/sky/sky01_front.png
index 350e72e..0a7e42b 100644
--- a/base/textures/sky/sky01_front.png
+++ b/base/textures/sky/sky01_front.png
Binary files differ
diff --git a/base/textures/sky/sky01_left.png b/base/textures/sky/sky01_left.png
index 40abe52..91f1716 100644
--- a/base/textures/sky/sky01_left.png
+++ b/base/textures/sky/sky01_left.png
Binary files differ
diff --git a/base/textures/sky/sky01_right.png b/base/textures/sky/sky01_right.png
index c07c50f..ac68e2a 100644
--- a/base/textures/sky/sky01_right.png
+++ b/base/textures/sky/sky01_right.png
Binary files differ
diff --git a/base/textures/sky/sky01_up.png b/base/textures/sky/sky01_up.png
index c2fcb25..7654fc6 100644
--- a/base/textures/sky/sky01_up.png
+++ b/base/textures/sky/sky01_up.png
Binary files differ
diff --git a/base/textures/sky/sky18_back.png b/base/textures/sky/sky18_back.png
new file mode 100644
index 0000000..b551e83
--- /dev/null
+++ b/base/textures/sky/sky18_back.png
Binary files differ
diff --git a/base/textures/sky/sky18_down.png b/base/textures/sky/sky18_down.png
new file mode 100644
index 0000000..c35d36a
--- /dev/null
+++ b/base/textures/sky/sky18_down.png
Binary files differ
diff --git a/base/textures/sky/sky18_front.png b/base/textures/sky/sky18_front.png
new file mode 100644
index 0000000..6d9ec46
--- /dev/null
+++ b/base/textures/sky/sky18_front.png
Binary files differ
diff --git a/base/textures/sky/sky18_left.png b/base/textures/sky/sky18_left.png
new file mode 100644
index 0000000..09eec8e
--- /dev/null
+++ b/base/textures/sky/sky18_left.png
Binary files differ
diff --git a/base/textures/sky/sky18_right.png b/base/textures/sky/sky18_right.png
new file mode 100644
index 0000000..19f4d6d
--- /dev/null
+++ b/base/textures/sky/sky18_right.png
Binary files differ
diff --git a/base/textures/sky/sky18_up.png b/base/textures/sky/sky18_up.png
new file mode 100644
index 0000000..ce2edbd
--- /dev/null
+++ b/base/textures/sky/sky18_up.png
Binary files differ
diff --git a/base/textures/sky/sky19_back.png b/base/textures/sky/sky19_back.png
new file mode 100644
index 0000000..8d205e3
--- /dev/null
+++ b/base/textures/sky/sky19_back.png
Binary files differ
diff --git a/base/textures/sky/sky19_down.png b/base/textures/sky/sky19_down.png
new file mode 100644
index 0000000..cf9794a
--- /dev/null
+++ b/base/textures/sky/sky19_down.png
Binary files differ
diff --git a/base/textures/sky/sky19_front.png b/base/textures/sky/sky19_front.png
new file mode 100644
index 0000000..89b043e
--- /dev/null
+++ b/base/textures/sky/sky19_front.png
Binary files differ
diff --git a/base/textures/sky/sky19_left.png b/base/textures/sky/sky19_left.png
new file mode 100644
index 0000000..3e0e283
--- /dev/null
+++ b/base/textures/sky/sky19_left.png
Binary files differ
diff --git a/base/textures/sky/sky19_right.png b/base/textures/sky/sky19_right.png
new file mode 100644
index 0000000..a237705
--- /dev/null
+++ b/base/textures/sky/sky19_right.png
Binary files differ
diff --git a/base/textures/sky/sky19_up.png b/base/textures/sky/sky19_up.png
new file mode 100644
index 0000000..651de6b
--- /dev/null
+++ b/base/textures/sky/sky19_up.png
Binary files differ