--- 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
--- 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 <<a href="mailto:geekshadow@gmail.com">geekshadow@gmail.com</a>>, Clement Woitrain <<a href="mailto:sphrixclement@gmail.com">sphrixclement@gmail.com</a>>, Matisumi<br>
German: Peter Hüwe <<a href="mailto:PeterHuewe@gmx.de">PeterHuewe@gmx.de</a>>, Mario Liebisch <<a href="mailto:mario.liebisch@gmail.com">mario.liebisch@gmail.com</a>>, Richard Karolyi <<a href="mailto:sheepluva@ercatec.net">sheepluva@ercatec.net</a>>, Wuzzy <<a href="mailto:almikes@aol.com">almikes@aol.com</a>><br>
Greek: <<a href="mailto:talos_kriti@yahoo.gr">talos_kriti@yahoo.gr</a>><br>
- Italian: Luca Bonora <<a href="mailto:bonora.luca@gmail.com">bonora.luca@gmail.com</a>>, Marco Bresciani <<a href="mailto:m.bresciani@email.it">m.bresciani@email.it</a>><br>
+ Italian: Luca Bonora <<a href="mailto:bonora.luca@gmail.com">bonora.luca@gmail.com</a>>, Marco Bresciani <<a href="mailto:m.bresciani@email.it">m.bresciani@email.it</a>>, Gianfranco Costamagna <<a href="mailto:costamagnagianfranco@yahoo.it">costamagnagianfranco@yahoo.it</a>><br>
Japanese: ADAM Etienne <<a href="mailto:etienne.adam@gmail.com">etienne.adam@gmail.com</a>>, Marco Bresciani <<a href="mailto:m.bresciani@email.it">m.bresciani@email.it</a>><br>
Korean: Anthony Bellew <<a href="mailto:anthonyreflected@gmail.com">anthonyreflected@gmail.com</a>><br>
Lithuanian: Lukas Urbonas <<a href="mailto:lukasu08@gmail.com">lukasu08@gmail.com</a>><br>
--- 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)
--- 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;