diff --git a/.travis.yml b/.travis.yml
index 986336c6..2f52b6be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ compiler:
- clang
env:
- - GCC_VERSION="5"
+ - GCC_VERSION="6"
- GCC_VERSION="native"
- LLVM_VERSION="3.7"
- LLVM_VERSION="native"
@@ -24,7 +24,7 @@ matrix:
- compiler: gcc
env: LLVM_VERSION="native"
- compiler: clang
- env: GCC_VERSION="5"
+ env: GCC_VERSION="6"
- compiler: clang
env: GCC_VERSION="native"
- os: linux
@@ -35,7 +35,9 @@ matrix:
- os: osx
compiler: clang
env: LLVM_VERSION="3.7" # missing compiler by brew
- #allow_failures:
+ allow_failures:
+ - os: linux
+ env: LLVM_VERSION="3.7" # "APT mirror was temporary switched off ..."
# - os: osx
git:
diff --git a/data/glest_game b/data/glest_game
index a1e6be21..c0c270c5 160000
--- a/data/glest_game
+++ b/data/glest_game
@@ -1 +1 @@
-Subproject commit a1e6be21823b1c597129e3c81f4301177c32fba7
+Subproject commit c0c270c5e0ae3c419c9b451abe71d5ab5f29a63e
diff --git a/mk/linux/.gitignore b/mk/linux/.gitignore
index 5fa5b59b..8ed774cf 100644
--- a/mk/linux/.gitignore
+++ b/mk/linux/.gitignore
@@ -6,6 +6,7 @@
core
core.bak
+core.1
/build/
/release/
diff --git a/mk/linux/start_megaglest b/mk/linux/start_megaglest
index 10b56f72..a897d8df 100755
--- a/mk/linux/start_megaglest
+++ b/mk/linux/start_megaglest
@@ -304,7 +304,7 @@ if [ "$OperatingMode" = "--game" ]; then
export VLC_PLUGIN_PATH="${GAMEDIR}/${LIBDIR}/vlc"
fi
fi
- "$GAMEDIR/$EXC_BINARY" $@
+ "$GAMEDIR/$EXC_BINARY" "$@"
ExitStatus="$?"
BinaryToCheck="$EXC_BINARY"
diff --git a/mk/linux/start_megaglest_g3dviewer b/mk/linux/start_megaglest_g3dviewer
index 79c0060a..4845a012 100755
--- a/mk/linux/start_megaglest_g3dviewer
+++ b/mk/linux/start_megaglest_g3dviewer
@@ -17,5 +17,5 @@ if [ -d "$GAMEDIR/$LIBDIR" ]; then
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${GAMEDIR}/${LIBDIR}"
fi
BeginTime="$(date +"%s")"
-"$GAMEDIR/$EXC_BINARY" $@
+"$GAMEDIR/$EXC_BINARY" "$@"
"$GAMEDIR/$BASIC_SCRIPT" --tool-buginfo "$?" "$WARNINGS" "$BeginTime" "$(date +"%s")" "$EXC_BINARY"
diff --git a/mk/linux/start_megaglest_mapeditor b/mk/linux/start_megaglest_mapeditor
index cbef41f5..27427fe5 100755
--- a/mk/linux/start_megaglest_mapeditor
+++ b/mk/linux/start_megaglest_mapeditor
@@ -17,5 +17,5 @@ if [ -d "$GAMEDIR/$LIBDIR" ]; then
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${GAMEDIR}/${LIBDIR}"
fi
BeginTime="$(date +"%s")"
-"$GAMEDIR/$EXC_BINARY" $@
+"$GAMEDIR/$EXC_BINARY" "$@"
"$GAMEDIR/$BASIC_SCRIPT" --tool-buginfo "$?" "$WARNINGS" "$BeginTime" "$(date +"%s")" "$EXC_BINARY"
diff --git a/source/tools/convert_faction_xml2html/convert_faction_xml2html.pl b/source/tools/convert_faction_xml2html/convert_faction_xml2html.pl
index 1d87cb6e..32a4877c 100755
--- a/source/tools/convert_faction_xml2html/convert_faction_xml2html.pl
+++ b/source/tools/convert_faction_xml2html/convert_faction_xml2html.pl
@@ -1158,13 +1158,13 @@ foreach my $faction_path ( @factions ) {
$found = 0;
if ( $relation =~ /Require/i ) {
- $full_tmp = "| $unit_pretty is a $relation for: | ";
+ $full_tmp = " |
| '$unit_pretty' is a $relation for: | ";
}
elsif ( $relation =~ /Command/i ) {
- $full_tmp = " |
| $unit_pretty enables commands: | ";
+ $full_tmp = " |
| '$unit_pretty' enables commands: | ";
}
else {
- $full_tmp = " |
| $unit_pretty is able to $relation: | ";
+ $full_tmp = " |
| '$unit_pretty' is able to $relation: | ";
}
my $last_command="";
@@ -1176,7 +1176,7 @@ foreach my $faction_path ( @factions ) {
if ( $command ) {
$full_tmp .= &format_name($command)." : ".&link_unit($faction, $req_unit)."
\n";
if ( $command ne $last_command ) {
- $req_overview_tmp .= "Enables command ".&format_name($command)." for: ";
+ $req_overview_tmp .= "Enables command '".&format_name($command)."' for: ";
}
$req_overview_tmp .= &link_unit($faction, $req_unit).", ";
$last_command=$command;
@@ -1192,20 +1192,25 @@ foreach my $faction_path ( @factions ) {
if ( $found ) {
print "found enables for $u\n";
$full .= $full_tmp;
- chop $req_overview_tmp;
- chop $req_overview_tmp;
- $req_overview_tmp = " | $req_overview_tmp";
+ # detect unit & command in one cell
+ my $found_unit_command = grep / ";
# print what's needed to build this unit and what is enabled to built by this unit
$found = 0;
- $full_tmp = "| Needed to build $unit_pretty: | ";
+ $full_tmp = " | | Needed to build '$unit_pretty': | ";
foreach my $unit_requirement ( @{$c_unit_requires{"$faction:$unit"}} ) {
my ( $faction, $req_unit ) = split(/:/, $unit_requirement );
my $req_unit_pretty = &format_name( $req_unit );
@@ -2361,7 +2366,7 @@ sub show_attack {
my $target;
- my $full_attack_tmp = " | | Attack Command: $command_pretty".&html_icon_command( $c, 32 )." | \n";
+ my $full_attack_tmp = " | Attack Command: $command_pretty
".&html_icon_command( $c, 32 )." | \n";
my $skill = $attack_skill{ $c };
# attacks have own move_skills (charge)
diff --git a/source/tools/convert_faction_xml2html/media/style.css b/source/tools/convert_faction_xml2html/media/style.css
index 8d2a0844..ec14c8f0 100644
--- a/source/tools/convert_faction_xml2html/media/style.css
+++ b/source/tools/convert_faction_xml2html/media/style.css
@@ -37,6 +37,10 @@ body {
margin: 0 auto;
background: url("wood_panel.jpg") repeat;
}
+img {
+ padding-right: 3px;
+ padding-bottom: 1px;
+}
/* Article (core text of the page) */
#article {
diff --git a/source/tools/convert_faction_xml2html/megapack.ini b/source/tools/convert_faction_xml2html/megapack.ini
index ff6290d1..a1e7c947 100644
--- a/source/tools/convert_faction_xml2html/megapack.ini
+++ b/source/tools/convert_faction_xml2html/megapack.ini
@@ -208,9 +208,9 @@ This page was generated by: VAR_CREATED_BY
| |
