diff --git a/Blenderfiles/torch.blend b/Blenderfiles/torch.blend index f776479..f0eec1f 100644 Binary files a/Blenderfiles/torch.blend and b/Blenderfiles/torch.blend differ diff --git a/data/geometry/torch.obj b/data/geometry/torch.obj index 229a85a..9d62b50 100644 --- a/data/geometry/torch.obj +++ b/data/geometry/torch.obj @@ -1,6 +1,5 @@ -# Blender v2.73 (sub 0) OBJ File: 'torch.blend' +# Blender v2.72 (sub 0) OBJ File: 'torch.blend' # www.blender.org -o Cylinder v 0.000000 0.011815 -0.121572 v 0.023715 0.011815 -0.119227 v 0.046524 0.011815 -0.112303 @@ -324,7 +323,6 @@ vn -0.500000 -0.707100 -0.499900 vn -0.693400 -0.707200 -0.138100 vn -0.138100 -0.707200 0.693400 vn 0.138100 -0.707200 -0.693400 -s 1 f 33/1/1 64/2/2 65/3/3 f 36/1/4 35/2/5 71/3/6 f 37/1/7 36/2/4 73/3/8 diff --git a/data/levels/Compositions.xml b/data/levels/Compositions.xml index a025ec7..882cde3 100644 --- a/data/levels/Compositions.xml +++ b/data/levels/Compositions.xml @@ -81,7 +81,7 @@ - + 81 false @@ -96,6 +96,18 @@ 1.0 0.0 + + 0.0 + 3 + 0.0 + 0.2 + 0.9 + 0 + 10.0 + -0.5 + 1.0 + 1.0 + diff --git a/data/levels/Level1.png b/data/levels/Level1.png index fce5ad8..dd1a0e1 100644 Binary files a/data/levels/Level1.png and b/data/levels/Level1.png differ diff --git a/data/levels/Level1.xcf b/data/levels/Level1.xcf index 973ab8c..290d5fb 100644 Binary files a/data/levels/Level1.xcf and b/data/levels/Level1.xcf differ diff --git a/data/levels/Level1.xml b/data/levels/Level1.xml index 7815d3a..eb8d87c 100644 --- a/data/levels/Level1.xml +++ b/data/levels/Level1.xml @@ -1,3 +1,183 @@ + + 1.0 + 0.0 + 0.0 + 0.0 + false + -86.500000 + 0.0 + 216.500000 + 1 + 113 + 81 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -96.500000 + 0.0 + 216.500000 + 1 + 108 + 81 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -192.500000 + 0.0 + 193.500000 + 1 + 112 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 230.500000 + 0.0 + 171.500000 + 1 + 111 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 188.500000 + 0.0 + 224.500000 + 1 + 110 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 184.500000 + 0.0 + 159.500000 + 1 + 109 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + 1.0 0.0 @@ -508,36 +688,6 @@ - - 1.0 - 0.0 - 0.0 - 0.0 - false - -86.500000 - 0.0 - 216.500000 - 0 - 250 - 80 - - - - false - 0 - 0 - 0 - - - - - 1.0 - false - 0 - - - 0 - 0 - 0 - - - 1.0 0.0 @@ -568,36 +718,6 @@ - - 1.0 - 0.0 - 0.0 - 0.0 - false - -96.500000 - 0.0 - 216.500000 - 0 - 245 - 80 - - - - false - 0 - 0 - 0 - - - - - 1.0 - false - 0 - - - 0 - 0 - 0 - - - 1.0 0.0 diff --git a/data/levels/Level1Backup.xml b/data/levels/Level1Backup.xml index 613ac93..e0ef6dc 100644 --- a/data/levels/Level1Backup.xml +++ b/data/levels/Level1Backup.xml @@ -1,3 +1,1023 @@ + + 1.0 + 0.0 + 0.0 + 0.0 + false + -192.500000 + 0.0 + 193.500000 + 1 + 112 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 230.500000 + 0.0 + 171.500000 + 1 + 111 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 188.500000 + 0.0 + 224.500000 + 1 + 110 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 184.500000 + 0.0 + 159.500000 + 1 + 109 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 142.500000 + 0.0 + 166.500000 + 1 + 107 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 110.500000 + 0.0 + 197.500000 + 1 + 106 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 27.500000 + 0.0 + 92.500000 + 1 + 105 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 26.500000 + 0.0 + 159.500000 + 1 + 104 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 23.500000 + 0.0 + 236.500000 + 1 + 102 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 17.500000 + 0.0 + 39.500000 + 1 + 101 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 17.500000 + 0.0 + 4.500000 + 1 + 100 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 8.500000 + 0.0 + 159.500000 + 1 + 93 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 8.500000 + 0.0 + 92.500000 + 1 + 81 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -18.500000 + 0.0 + 231.500000 + 1 + 43 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -29.500000 + 0.0 + 74.500000 + 1 + 18 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -29.500000 + 0.0 + 39.500000 + 1 + 6 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -29.500000 + 0.0 + 4.500000 + 1 + 5 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -42.500000 + 0.0 + 134.500000 + 1 + 4 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -76.500000 + 0.0 + 74.500000 + 1 + 0 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -76.500000 + 0.0 + 39.500000 + 0 + 255 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -76.500000 + 0.0 + 4.500000 + 0 + 251 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -86.500000 + 0.0 + 216.500000 + 0 + 250 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -95.500000 + 0.0 + 14.500000 + 0 + 249 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -96.500000 + 0.0 + 216.500000 + 0 + 245 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -101.500000 + 0.0 + 108.500000 + 0 + 244 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -101.500000 + 0.0 + 91.500000 + 0 + 243 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -107.500000 + 0.0 + 1.500000 + 0 + 239 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -109.500000 + 0.0 + 167.500000 + 0 + 238 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -150.500000 + 0.0 + 72.500000 + 0 + 237 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -166.500000 + 0.0 + 56.500000 + 0 + 233 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -204.500000 + 0.0 + 31.500000 + 0 + 232 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -226.500000 + 0.0 + 31.500000 + 0 + 140 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -227.500000 + 0.0 + 132.500000 + 0 + 139 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -228.500000 + 0.0 + 99.500000 + 0 + 138 + 80 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + 1.0 0.0 @@ -3882,18 +4902,19 @@ 2 240 - - + resetBox + false 0 - 0 + -100000 0 - - - 1.0 + 100015 false 0 - - + resetBox.lua 0 - 0 + 2 0 @@ -11978,7 +12999,7 @@ 34 - - - 10 + 2 false 0 sunStart.lua @@ -11990,11 +13011,11 @@ sunUpdate false -216 - 20 + 27.5 34 - - - 10 + 12 false 0 sunUpdate.lua @@ -12155,16 +13176,30 @@ 1.0 - - 0.10 - 0.14 - 0.14 + + 0.57 + 0.80 + 0.98 1.0 - + + + + 0.88 + 0.38 + 0.38 + 1.0 + + + + 0.09 + 0.1 + 0.24 + 1.0 + -1.0 - 1.5 + -6 1.0 1.0 1.0 @@ -12174,10 +13209,10 @@ seamlessTerrain.png - 0.1 + 0.14 0.8 0.2 - 3.0 + 1.0 @@ -12187,13 +13222,13 @@ - 15 - skydomeNew.png + 14.5 + waterTexture.png 0.9 - 200.0 + 300.0