Merge branch 'release-2.0.0' into devel

Secretchronicles · May 28, 2015 · df12249 · df12249
2 parents 8c7ad31 + d05ddf9
commit df12249
Show file tree

Hide file tree

Showing 35 changed files with 12,953 additions and 238 deletions.
diff --git a/drafts/game/quintus/world/pipes/blue_pipe.svg b/drafts/game/quintus/world/pipes/blue_pipe.svg
diff --git a/drafts/game/quintus/world/pipes/blue_pipe_small.svg b/drafts/game/quintus/world/pipes/blue_pipe_small.svg
diff --git a/drafts/game/quintus/world/pipes/grey_pipe.svg b/drafts/game/quintus/world/pipes/grey_pipe.svg
diff --git a/drafts/game/quintus/world/pipes/grey_pipe_small.svg b/drafts/game/quintus/world/pipes/grey_pipe_small.svg
diff --git a/drafts/game/quintus/world/pipes/red_pipe.svg b/drafts/game/quintus/world/pipes/red_pipe.svg
diff --git a/drafts/game/quintus/world/pipes/red_pipe_small.svg b/drafts/game/quintus/world/pipes/red_pipe_small.svg
diff --git a/drafts/game/quintus/world/pipes/red_pipe_small.svg.2015_05_28_11_34_38.0.svg b/drafts/game/quintus/world/pipes/red_pipe_small.svg.2015_05_28_11_34_38.0.svg
diff --git a/drafts/game/quintus/world/pipes/yellow_pipe.svg b/drafts/game/quintus/world/pipes/yellow_pipe.svg
diff --git a/drafts/game/quintus/world/pipes/yellow_pipe_small.svg b/drafts/game/quintus/world/pipes/yellow_pipe_small.svg
diff --git a/tsc/data/levels/lvl_1.tsclvl b/tsc/data/levels/lvl_1.tsclvl
@@ -8,7 +8,7 @@
   <settings>
     <property name="lvl_author" value=""/>
     <property name="lvl_version" value=""/>
-    <property name="lvl_music" value="land/planet_plant.ogg"/>
+    <property name="lvl_music" value="land/jungle_1.ogg"/>
     <property name="lvl_description" value="&#10;"/>
     <property name="lvl_difficulty" value="0"/>
     <property name="lvl_land_type" value="undefined"/>

diff --git a/tsc/data/levels/lvl_1_sub.tsclvl b/tsc/data/levels/lvl_1_sub.tsclvl
@@ -2,8 +2,8 @@
 <level>
   <information>
     <property name="game_version" value="2.0.0"/>
-    <property name="engine_version" value="40"/>
-    <property name="save_time" value="1412246004"/>
+    <property name="engine_version" value="46"/>
+    <property name="save_time" value="1432576059"/>
   </information>
   <settings>
     <property name="lvl_author" value=""/>
@@ -2226,6 +2226,13 @@
     <property name="force_best_item" value="0"/>
     <property name="gold_color" value="yellow"/>
   </box>
+  <sprite>
+    <property name="posx" value="2189"/>
+    <property name="posy" value="-129"/>
+    <property name="uid" value="305"/>
+    <property name="image" value="signs/default_1/1_ending.png"/>
+    <property name="type" value="passive"/>
+  </sprite>
   <script>
 </script>
 </level>
diff --git a/tsc/data/pixmaps/world/objects/pipe/blue_big.png b/tsc/data/pixmaps/world/objects/pipe/blue_big.png
diff --git a/tsc/data/pixmaps/world/objects/pipe/blue_big.settings b/tsc/data/pixmaps/world/objects/pipe/blue_big.settings
@@ -2,4 +2,5 @@ width 16
 height 32
 editor_tags world;pipe
 name Blue_Medium
-author Manuel_Föllmi
+author sydney_and_Quintus
+license CC-BY_4.0
diff --git a/tsc/data/pixmaps/world/objects/pipe/blue_small.png b/tsc/data/pixmaps/world/objects/pipe/blue_small.png
diff --git a/tsc/data/pixmaps/world/objects/pipe/blue_small.settings b/tsc/data/pixmaps/world/objects/pipe/blue_small.settings
@@ -2,4 +2,5 @@ width 16
 height 16
 editor_tags world;pipe
 name Blue_Small
