Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1759857-territorial-lord into lp:widelands
Found it - there was an extra parameter in a function call, and Lua does not flag these things up at all. I have also removed the debug logging output now - we don't have a Lua debugger, so console log is the best we can do, which is why I had kept it in. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1759857-territorial-lord/+merge/355860 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1759857-territorial-lord. ___ 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/GLVND_18_10 into lp:widelands
Compiles here :-) -- https://code.launchpad.net/~widelands-dev/widelands/GLVND_18_10/+merge/356771 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/GLVND_18_10 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/bug-1797792-shading-language-version-comparison into lp:widelands
Review: Needs Fixing diff
Some comments to your comments in the old diff.
Also, the new diff is broken and contains the remains of a failed merge.
Diff comments:
> === 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 +
> @@ -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 char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
> - if (strcmp(shading_language_version_string, "(null)") == 0) {
> + log("Graphics: OpenGL: ShadingLanguage: \"%s\"\n",
> shading_language_version_string);
Current trunk first checks for "(null)", and only if it is not "(null)" prints
out the current ShadingLanguage string. The new code always prints the string,
independent of its contents.
> +
> + 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) {
Sorry, should have written this in two comments. "1.20.1" is a good argument,
keep this line it as ">= 2".
If "2" is reported as shading language by the driver (instead of "2.0"),
shading_language_version_vector.size() will only be 1. So we would decline the
version even when actually "2" > "1.20".
When I think about it: My comment regarding version "1.2" is most likely wrong
and won't be a problem, sorry.
> + // 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 "
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1797792-shading-language-version-comparison/+merge/356699
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1797792-shading-language-version-comparison.
___
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 #15548185] i386 build of widelands 1:19-ppa0-bzr8889-201810160531~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8889-201810160531~ubuntu18.10.1 * Architecture: i386 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 31 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15548185/+files/buildlog_ubuntu-cosmic-i386.widelands_1%3A19-ppa0-bzr8889-201810160531~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-052 * 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-bzr8889-201810160531~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15548185 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/GLVND_18_10 into lp:widelands
Now I know why one of your forum members has "Cmake is evil" in his signature... LGTM, let's merge and see what the daily PPA will say. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/GLVND_18_10/+merge/356771 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/GLVND_18_10 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/GLVND_18_10 into lp:widelands
Thanks for your hard work on this :-) Have you tried the CMake variable CMAKE_SYSTEM or CMAKE_SYTEM_VERSION? From what i have read something like this should work also, without the need the call to lsb_release: if (CMAKE_SYSTEM_VERSION MATCHES "Ubuntu 18.10") [...] CMAKE_SYSTEM_VERSION should be the same as calling uname -r. https://cmake.org/cmake/help/v3.0/manual/cmake-variables.7.html#variables-that-describe-the-system https://cmake.org/cmake/help/v3.0/command/if.html Compiling this branch now. -- https://code.launchpad.net/~widelands-dev/widelands/GLVND_18_10/+merge/356771 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/GLVND_18_10 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] [Build #15548184] amd64 build of widelands 1:19-ppa0-bzr8889-201810160531~ubuntu18.10.1 in ubuntu cosmic RELEASE [~widelands-dev/ubuntu/widelands-daily]
* Source Package: widelands * Version: 1:19-ppa0-bzr8889-201810160531~ubuntu18.10.1 * Architecture: amd64 * Archive: ~widelands-dev/ubuntu/widelands-daily * Component: main * State: Failed to build * Duration: 26 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15548184/+files/buildlog_ubuntu-cosmic-amd64.widelands_1%3A19-ppa0-bzr8889-201810160531~ubuntu18.10.1_BUILDING.txt.gz * Builder: https://launchpad.net/builders/lgw01-amd64-051 * 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-bzr8889-201810160531~ubuntu18.10.1 in ubuntu cosmic RELEASE https://launchpad.net/~widelands-dev/+archive/ubuntu/widelands-daily/+build/15548184 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-1797792-shading-language-version-comparison into lp:widelands
Diff comments:
> === 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 +
> @@ -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 char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
> - if (strcmp(shading_language_version_string, "(null)") == 0) {
> + log("Graphics: OpenGL: ShadingLanguage: \"%s\"\n",
> shading_language_version_string);
But that's exactly what the code is doing already?
> +
> + 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) {
This is comparing the size of the split vector, not the version number. 1.20
will result in a size of 2, 1.20.1 will result in a size of 3.
> + // 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.",
Will do.
> + 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 "
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1797792-shading-language-version-comparison/+merge/356699
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1797792-shading-language-version-comparison.
___
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/GLVND_18_10 into lp:widelands
Continuous integration builds have changed state: Travis build 4141. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/441954041. Appveyor build 3938. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_GLVND_18_10-3938. -- https://code.launchpad.net/~widelands-dev/widelands/GLVND_18_10/+merge/356771 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/GLVND_18_10 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/GLVND_18_10 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/GLVND_18_10 into lp:widelands has been updated. Commit message changed to: set CMP0072 to OLD for Ubuntu 18.10 when using GCC For more details, see: https://code.launchpad.net/~widelands-dev/widelands/GLVND_18_10/+merge/356771 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/GLVND_18_10 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/GLVND_18_10 into lp:widelands
Toni Förster has proposed merging lp:~widelands-dev/widelands/GLVND_18_10 into
lp:widelands.
Commit message:
set CMP0072 to OLD for Ubuntu 18.10
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1772079 in widelands: "CMake 3.11: warning about FindOpenGL"
https://bugs.launchpad.net/widelands/+bug/1772079
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/GLVND_18_10/+merge/356771
Since it is only possible to compile with GLVND when using Clang on Ubuntu
18.10 we set CMP0072 to OLD behavior
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/GLVND_18_10 into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2018-10-14 20:56:48 +
+++ CMakeLists.txt 2018-10-16 00:25:31 +
@@ -3,7 +3,7 @@
cmake_minimum_required (VERSION 2.8.7)
cmake_policy(VERSION 2.8.7)
-# This policy is not known to versions prior 3.1 and would result in errors,
+# This policy is not known to versions prior 3.1 and would result in errors,
# if set on such systems. This can be removed when cmake_minimum_required is set
# to 3.1 or newer by using:
# cmake_policy(VERSION 3.1)
@@ -11,12 +11,34 @@
cmake_policy(SET CMP0054 NEW)
endif(POLICY CMP0054)
-# This policy is not known to versions prior 3.11 and would result in errors,
+# This policy is not known to versions prior 3.11 and would result in errors,
# if set on such systems. This can be removed when cmake_minimum_required is set
# to 3.11 or newer by using:
# cmake_policy(VERSION 3.11)
if(POLICY CMP0072)
cmake_policy(SET CMP0072 NEW)
+
+ # On Ubuntu 18.10 uwe need to set this to OLD since it currently does not
+ # compile using the default compiler, GCC 8.2, on this system. Only Clang is
+ # able to compile at the moment.
+ #
+ #TODO(stonerl): Check for later releases whether this is needed or not
+ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ find_program(LSB_RELEASE_EXEC lsb_release)
+ execute_process(COMMAND ${LSB_RELEASE_EXEC} -is
+ OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs
+ OUTPUT_VARIABLE RELEASE_CODENAME
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ endif()
+
+ if (LSB_RELEASE_ID_SHORT STREQUAL "Ubuntu" AND RELEASE_CODENAME STREQUAL "cosmic")
+ cmake_policy(SET CMP0072 OLD)
+ endif()
+
endif(POLICY CMP0072)
include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake")
___
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 guess it's gcc 8.x: -- The C compiler identification is GNU 8.2.1 -- The CXX compiler identification is GNU 8.2.1 -- Check for working C compiler: /usr/bin/cc -- Check for working C compiler: /usr/bin/cc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Detecting C compile features -- Detecting C compile features - done -- Check for working CXX compiler: /usr/bin/c++ -- Check for working CXX compiler: /usr/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Detecting CXX compile features -- Detecting CXX compile features - done -- Boost version: 1.68.0 [...] Why does gcc work here and not on Ubuntu? -- 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
When running the compile.sh script one of the very first line should tell you which compiler is used. -- 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
I have both installed, no idea which is used for compiling widelands :-D $:> pacman -Qs gcc local/gcc 8.2.1+20180831-1 (base-devel) The GNU Compiler Collection - C and C++ frontends $:> pacman -Qs clang local/clang 7.0.0-1 C language family frontend for LLVM Other packages maybe related on my system: local/freeglut 3.0.0-2 Provides functionality for small OpenGL programs local/glew 2.1.0-1 The OpenGL Extension Wrangler Library local/glibmm 2.56.0-1 C++ bindings for GLib local/glu 9.0.0-5 Mesa OpenGL Utility library local/libglvnd 1.1.0-1 The GL Vendor-Neutral Dispatch library local/mesa 18.2.2-1 An open-source implementation of the OpenGL specification -- 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
I installed 18.10 in a virtual machine. The problem seems to be cause by GCC-8 which, is standard on 18.10. Compiling with Clang shows no problems at all. -- 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-website/tabbed_profile into lp:widelands-website
The proposal to merge lp:~widelands-dev/widelands-website/tabbed_profile into lp:widelands-website has been updated. Description changed to: This branch replaces some links with tabs and a rework of the login box. Tabs are added to all places were formerly the small green links were used. Additionally moved some right boxes to the main page header. For the social media links i have removed Google+, because it will end in 2019, see: https://en.wikipedia.org/wiki/Google%2B#Shutdown_of_consumer_version. For an example image see (Old image, Google+ and donation links are removed in current version): https://bugs.launchpad.net/widelands-website/+bug/1740113/+attachment/5077794/+files/tabs_right_social_bold.png I have reworked also the base template, mainly to get an html id attribute to the main headers, which are the main green header below the navigation. Main reason for this change is bug 1746528 (Website lacks contrast): The header can now easily be changed in its appereance with css. Reworking the base template caused the main amount of the diff. If this get deployed, no one has to hit CTRL+F5: The modified css-file get automatically loaded when accessing the Website. This branch fixes also the server error regarding privacy_policies when hitting 'View on site' in the admin page. Do we need testing on the alpha site for this? For more details, see: https://code.launchpad.net/~widelands-dev/widelands-website/tabbed_profile/+merge/356749 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands-website/tabbed_profile into lp:widelands-website. ___ 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-website/tabbed_profile into lp:widelands-website
kaputtnik has proposed merging
lp:~widelands-dev/widelands-website/tabbed_profile into lp:widelands-website.
Commit message:
- Replace some links with tabs
- Fix a problem when hitting 'View on Site' for privacy policies
- Rework base.html to get an id attribute for main headers
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1740113 in Widelands Website: "Add tabs to some website pages"
https://bugs.launchpad.net/widelands-website/+bug/1740113
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/tabbed_profile/+merge/356749
This branch replaces some links with tabs and a rework of the login box. Tabs
are added to all places were formerly the small green links were used.
Additionally moved some right boxes to the main page header. For the social
media links i have removed Google+, because it will end in 2019, see:
https://en.wikipedia.org/wiki/Google%2B#Shutdown_of_consumer_version.
For an example image see (Google+ still there):
https://bugs.launchpad.net/widelands-website/+bug/1740113/+attachment/5077794/+files/tabs_right_social_bold.png
I have reworked also the base template, mainly to get an html id attribute to
the main headers, which are the main green header below the navigation. Main
reason for this change is bug 1746528 (Website lacks contrast): The header can
now easily be changed in its appereance with css. Reworking the base template
caused the main amount of the diff.
If this get deployed, no one has to hit CTRL+F5: The modified css-file get
automatically loaded when accessing the Website.
This branch fixes also the server error regarding privacy_policies when hitting
'View on site' in the admin page.
Do we need testing on the alpha site for this?
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands-website/tabbed_profile into lp:widelands-website.
=== modified file 'media/css/base.css'
--- media/css/base.css 2018-02-24 11:47:40 +
+++ media/css/base.css 2018-10-15 17:58:30 +
@@ -12,7 +12,7 @@
font-size: 0.88em;
line-height: 1.4em;
color: #ee;
-text-shadow: 1px 1px 0px #00;
+ text-shadow: 1px 1px 0px #00;
}
/*+*/
@@ -34,7 +34,7 @@
}
a:visited {
- color: #C8BE93;
+ color: #e0d7b0;
}
a.missingLink {
@@ -134,6 +134,10 @@
margin: 0.8em 0em 0.5em 0em;
}
+#content_header h1 {
+ display: inline-block;
+}
+
svg {
text-shadow: none;
}
@@ -160,7 +164,7 @@
}
.right {
- text-align: right;
+ text-align: right;
}
.middle {
@@ -198,6 +202,10 @@
background-image: url("../img/black50.png");
}
+.hidden {
+ display: none;
+}
+
.placeholder {
color: #aaa !important;
}
@@ -231,6 +239,8 @@
div#content {
margin-right: 240px;
+ display: flex;
+ flex-direction: column;
}
div#footer {
@@ -250,59 +260,61 @@
/**/
/* Header */
/**/
-
-div#header img{
- position: relative;
- z-index: 0;
-}
-
-div.loginBox {
- width: 320px;
- height: 71px;
- border: 1px solid black;
- background-color: #332f29;
- background-image: url("../img/but1.png");
- -moz-border-radius: 4px 4px 0px 0px;
+#logo img {
+ width: 100%;
+}
+
+#header {
+ display: flex;
+ display: -webkit-flex;
+ flex-flow: row wrap;
+ justify-content: space-between;
+ align-items: center;
+}
+
+#header .header_boxes li a, .header_boxes p {
+ font-weight: bold;
+}
+
+#header .header_boxes {
+ display: flex;
+ flex-flow: row wrap;
+ margin: 0px;
+ padding: 0px;
+ list-style-type: none;
+ border: 1px solid #47;
-webkit-border-radius: 4px 4px 0px 0px;
-khtml-border-radius: 4px 4px 0px 0px;
- border-radius: 4px 4px 0px 0px;
- position: relative;
- z-index: 0;
- padding: 15px;
+ border-radius: 4px 4px 4px 4px;
box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.7);
-}
-
-div.loginBox div.right{
- width: 120px;
-}
-
-div.loginBox ul {
- margin: 0px;
- padding: 0px;
- list-style-type: none;
- line-height: 1.5em;
-}
-
-div.loginBox h4 {
- margin-bottom: 5px;
- margin-top: 0px;
-}
-
-div.loginBox input {
- width: 100px;
-}
-
-div.loginBox button {
- margin: 0px;
- padding: 0px;
- border: 1px solid black;
- width: 60px;
- height: 20px;
- border-radius: 10px;
- background: none;
- background-image: url("../img/black50.png");
- outline: none;
- color: #ff;
+ background-image: url("../img/wood.png");
+}
+
+#header .header_boxes li {
+ border: 1px solid rgba(90, 74, 49, 0.84);
+ padding: 2px 5px 2px 5px;
+ text-align: center;
+}
+
+#header .header_boxes img {
+ margin: 0 2px 0 2px;
+}
+
+#header li.loginBox {
+ background-image: url("../img/black20.png");
+ border: 1px solid #47;
+ -webkit-border-radius: 4px 4px 0px 0px;
+ -khtml-border-radius: 4px 4px 0px 0px;
+ border-radius: 4px 4px 4px 4px;
+}
+
+#header p {
+ padding: 0px;
+ margin: 0px;
+}
+
+#header img {
+ vertical-align: middle; /* to prevent a space below */
}
//
@@ -319,7 +331,7 @@
div.columnModule h3 {
margin-bottom: 10px;
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1797792-shading-language-version-comparison into lp:widelands
Continuous integration builds have changed state: Travis build 4139. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/441516655. Appveyor build 3936. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1797792_shading_language_version_comparison-3936. -- 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. ___ 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-1797792-shading-language-version-comparison into lp:widelands
Review: Approve
Code looks okay, three (minor) comments in the diff.
It works as expected on my system with en_US and de_DE locale.
Diff comments:
> === 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 +
> @@ -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 char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
> - if (strcmp(shading_language_version_string, "(null)") == 0) {
> + log("Graphics: OpenGL: ShadingLanguage: \"%s\"\n",
> shading_language_version_string);
This might now be printed before the "Unable to detect version" message. No
objection, though.
> +
> + 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) {
>= or == ?
Also, this might break in the future if "2" is reported as shading version. But
I guess it is fine for now and we can fix it if this ever happens. Also it
would be problematic if some driver reports the version as "1.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.",
Maybe move the "The" into the next line? Doesn't matters, but looks strange in
the source code. ;-)
"Shading" upper or lower case (is in middle of sentence)?
> + 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 "
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1797792-shading-language-version-comparison/+merge/356699
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1797792-shading-language-version-comparison.
___
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/worldsavior-frisians-collectors-fix into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/worldsavior-frisians-collectors-fix into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/worldsavior-frisians-collectors-fix/+merge/356118 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/worldsavior-frisians-collectors-fix. ___ 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/worldsavior-frisians-collectors-fix into lp:widelands
Review: Approve Looks good now. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/worldsavior-frisians-collectors-fix/+merge/356118 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/worldsavior-frisians-collectors-fix. ___ 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
Continuous integration builds have changed state: Travis build 4137. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/441494752. Appveyor build 3934. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1797531_playermenu_tribe-3934. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1797531-playermenu-tribe/+merge/356695 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1797531-playermenu-tribe 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
