diff --git a/data/levels/Compositions.xml b/data/levels/Compositions.xml index 7513f12..c7fb5b2 100644 --- a/data/levels/Compositions.xml +++ b/data/levels/Compositions.xml @@ -482,7 +482,7 @@ brazier.obj 0.0 - 0.5 + 0.35 0.0 0.0 0.0 diff --git a/data/levels/Level1.png b/data/levels/Level1.png index e4ec2da..a773401 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 ba766a6..a9b48b7 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 f48c5b2..9f962fd 100644 --- a/data/levels/Level1.xml +++ b/data/levels/Level1.xml @@ -1,3 +1,123 @@ + + 1.0 + 0.0 + 0.0 + 0.0 + false + -6.500000 + 0.0 + 54.500000 + 0 + 231 + 245 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -6.500000 + 0.0 + 26.500000 + 0 + 226 + 245 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -53.500000 + 0.0 + 54.500000 + 0 + 225 + 245 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -53.500000 + 0.0 + 26.500000 + 0 + 141 + 245 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + 1.0 0.0 @@ -27,122 +147,6 @@ - - 1.0 - 0.0 - 0.0 - 0.0 - false - -6.500000 - 0.0 - 54.500000 - 0 - 140 - 81 - - - - 0 - 0 - 0 - - - - - 1.0 - false - 0 - - - 0 - 0 - 0 - - - - - 1.0 - 0.0 - 0.0 - 0.0 - false - -6.500000 - 0.0 - 26.500000 - 0 - 139 - 81 - - - - 0 - 0 - 0 - - - - - 1.0 - false - 0 - - - 0 - 0 - 0 - - - - - 1.0 - 0.0 - 0.0 - 0.0 - false - -53.500000 - 0.0 - 54.500000 - 0 - 138 - 81 - - - - 0 - 0 - 0 - - - - - 1.0 - false - 0 - - - 0 - 0 - 0 - - - - - 1.0 - 0.0 - 0.0 - 0.0 - false - -53.500000 - 0.0 - 26.500000 - 0 - 137 - 81 - - - - 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 0b55d71..8567b8b 100644 --- a/data/levels/Level1Backup.xml +++ b/data/levels/Level1Backup.xml @@ -1,3 +1,153 @@ + + 1.0 + 0.0 + 0.0 + 0.0 + false + -217.500000 + 0.0 + 210.500000 + 0 + 137 + 245 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -6.500000 + 0.0 + 54.500000 + 0 + 231 + 245 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -6.500000 + 0.0 + 26.500000 + 0 + 226 + 245 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -53.500000 + 0.0 + 54.500000 + 0 + 225 + 245 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + -53.500000 + 0.0 + 26.500000 + 0 + 141 + 245 + + - + false + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + 1.0 0.0 @@ -8,124 +158,8 @@ 0.0 216.500000 0 - 141 - 150 - - - - 0 - 0 - 0 - - - - - 1.0 - false - 0 - - - 0 - 0 - 0 - - - - - 1.0 - 0.0 - 0.0 - 0.0 - false - -6.500000 - 0.0 - 54.500000 - 0 - 140 - 81 - - - - 0 - 0 - 0 - - - - - 1.0 - false - 0 - - - 0 - 0 - 0 - - - - - 1.0 - 0.0 - 0.0 - 0.0 - false - -6.500000 - 0.0 - 26.500000 - 0 - 139 - 81 - - - - 0 - 0 - 0 - - - - - 1.0 - false - 0 - - - 0 - 0 - 0 - - - - - 1.0 - 0.0 - 0.0 - 0.0 - false - -53.500000 - 0.0 - 54.500000 - 0 - 138 - 81 - - - - 0 - 0 - 0 - - - - - 1.0 - false - 0 - - - 0 - 0 - 0 - - - - - 1.0 - 0.0 - 0.0 - 0.0 - false - -53.500000 - 0.0 - 26.500000 - 0 - 137 - 81 + 142 + 250 - 0 @@ -866,7 +900,7 @@ 51.5 - - - 0.2 + 0.1 true 0 openSecondDoor1.lua @@ -882,7 +916,7 @@ 51.5 - - - 0.2 + 0.1 false 0 openSecondDoor1.lua @@ -919,7 +953,7 @@ 29.5 - - - 0.2 + 0.1 true 0 openSecondDoor3.lua @@ -935,7 +969,7 @@ 29.5 - - - 0.2 + 0.1 false 0 openSecondDoor3.lua @@ -2596,7 +2630,7 @@ 51.5 - - - 0.2 + 0.1 true 0 openSecondDoor4.lua @@ -2612,7 +2646,7 @@ 51.5 - - - 0.2 + 0.1 false 0 openSecondDoor4.lua @@ -2678,7 +2712,7 @@ 29.5 - - - 0.2 + 0.1 true 0 openSecondDoor2.lua @@ -2694,7 +2728,7 @@ 29.5 - - - 0.2 + 0.1 false 0 openSecondDoor2.lua @@ -3891,7 +3925,7 @@ 67.5 - - - 0.2 + 0.1 true 0 openThirdDoor.lua @@ -3907,7 +3941,7 @@ 67.5 - - - 0.2 + 0.1 false 0 openThirdDoor.lua @@ -6380,7 +6414,7 @@ 159.5 - - - 0.2 + 0.1 true 0 openFirstDoor.lua @@ -6396,7 +6430,7 @@ 159.5 - - - 0.2 + 0.1 false 0 openFirstDoor.lua @@ -6413,7 +6447,7 @@ 0.0 false 17.500000 - 0.0 + 5.0 81.500000 1 94 @@ -8798,7 +8832,7 @@ 0.0 false -81.500000 - 0.0 + 5.0 4.500000 1 8 @@ -10748,7 +10782,7 @@ 0.0 false -172.500000 - 0.0 + 5.0 58.500000 0 178 @@ -11921,18 +11955,51 @@ 105 20 - - + resetPlayer + false 0 - 0 + -100000 0 - - - 1.0 + 100015 false 0 - - + resetPlayer.lua 0 - 0 + 105 + 0 + + + sunStart + false + -216 + 20 + 34 + - + - + 10 + false + 0 + sunStart.lua + 0 + 105 + 0 + + + sunUpdate + false + -216 + 20 + 34 + - + - + 10 + false + 0 + sunUpdate.lua + 0 + 105 0 @@ -12114,12 +12181,14 @@ - skydome.png + skydome.obj + skydomeNew.png + nightskydome.png 0.9 - 100.0 + 200.0 diff --git a/data/levels/heightmapLvl1.xcf b/data/levels/heightmapLvl1.xcf index babe3a1..5cd76d0 100644 Binary files a/data/levels/heightmapLvl1.xcf and b/data/levels/heightmapLvl1.xcf differ diff --git a/data/loadingscreen/computer_key_A.png b/data/loadingscreen/computer_key_A.png new file mode 100644 index 0000000..c489d1c Binary files /dev/null and b/data/loadingscreen/computer_key_A.png differ diff --git a/data/loadingscreen/computer_key_D.png b/data/loadingscreen/computer_key_D.png new file mode 100644 index 0000000..dcf9b43 Binary files /dev/null and b/data/loadingscreen/computer_key_D.png differ diff --git a/data/loadingscreen/computer_key_Esc.png b/data/loadingscreen/computer_key_Esc.png new file mode 100644 index 0000000..06b9584 Binary files /dev/null and b/data/loadingscreen/computer_key_Esc.png differ diff --git a/data/loadingscreen/computer_key_S.png b/data/loadingscreen/computer_key_S.png new file mode 100644 index 0000000..ca8b1e8 Binary files /dev/null and b/data/loadingscreen/computer_key_S.png differ diff --git a/data/loadingscreen/computer_key_W.png b/data/loadingscreen/computer_key_W.png new file mode 100644 index 0000000..68c3b22 Binary files /dev/null and b/data/loadingscreen/computer_key_W.png differ diff --git a/data/loadingscreen/computer_mouse_rounded.png b/data/loadingscreen/computer_mouse_rounded.png new file mode 100644 index 0000000..1ccb841 Binary files /dev/null and b/data/loadingscreen/computer_mouse_rounded.png differ diff --git a/data/loadingscreen/loadingscreen.png b/data/loadingscreen/loadingscreen.png new file mode 100644 index 0000000..4162d66 Binary files /dev/null and b/data/loadingscreen/loadingscreen.png differ diff --git a/data/loadingscreen/loadingscreen.xcf b/data/loadingscreen/loadingscreen.xcf new file mode 100644 index 0000000..7aecf36 Binary files /dev/null and b/data/loadingscreen/loadingscreen.xcf differ diff --git a/data/loadingscreen/loadingscreenContinue.png b/data/loadingscreen/loadingscreenContinue.png new file mode 100644 index 0000000..e8d5e64 Binary files /dev/null and b/data/loadingscreen/loadingscreenContinue.png differ diff --git a/data/loadingscreen/loadingscreenContinue.xcf b/data/loadingscreen/loadingscreenContinue.xcf new file mode 100644 index 0000000..193ffef Binary files /dev/null and b/data/loadingscreen/loadingscreenContinue.xcf differ