Merge from dev (Colobot Gold 0.1.0-alpha)

2013-06-24 21:34:07 +02:00 · 2013-06-24 21:34:07 +02:00 · f8e7dedab4
parent 3dd3fe66c6 6cf650d482
commit f8e7dedab4
387 changed files with 278 additions and 20 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,8 @@
+# Ignore CMake files
+CMakeFiles/
+Makefile
+cmake_install.cmake
+levels/CMakeFiles/
+levels/Makefile
+levels/cmake_install.cmake
+levels/levels_i18n/
--- a/icons/angles.png
+++ b/icons/angles.png
--- a/icons/botdr.png
+++ b/icons/botdr.png
--- a/icons/circle.png
+++ b/icons/circle.png
--- a/icons/hexa.png
+++ b/icons/hexa.png
--- a/icons/iconedit.png
+++ b/icons/iconedit.png
--- a/icons/iconhelp.png
+++ b/icons/iconhelp.png
--- a/icons/iconrun.png
+++ b/icons/iconrun.png
--- a/icons/if.png
+++ b/icons/if.png
--- a/icons/message1.png
+++ b/icons/message1.png
--- a/icons/step1.png
+++ b/icons/step1.png
--- a/icons/step2.png
+++ b/icons/step2.png
--- a/icons/teen101.png
+++ b/icons/teen101.png
--- a/icons/teen101a.png
+++ b/icons/teen101a.png
--- a/icons/teen101f.png
+++ b/icons/teen101f.png
--- a/icons/teen101m.png
+++ b/icons/teen101m.png
--- a/icons/teen102.png
+++ b/icons/teen102.png
--- a/icons/teen102f.png
+++ b/icons/teen102f.png
--- a/icons/teen102m.png
+++ b/icons/teen102m.png
--- a/icons/teen103.png
+++ b/icons/teen103.png
--- a/icons/teen103f.png
+++ b/icons/teen103f.png
--- a/icons/teen103m.png
+++ b/icons/teen103m.png
--- a/icons/teen104.png
+++ b/icons/teen104.png
--- a/icons/teen104m.png
+++ b/icons/teen104m.png
--- a/icons/teen105.png
+++ b/icons/teen105.png
--- a/icons/teen105m.png
+++ b/icons/teen105m.png
--- a/icons/teen201.png
+++ b/icons/teen201.png
--- a/icons/teen201m.png
+++ b/icons/teen201m.png
--- a/icons/teen202.png
+++ b/icons/teen202.png
--- a/icons/teen202m.png
+++ b/icons/teen202m.png
--- a/icons/teen203.png
+++ b/icons/teen203.png
--- a/icons/teen203m.png
+++ b/icons/teen203m.png
--- a/icons/teen204.png
+++ b/icons/teen204.png
--- a/icons/teen204m.png
+++ b/icons/teen204m.png
--- a/icons/teen205.png
+++ b/icons/teen205.png
--- a/icons/teen205m.png
+++ b/icons/teen205m.png
--- a/icons/teen206.png
+++ b/icons/teen206.png
--- a/icons/teen206m.png
+++ b/icons/teen206m.png
--- a/icons/teen301.png
+++ b/icons/teen301.png
--- a/icons/teen301m.png
+++ b/icons/teen301m.png
--- a/icons/teen302.png
+++ b/icons/teen302.png
--- a/icons/teen302m.png
+++ b/icons/teen302m.png
--- a/icons/teen303m.png
+++ b/icons/teen303m.png
--- a/icons/teen304m.png
+++ b/icons/teen304m.png
--- a/icons/teen305m.png
+++ b/icons/teen305m.png
--- a/icons/teen401.png
+++ b/icons/teen401.png
--- a/icons/teen401m.png
+++ b/icons/teen401m.png
--- a/icons/teen402.png
+++ b/icons/teen402.png
--- a/icons/teen402m.png
+++ b/icons/teen402m.png
--- a/icons/teen403.png
+++ b/icons/teen403.png
--- a/icons/teen403m.png
+++ b/icons/teen403m.png
--- a/icons/teen404.png
+++ b/icons/teen404.png
--- a/icons/teen404m.png
+++ b/icons/teen404m.png
--- a/icons/teen405.png
+++ b/icons/teen405.png
--- a/icons/teen405m.png
+++ b/icons/teen405m.png
--- a/icons/teen406.png
+++ b/icons/teen406.png
--- a/icons/teen406m.png
+++ b/icons/teen406m.png
--- a/icons/teen407.png
+++ b/icons/teen407.png
--- a/icons/teen407m.png
+++ b/icons/teen407m.png
--- a/icons/teen501.png
+++ b/icons/teen501.png
--- a/icons/teen501m.png
+++ b/icons/teen501m.png
--- a/icons/teen502.png
+++ b/icons/teen502.png
--- a/icons/teen502m.png
+++ b/icons/teen502m.png
--- a/icons/teen503m.png
+++ b/icons/teen503m.png
--- a/icons/teen504m.png
+++ b/icons/teen504m.png
--- a/icons/teen505m.png
+++ b/icons/teen505m.png
--- a/icons/teen506m.png
+++ b/icons/teen506m.png
--- a/icons/teen601.png
+++ b/icons/teen601.png
--- a/icons/teen601m.png
+++ b/icons/teen601m.png
--- a/icons/teen602.png
+++ b/icons/teen602.png
--- a/icons/teen602m.png
+++ b/icons/teen602m.png
--- a/icons/teen603.png
+++ b/icons/teen603.png
--- a/icons/teen603m.png
+++ b/icons/teen603m.png
--- a/icons/teen604.png
+++ b/icons/teen604.png
--- a/icons/teen604m.png
+++ b/icons/teen604m.png
--- a/icons/teen605.png
+++ b/icons/teen605.png
--- a/icons/teen605m.png
+++ b/icons/teen605m.png
--- a/icons/teen606.png
+++ b/icons/teen606.png
--- a/icons/teen606m.png
+++ b/icons/teen606m.png
--- a/icons/teen607.png
+++ b/icons/teen607.png
--- a/icons/teen607m.png
+++ b/icons/teen607m.png
--- a/icons/teen607x.png
+++ b/icons/teen607x.png
--- a/icons/teen608m.png
+++ b/icons/teen608m.png
--- a/icons/teen609m.png
+++ b/icons/teen609m.png
--- a/icons/teen701.png
+++ b/icons/teen701.png
--- a/icons/teen701m.png
+++ b/icons/teen701m.png
--- a/icons/teen702m.png
+++ b/icons/teen702m.png
--- a/icons/teen703m.png
+++ b/icons/teen703m.png
--- a/icons/teen704m.png
+++ b/icons/teen704m.png
--- a/icons/teen705.png
+++ b/icons/teen705.png
--- a/icons/teen705m.png
+++ b/icons/teen705m.png
--- a/icons/teen801.png
+++ b/icons/teen801.png
--- a/icons/teen801m.png
+++ b/icons/teen801m.png
--- a/icons/teen802.png
+++ b/icons/teen802.png
--- a/icons/teen802m.png
+++ b/icons/teen802m.png
--- a/icons/teen803.png
+++ b/icons/teen803.png
--- a/icons/teen803m.png
+++ b/icons/teen803m.png
--- a/icons/teen804m.png
+++ b/icons/teen804m.png
--- a/icons/teen901.png
+++ b/icons/teen901.png
--- a/icons/teen901m.png
+++ b/icons/teen901m.png
--- a/Show More
+++ b/Show More