# HG changeset patch
# User unc0rr
# Date 1420475060 -10800
# Node ID 8bef4adb905a304c457b9b0f40670e49169a8f1d
# Parent  161b9104b7b3f676179cb15fe966b0868cf9b895# Parent  8060cb5c2fa6f83ed3cf9ba459ac6acedbd6d704
merge

diff -r 161b9104b7b3 -r 8bef4adb905a .travis.yml
--- a/.travis.yml	Mon Jan 05 18:30:43 2015 +0300
+++ b/.travis.yml	Mon Jan 05 19:24:20 2015 +0300
@@ -11,13 +11,13 @@
   # Debug build
   - BUILD_ARGS="-DCMAKE_BUILD_TYPE=Debug"
   # Everything that's optional
+  - BUILD_ARGS="-DBUILD_ENGINE_C=1"
   - BUILD_ARGS="-DNOPNG=1"
   - BUILD_ARGS="-DNOVIDEOREC=1"
   - BUILD_ARGS="-DNOSERVER=1"
   - BUILD_ARGS="-DLUA_SYSTEM=0"
   - BUILD_ARGS="-DPHYSFS_SYSTEM=0"
   - BUILD_ARGS="-DGL2=1"
-  - BUILD_ARGS="-DBUILD_ENGINE_C=1"
 matrix:
   allow_failures:
     # Failures we expect here
@@ -27,10 +27,12 @@
 script: 
   - mkdir build && cd build && cmake $BUILD_ARGS .. && make VERBOSE=1 && make test_verbose
 notifications:
+  email: false
   irc:
     channels:
       - "chat.freenode.net#hedgewars"
     template:
       - "hw-build #%{build_number} (%{commit} by %{author}): %{message}"
       - "See details at %{build_url}"
-  email: false
+    on_success: change
+    on_failure: always
diff -r 161b9104b7b3 -r 8bef4adb905a QTfrontend/res/html/about.html
--- a/QTfrontend/res/html/about.html	Mon Jan 05 18:30:43 2015 +0300
+++ b/QTfrontend/res/html/about.html	Mon Jan 05 19:24:20 2015 +0300
@@ -76,7 +76,7 @@
             French: Antoine Turmel &lt;<a href="mailto:geekshadow@gmail.com">geekshadow@gmail.com</a>&gt;, Clement Woitrain &lt;<a href="mailto:sphrixclement@gmail.com">sphrixclement@gmail.com</a>&gt;, Matisumi<br>
             German: Peter Hüwe &lt;<a href="mailto:PeterHuewe@gmx.de">PeterHuewe@gmx.de</a>&gt;, Mario Liebisch &lt;<a href="mailto:mario.liebisch@gmail.com">mario.liebisch@gmail.com</a>&gt;, Richard Karolyi &lt;<a href="mailto:sheepluva@ercatec.net">sheepluva@ercatec.net</a>&gt;, Wuzzy &lt;<a href="mailto:almikes@aol.com">almikes@aol.com</a>&gt;<br>
             Greek: &lt;<a href="mailto:talos_kriti@yahoo.gr">talos_kriti@yahoo.gr</a>&gt;<br>
-            Italian: Luca Bonora &lt;<a href="mailto:bonora.luca@gmail.com">bonora.luca@gmail.com</a>&gt;, Marco Bresciani &lt;<a href="mailto:m.bresciani@email.it">m.bresciani@email.it</a>&gt;<br>
+            Italian: Luca Bonora &lt;<a href="mailto:bonora.luca@gmail.com">bonora.luca@gmail.com</a>&gt;, Marco Bresciani &lt;<a href="mailto:m.bresciani@email.it">m.bresciani@email.it</a>&gt;, Gianfranco Costamagna &lt;<a href="mailto:costamagnagianfranco@yahoo.it">costamagnagianfranco@yahoo.it</a>&gt;<br>
             Japanese: ADAM Etienne &lt;<a href="mailto:etienne.adam@gmail.com">etienne.adam@gmail.com</a>&gt;, Marco Bresciani &lt;<a href="mailto:m.bresciani@email.it">m.bresciani@email.it</a>&gt;<br>
             Korean: Anthony Bellew &lt;<a href="mailto:anthonyreflected@gmail.com">anthonyreflected@gmail.com</a>&gt;<br>
             Lithuanian: Lukas Urbonas &lt;<a href="mailto:lukasu08@gmail.com">lukasu08@gmail.com</a>&gt;<br>
diff -r 161b9104b7b3 -r 8bef4adb905a cmake_modules/FindLua.cmake
--- a/cmake_modules/FindLua.cmake	Mon Jan 05 18:30:43 2015 +0300
+++ b/cmake_modules/FindLua.cmake	Mon Jan 05 19:24:20 2015 +0300
@@ -17,7 +17,7 @@
 
 find_path(LUA_INCLUDE_DIR lua.h
                           PATHS /usr/include /usr/local/include /usr/pkg/include
-                          PATH_SUFFIXES lua5.1 lua51)
+                          PATH_SUFFIXES lua5.1 lua51 lua-5.1)
 find_library(LUA_LIBRARY NAMES lua51 lua5.1 lua-5.1 lua
                          PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib)
 
diff -r 161b9104b7b3 -r 8bef4adb905a hedgewars/uRender.pas
--- a/hedgewars/uRender.pas	Mon Jan 05 18:30:43 2015 +0300
+++ b/hedgewars/uRender.pas	Mon Jan 05 19:24:20 2015 +0300
@@ -535,11 +535,14 @@
 end;
 
 procedure openglRotatef(RotX, RotY, RotZ: GLfloat; dir: LongInt); inline;
+{ workaround for pascal bug http://bugs.freepascal.org/view.php?id=27222 }
+var tmpdir: LongInt;
 begin
+tmpdir:=dir;
 {$IFDEF GL2}
-    hglRotatef(RotX, RotY, RotZ, dir);
+    hglRotatef(RotX, RotY, RotZ, tmpdir);
 {$ELSE}
-    glRotatef(RotX, RotY, RotZ, dir);
+    glRotatef(RotX, RotY, RotZ, tmpdir);
 {$ENDIF}
 end;