[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797792-shading-language-version-comparison into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1797792-shading-language-version-comparison
into lp:widelands.
Commit message:
Fix shading language version detection for system locales that don't use . as a
decimal separator
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1797792-shading-language-version-comparison/+merge/356699
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1797792-shading-language-version-comparison
into lp:widelands.
=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc 2018-10-15 05:26:10 +
+++ src/graphic/gl/initialize.cc 2018-10-15 06:50:28 +
@@ -23,6 +23,7 @@
#include
#include
+#include
#include "base/macros.h"
#include "graphic/gl/utils.h"
@@ -178,11 +179,26 @@
glGetIntegerv(GL_MAX_TEXTURE_SIZE, max_texture_size);
log("Graphics: OpenGL: Max texture size: %u\n", *max_texture_size);
- // TODO(GunChleoc): Localize the on-screen error messages
- // Exit if we can't detect the shading language version
const char* const shading_language_version_string =
reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION));
- if (strcmp(shading_language_version_string, "(null)") == 0) {
+ log("Graphics: OpenGL: ShadingLanguage: \"%s\"\n", shading_language_version_string);
+
+ std::vector shading_language_version_vector;
+ boost::split(shading_language_version_vector, shading_language_version_string, boost::is_any_of("."));
+ if (shading_language_version_vector.size() >= 2) {
+ // The shading language version has been detected properly. Exit if the shading language version is too old.
+ const int major_shading_language_version = atoi(shading_language_version_vector.front().c_str());
+ const int minor_shading_language_version = atoi(shading_language_version_vector.at(1).c_str());
+ if (major_shading_language_version < 1 || (major_shading_language_version == 1 && minor_shading_language_version < 20)) {
+ log("ERROR: Shading language version is too old!\n");
+ SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",
+ "Widelands won’t work because your graphics driver is too old.\nThe "
+ "Shading language needs to be version 1.20 or newer.",
+ NULL);
+ exit(1);
+ }
+ } else {
+ // Exit because we couldn't detect the shading language version, so there must be a problem communicating with the graphics adapter.
log("ERROR: Unable to detect the shading language version!\n");
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",
"Widelands won't work because we were unable to detect the shading "
@@ -192,23 +208,6 @@
exit(1);
}
- log("Graphics: OpenGL: ShadingLanguage: \"%s\"", shading_language_version_string);
-
- // Exit if the shading language version is too old
- /* NOCOM(GunChleoc): Commenting this out as a hotfix for https://bugs.launchpad.net/widelands/+bug/1797792
- const double shading_language_version = atof(shading_language_version_string);
- log(" (%.2f)\n", shading_language_version);
-
- if (shading_language_version < 1.20) {
- log("ERROR: Shading language version is too old!\n");
- SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",
- "Widelands won’t work because your graphics driver is too old.\nThe "
- "Shading language needs to be version 1.20 or newer.",
- NULL);
- exit(1);
- }
- */
-
glDrawBuffer(GL_BACK);
glDisable(GL_DEPTH_TEST);
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15543429] i386 build of widelands 1:19-ppa0-bzr8888-201810150529~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr-201810150529~ubuntu18.10.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 39 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15543429/+files/buildlog_ubuntu-cosmic-i386.widelands_1%3A19-ppa0-bzr-201810150529~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-028 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:19-ppa0-bzr-201810150529~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15543429 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15543428] amd64 build of widelands 1:19-ppa0-bzr8888-201810150529~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr-201810150529~ubuntu18.10.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 27 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15543428/+files/buildlog_ubuntu-cosmic-amd64.widelands_1%3A19-ppa0-bzr-201810150529~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-060 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:19-ppa0-bzr-201810150529~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15543428 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797531-playermenu-tribe into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1797531-playermenu-tribe into lp:widelands. Commit message: Fix initialization of last player dropdown in editor player menu Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1797531-playermenu-tribe/+merge/356695 Player number start with 1, not with 0... -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1797531-playermenu-tribe into lp:widelands. === modified file 'src/editor/ui_menus/player_menu.cc' --- src/editor/ui_menus/player_menu.cc 2018-08-28 18:27:59 + +++ src/editor/ui_menus/player_menu.cc 2018-10-15 05:06:59 + @@ -184,7 +184,7 @@ } plr_tribe->select( - (p < map.get_nrplayers() && Widelands::tribe_exists(map.get_scenario_player_tribe(p))) ? + (p <= map.get_nrplayers() && Widelands::tribe_exists(map.get_scenario_player_tribe(p))) ? map.get_scenario_player_tribe(p) : ""); plr_tribe->selected.connect( ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cmakepolicy into lp:widelands
I was wrong about the library. Still no clue as to why it does not compile on 18.10 -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cmakepolicy into lp:widelands
It is using the wrong libraries... libGL.so: error adding symbols: DSO missing from command line That's the legacy library. Maybe we need to point to he correct library like so: -lGL /usr/lib/x86_64-linux-gnu/libOpenGL.so -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15542664] amd64 build of widelands 1:19-ppa0-bzr8886-201810141941~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8886-201810141941~ubuntu18.10.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 1 hour * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542664/+files/buildlog_ubuntu-cosmic-amd64.widelands_1%3A19-ppa0-bzr8886-201810141941~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-035 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:19-ppa0-bzr8886-201810141941~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542664 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15542665] i386 build of widelands 1:19-ppa0-bzr8886-201810141941~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8886-201810141941~ubuntu18.10.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 28 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542665/+files/buildlog_ubuntu-cosmic-i386.widelands_1%3A19-ppa0-bzr8886-201810141941~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-034 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:19-ppa0-bzr8886-201810141941~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542665 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15542479] i386 build of widelands 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 6 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542479/+files/buildlog_ubuntu-cosmic-i386.widelands_1%3A19-ppa0-bzr8885-201810141806~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-amd64-023 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542479 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15542478] amd64 build of widelands 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 4 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542478/+files/buildlog_ubuntu-cosmic-amd64.widelands_1%3A19-ppa0-bzr8885-201810141806~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-037 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542478 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1759857-territorial-lord into lp:widelands
Review: Needs Fixing testing
I wasn't able to reproduce the reported bug but it didn't crashed in my tests
either. However, the final lost/won message is broken, since the land ownership
is reported as:
Player 1 had 179000% of the land (3580 of 2).
Unfortunately I wasn't able to spot the error. It seems as if the local
variable fields changes its value but I have no idea how that should happen.
Apart from that, it worked without problems and the earlier status messages
were correct as well.
I also looked roughly through the code and haven't noticed any obvious
mistakes, but that doesn't mean much.
Diff comments:
> === added file 'data/scripting/win_conditions/territorial_functions.lua'
> --- data/scripting/win_conditions/territorial_functions.lua 1970-01-01
> 00:00:00 +
> +++ data/scripting/win_conditions/territorial_functions.lua 2018-09-29
> 05:16:29 +
> @@ -0,0 +1,296 @@
> +-- RST
> +-- territorial_functions.lua
> +-- ---
> +--
> +-- This file contains common code for the "Territorial Lord" and
> "Territorial Time" win conditions.
> +
> +set_textdomain("win_conditions")
> +
> +include "scripting/richtext.lua"
> +include "scripting/win_conditions/win_condition_texts.lua"
> +
> +local team_str = _"Team %i"
> +local wc_has_territory = _"%1$s has %2$3.0f%% of the land (%3$i of %4$i)."
> +local wc_had_territory = _"%1$s had %2$3.0f%% of the land (%3$i of %4$i)."
I don't really like the leading space in front of the percentage. Since the
player names most likely have different lengths anyway, the whitespace just
looks strange.
But it is an old decision, so feel free to ignore this comment.
> +
> +-- RST
> +-- .. function:: get_buildable_fields()
> +--
> +--Collects all fields that are buildable
> +--
> +--:returns: a table with the map's buildable fields
> +--
> +function get_buildable_fields()
> + local fields = {}
> + local map = wl.Game().map
> + for x=0, map.width-1 do
> + for y=0, map.height-1 do
> + local f = map:get_field(x,y)
> + if f.buildable then
> +table.insert(fields, f)
> + end
> + end
> + end
> + print("NOCOM Found " .. #fields .. " buildable fields")
> + return fields
> +end
> +
> +-- RST
> +-- .. function:: count_owned_fields_for_all_players(fields, players)
> +--
> +--Counts all owned fields for each player.
> +--
> +--:arg fields: Table of all buildable fields
> +--:arg players: Table of all players
> +--
> +--:returns: a table with ``playernumber = count_of_owned_fields``
> entries
> +--
> +local function count_owned_fields_for_all_players(fields, players)
> + local owned_fields = {}
> + -- init the landsizes for each player
> + for idx,plr in ipairs(players) do
> + owned_fields[plr.number] = 0
> + end
> +
> + for idx,f in ipairs(fields) do
> + -- check if field is owned by a player
> + local owner = f.owner
> + if owner then
> + local owner_number = owner.number
> + if owned_fields[owner_number] == nil then
> +-- In case player was defeated and lost all their warehouses,
> make sure they don't count
> +owned_fields[owner_number] = -1
> + elseif owned_fields[owner_number] >= 0 then
> +owned_fields[owner_number] = owned_fields[owner_number] + 1
> + end
> + end
> + end
> + return owned_fields
> +end
> +
> +
> +-- Used by calculate_territory_points keep track of when the winner changes
> +local winning_players = {}
> +local winning_teams = {}
> +
> +
> +-- RST
> +-- .. data:: territory_points
> +--
> +--This table contains information about the current points and winning
> status for all
> +--players and teams:
> +--
> +--.. code-block:: lua
> +--
> +-- territory_points = {
> +-- -- The currently winning team, if any. -1 means that no team is
> currently winning.
> +-- last_winning_team = -1,
> +-- -- The currently winning player, if any. -1 means that no player
> is currently winning.
> +-- last_winning_player = -1,
> +-- -- Remaining time in secs for victory by > 50% territory.
> Default value is also used to calculate whether to send a report to players.
> +-- remaining_time = 10,
> +-- -- Points by player
> +-- all_player_points = {},
> +-- -- Points by rank, used to generate messages to the players
> +-- points = {}
> +-- }
> +--
> +territory_points = {
> + -- TODO(GunChleoc): We want to be able to list multiple winners in case
> of a draw.
> + last_winning_team = -1,
> + last_winning_player = -1,
> + remaining_time = 10,
> + all_player_points = {},
> + points = {}
> +}
> +
> +-- RST
> +-- .. function:: calculate_territory_points(fields, players, wc_descname,
> wc_version)
> +--
> +--First checks if a player was defeated, then fills the
> ``territory_points`` table
> +--with current data.
> +--
> +--:ar
[Widelands-dev] [Build #15542478] amd64 build of widelands 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 6 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542478/+files/buildlog_ubuntu-cosmic-amd64.widelands_1%3A19-ppa0-bzr8885-201810141806~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-032 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542478 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15542479] i386 build of widelands 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 5 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542479/+files/buildlog_ubuntu-cosmic-i386.widelands_1%3A19-ppa0-bzr8885-201810141806~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-amd64-022 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:19-ppa0-bzr8885-201810141806~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542479 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1794339-net-win-conditions/+merge/356683 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1794339-net-win-conditions. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands
Continuous integration builds have changed state: Travis build 4131. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/441254719. Appveyor build 3928. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1794339_net_win_conditions-3928. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1794339-net-win-conditions/+merge/356683 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1794339-net-win-conditions. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15542311] i386 build of widelands 1:19-ppa0-bzr8882-201810141510~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8882-201810141510~ubuntu18.10.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 2 hours * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542311/+files/buildlog_ubuntu-cosmic-i386.widelands_1%3A19-ppa0-bzr8882-201810141510~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lcy01-amd64-013 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:19-ppa0-bzr8882-201810141510~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542311 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1759857-territorial-lord into lp:widelands
Uhhm, is there a way to debug lua inside widelands? Checking that code just by reading is a pain. I will play some games with territoral time lord, will this be enough? -- https://code.launchpad.net/~widelands-dev/widelands/bug-1759857-territorial-lord/+merge/355860 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1759857-territorial-lord into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15542310] amd64 build of widelands 1:19-ppa0-bzr8882-201810141510~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8882-201810141510~ubuntu18.10.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 50 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542310/+files/buildlog_ubuntu-cosmic-amd64.widelands_1%3A19-ppa0-bzr8882-201810141510~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-050 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:19-ppa0-bzr8882-201810141510~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15542310 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian_music into lp:widelands
It will once I'm happy with the harmonies. I was meaning to fix them in MuseScore because I'm failing at explaining what I mean, but I haven't gotten around to it yet. -- https://code.launchpad.net/~widelands-dev/widelands/frisian_music/+merge/350429 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian_music into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands
Review: Approve Thanks for tracking that one down :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1794339-net-win-conditions/+merge/356683 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1794339-net-win-conditions. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands
Review: Approve diff, testing Changes sound good to me and output looks as expected. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/356379 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/not-yet-implemented-rt-tags into lp:widelands
Continuous integration builds have changed state: Travis build 4129. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/441214003. Appveyor build 3926. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_not_yet_implemented_rt_tags-3926. -- https://code.launchpad.net/~widelands-dev/widelands/not-yet-implemented-rt-tags/+merge/356680 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/not-yet-implemented-rt-tags into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cmakepolicy into lp:widelands
It seems so. We would need someone with 18.10 (hasn't been released though) to test. If no one objects I would append these flag: "-lGLU -lGLEW -lglut" and push directly to trunk. -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/shading_language_too_old/+merge/356681 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands
Continuous integration builds have changed state: Travis build 4128. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/441213282. Appveyor build 3925. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_shading_language_too_old-3925. -- https://code.launchpad.net/~widelands-dev/widelands/shading_language_too_old/+merge/356681 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands
Notabilis has proposed merging
lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands.
Commit message:
Adapt received path to file with win condition for the local filesystem.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1794339 in widelands: "segfault joining game"
https://bugs.launchpad.net/widelands/+bug/1794339
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1794339-net-win-conditions/+merge/356683
Fixes a bug where Linux players are unable to join games hosted by Windows
players.
The paths to the files for win conditions are sent with the local path
separators ('/' on Linux vs. '\' on Windows). While Windows is able to use both
separators and as such doesn't have a problem receiving the Linux-style path,
Linux is unable to use the Windows-style path and fails to load the win
condition.
This branch fixes the issue by transforming the received path to its local
representation, as is already done for the path of the map file.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1794339-net-win-conditions into lp:widelands.
=== modified file 'src/network/gameclient.cc'
--- src/network/gameclient.cc 2018-10-09 17:02:29 +
+++ src/network/gameclient.cc 2018-10-14 11:07:15 +
@@ -793,7 +793,7 @@
break;
}
case NETCMD_WIN_CONDITION: {
- d->settings.win_condition_script = packet.string();
+ d->settings.win_condition_script = g_fs->FileSystem::fix_cross_file(packet.string());
break;
}
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/cmakepolicy into lp:widelands
Hm... looks like Ubuntu needs other linkerflags? I am running archlinux, which is much close to any changes. Each time a new release of a program/library is official it will get soonish into the archlinux repo. Ubuntu is more conservative to this. Log for revision which has this changes already in: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15541748/+files/buildlog_ubuntu-cosmic-amd64.widelands_1%3A19-ppa0-bzr8880-201810140801~ubuntu18.10.1_BUILDING.txt.gz -- https://code.launchpad.net/~widelands-dev/widelands/cmakepolicy/+merge/356018 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/cmakepolicy. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1795570-chat-br-tags into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1795570-chat-br-tags into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1795570-chat-br-tags/+merge/356653 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1795570-chat-br-tags. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15541749] i386 build of widelands 1:19-ppa0-bzr8880-201810140801~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8880-201810140801~ubuntu18.10.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 27 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15541749/+files/buildlog_ubuntu-cosmic-i386.widelands_1%3A19-ppa0-bzr8880-201810140801~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-032 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:19-ppa0-bzr8880-201810140801~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15541749 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Build #15541748] amd64 build of widelands 1:19-ppa0-bzr8880-201810140801~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8880-201810140801~ubuntu18.10.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 27 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15541748/+files/buildlog_ubuntu-cosmic-amd64.widelands_1%3A19-ppa0-bzr8880-201810140801~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-030 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- amd64 build of widelands 1:19-ppa0-bzr8880-201810140801~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15541748 You are receiving this email because you created this version of this package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands
We need this for debugging, so I'll merge it straight away. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/shading_language_too_old/+merge/356681 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands.
Commit message:
Print the shading language as double to console
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/shading_language_too_old/+merge/356681
Some additional log output to try to track down the bug reported in
https://wl.widelands.org/forum/topic/4237/?page=2#post-26398
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/shading_language_too_old into lp:widelands.
=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc 2018-10-09 20:18:52 +
+++ src/graphic/gl/initialize.cc 2018-10-14 08:20:15 +
@@ -192,10 +192,12 @@
exit(1);
}
- log("Graphics: OpenGL: ShadingLanguage: \"%s\"\n", shading_language_version_string);
+ log("Graphics: OpenGL: ShadingLanguage: \"%s\"", shading_language_version_string);
// Exit if the shading language version is too old
const double shading_language_version = atof(shading_language_version_string);
+ log(" (%.2f)\n", shading_language_version);
+
if (shading_language_version < 1.20) {
log("ERROR: Shading language version is too old!\n");
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1795570-chat-br-tags into lp:widelands
I didn't think of that, but I also see no harm in it. If somebody wants to get some lolz out of it, it will be pretty harmless. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1795570-chat-br-tags/+merge/356653 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1795570-chat-br-tags. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/not-yet-implemented-rt-tags into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/not-yet-implemented-rt-tags into lp:widelands.
Commit message:
Fix richtext error in dummy scenario
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/not-yet-implemented-rt-tags/+merge/356680
After testing https://code.launchpad.net/~widelands-dev/widelands/fri03, I
accidentally clicked on the dummy scenario in trunk and noticed the error in
the message box.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/not-yet-implemented-rt-tags into lp:widelands.
=== modified file 'data/campaigns/dummy.wmf/scripting/init.lua'
--- data/campaigns/dummy.wmf/scripting/init.lua 2017-12-16 19:43:03 +
+++ data/campaigns/dummy.wmf/scripting/init.lua 2018-10-14 08:09:00 +
@@ -4,12 +4,13 @@
set_textdomain("scenario_dummy.wmf")
include "scripting/messages.lua"
+include "scripting/richtext.lua"
include "scripting/ui.lua"
p1 = wl.Game().players[1]
dummy_msg = {
- title=_ "Not yet implemented",
- body=_ "Sorry, this map is not yet implemented.",
+ title=_"Not yet implemented",
+ body=p(_"Sorry, this map is not yet implemented."),
width=500,
height=450,
posy=1,
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