-author Manuel_Föllmi
+author sydney_and_Quintus
+license CC-BY_4.0
diff --git a/tsc/data/pixmaps/world/objects/pipe/green_big.png b/tsc/data/pixmaps/world/objects/pipe/green_big.png
diff --git a/tsc/data/pixmaps/world/objects/pipe/green_big.settings b/tsc/data/pixmaps/world/objects/pipe/green_big.settings
diff --git a/tsc/data/pixmaps/world/objects/pipe/green_small.png b/tsc/data/pixmaps/world/objects/pipe/green_small.png
diff --git a/tsc/data/pixmaps/world/objects/pipe/green_small.settings b/tsc/data/pixmaps/world/objects/pipe/green_small.settings
diff --git a/tsc/data/pixmaps/world/objects/pipe/grey_big.png b/tsc/data/pixmaps/world/objects/pipe/grey_big.png
diff --git a/tsc/data/pixmaps/world/objects/pipe/grey_big.settings b/tsc/data/pixmaps/world/objects/pipe/grey_big.settings
@@ -2,4 +2,5 @@ width 16
 height 32
 editor_tags world;pipe
 name Grey_Medium
-author Manuel_Föllmi
+author sydney_and_Quintus
+license CC-BY_4.0
diff --git a/tsc/data/pixmaps/world/objects/pipe/grey_small.png b/tsc/data/pixmaps/world/objects/pipe/grey_small.png
diff --git a/tsc/data/pixmaps/world/objects/pipe/grey_small.settings b/tsc/data/pixmaps/world/objects/pipe/grey_small.settings
@@ -2,4 +2,5 @@ width 16
 height 16
 editor_tags world;pipe
 name Grey_Small
-author Manuel_Föllmi
+author sydney_and_Quintus
+license CC-BY_4.0
diff --git a/tsc/data/pixmaps/world/objects/pipe/red_big.png b/tsc/data/pixmaps/world/objects/pipe/red_big.png
diff --git a/tsc/data/pixmaps/world/objects/pipe/red_big.settings b/tsc/data/pixmaps/world/objects/pipe/red_big.settings
@@ -0,0 +1,6 @@
+width 16
+height 32
+editor_tags world;pipe
+name Red_Medium
+author sydney_and_Quintus
+license CC-BY_4.0
diff --git a/tsc/data/pixmaps/world/objects/pipe/red_small.png b/tsc/data/pixmaps/world/objects/pipe/red_small.png
diff --git a/tsc/data/pixmaps/world/objects/pipe/red_small.settings b/tsc/data/pixmaps/world/objects/pipe/red_small.settings
@@ -0,0 +1,6 @@
+width 16
+height 16
+editor_tags world;pipe
+name Red_Small
+author sydney_and_Quintus
+license CC-BY_4.0
diff --git a/tsc/data/pixmaps/world/objects/pipe/yellow_big.png b/tsc/data/pixmaps/world/objects/pipe/yellow_big.png
diff --git a/tsc/data/pixmaps/world/objects/pipe/yellow_big.settings b/tsc/data/pixmaps/world/objects/pipe/yellow_big.settings
@@ -2,4 +2,5 @@ width 16
 height 32
 editor_tags world;pipe
 name Yellow_Medium
-author Manuel_Föllmi
+author sydney_and_Quintus
+license CC-BY_4.0
diff --git a/tsc/data/pixmaps/world/objects/pipe/yellow_small.png b/tsc/data/pixmaps/world/objects/pipe/yellow_small.png
diff --git a/tsc/data/pixmaps/world/objects/pipe/yellow_small.settings b/tsc/data/pixmaps/world/objects/pipe/yellow_small.settings
@@ -2,4 +2,5 @@ width 16
 height 16
 editor_tags world;pipe
 name Yellow_Small
-author Manuel_Föllmi
+author sydney_and_Quintus
+license CC-BY_4.0