Commit graph

57758 commits

Author SHA1 Message Date
Nils Kneuper
b471695ee5 updated German translation 2014-11-02 11:35:05 +01:00
Nils Kneuper
586d2016a4 updated Slovak translation 2014-11-02 11:30:35 +01:00
Nils Kneuper
4591cb2ed5 updated Portuguese translation
image needs to be updated in tracking file
2014-11-02 11:29:41 +01:00
Chris Beck
5ebf88d2c3 fixup SConstruct in case there is no terminal in the environment 2014-11-02 01:50:21 -05:00
Chris Beck
b0f7a3c41f scons: add OS_ENV option, to forward all of OS environment to scons
Conflicts:
	SConstruct
2014-11-02 01:50:01 -05:00
mattsc
bf58ba0da4 LoW 11: enable recall list for player's side 2014-11-01 18:31:59 -07:00
mattsc
b991ec6d48 LoW 10: make it so that yetis can be seen moving in hole in fog 2014-11-01 18:20:41 -07:00
mattsc
04e520820e LoW 10: set user_team_name for player side 2014-11-01 18:19:50 -07:00
mattsc
64a29d2435 LoW 09: fix several issues with coordinates due to new map size 2014-11-01 16:53:25 -07:00
Chris Beck
0ef4e60f8d Merge branch '1.12' of https://github.com/wesnoth/wesnoth into 1.12 2014-11-01 13:34:00 -04:00
Chris Beck
d11f51cbcc scons: don't depend on libintl if boost filesystem enabled
since we use boost locale then instead
2014-11-01 13:33:39 -04:00
Chusslove Illich (Часлав Илић)
1e756c84e0 Update localized images for Portuguese
Provided by trewe.
2014-11-01 17:35:24 +01:00
Boldizsár Lipka
824f142231 Make the GUI2 lobby respect the require_modification attribute.
Fixes bug #22877.
2014-11-01 16:08:18 +01:00
mattsc
408a12a288 Micro AIs: only display on-screen error messages when in debug mode 2014-11-01 07:43:16 -07:00
Chusslove Illich (Часлав Илић)
8b8993e9c5 Move German overlay for LoW map to proper place 2014-10-31 20:14:22 +01:00
Chusslove Illich (Часлав Илић)
0d3c425f82 Update localized images for Portuguese
Provided by trewe.
2014-10-31 20:11:57 +01:00
gfgtdf
8100479af3 uint32_t -> boost::uint32_t 2014-10-31 19:56:02 +01:00
gfgtdf
c73d68f496 remove an unneeded include 2014-10-31 19:53:31 +01:00
Chris Beck
264dc08e91 change preprocessor symbols controlling SDL MIXER min version
Previously, the code that requires SDL_mixer v 1.2.12 was guarded
by #ifdef PANDORA, since this was the only platform intended to
use this. However, it turns out that OS X < 10.5 has a hard time
getting this library as well.

Instead of branching by platform, here we just check the version
defind by the SDL_mixer header, and include the code appropriate.

We rely on the scons / cmake / project file to fail any build which
should be done with the recent version.
2014-10-31 09:18:05 -04:00
mattsc
673f609558 Add a missing include for Apple OS X 2014-10-30 17:45:47 -07:00
mattsc
6397ffcb30 Xcode project: revert to the old filesystem code for Apple OS X
This is for compatibility with OS X 10.5 only, with newer version of OS
X the new boost filesystem code works just fine.
2014-10-30 17:45:47 -07:00
mattsc
f487264db5 Revert "Xcode project: update boost and SDL libraries"
This reverts commit 7199486105.
2014-10-30 17:45:46 -07:00
mattsc
5081e0fee7 Revert "Xcode project: add 'Runpath Search Path" for wesnothd"
This reverts commit b228f0002a.
2014-10-30 17:45:46 -07:00
mattsc
1b7069b4c4 Revert "Xcode project: switch to using the new boost filesystem code"
This reverts commit 3d906be9ee.
2014-10-30 17:45:46 -07:00
mattsc
b0245098d8 Revert "Xcode project file: fix user data directory name"
This reverts commit 3b457ab990.
2014-10-30 17:45:46 -07:00
Fabian Müller
08d02dda3d * Fix bug #22806: missing mouseover info: upkeep 2014-10-31 00:33:19 +01:00
Ignacio R. Morelle
64c71161f1 campaignd: Use a POSIX monotonic clock for scheduling config commits
Only available on Linux and probably some BSD systems. For other systems
we issue a #warning and use time() instead (which will cause the
compiler to quit with -Werror, but that's the whole point).
2014-10-30 06:00:02 -03:00
Ignacio R. Morelle
5e80fb1a38 campaignd: Fix abs() value truncation warning on clang 3.5 2014-10-30 06:00:02 -03:00
Ignacio R. Morelle
5fa2b70bcf campaignd: Write config to disk even if the clock is running backwards 2014-10-30 06:00:02 -03:00
Ignacio R. Morelle
4946dc6bd7 campaignd: Emit debug messages when writing configuration to disk 2014-10-30 06:00:02 -03:00
gfgtdf
0cb29bcf75 fix "time over" event in replays
backports 52fb059727
2014-10-29 17:58:55 +01:00
Andrius Silinskas
3a4928f231 Add WML variables to MP SOS saves. 2014-10-29 14:53:36 +00:00
Chris Beck
43ef193f29 fixup cmakelists, they weren't adding the new libraries
Conflicts:
	src/CMakeLists.txt
2014-10-28 22:31:30 -04:00
mattsc
66c1f9d786 LoW 03: fix two issues with fog
Because the side numbers were changed, fog was cleared for the wrong
side in single player.  This resulted in fog not being cleared at all
for side 3 (bug #22880), and in fog not being cleared when Kalenz first
arrives (time over event), but at the beginning of his turn.
2014-10-28 07:04:58 -07:00
Ignacio R. Morelle
a1fe3ce3fc Spanish translation update 2014-10-28 02:15:12 -03:00
Chris Beck
f500d53e30 when zooming in, use scale_surface_sharp for units, terrain
Previously we were using scale surface. The result is that sprites
look blurry, terrain looks blurry, and for fractional zoom values
"hex tearing" artifacts are more visible. It seems that zookeeper
and others also prefer a more traditional, just-give-me-the-pixels
look anyways.

lipk even thought that we had been using scale_surface_sharp on
units "since forever", so here we treat the fact that we weren't
as a bug.
2014-10-28 00:04:09 -04:00
mattsc
79043f93c6 LoW 03: fix coordinates for redestroying village at map change 2014-10-27 13:51:16 -07:00
mattsc
845e6df142 LoW 03: fix coordinates for Urudin appearing at scenario start
These had not been adjusted yet after the map dimensions were changed.
2014-10-27 13:10:42 -07:00
mattsc
c88d4db20b Changelog: fix version number 2014-10-27 09:45:30 -07:00
mattsc
04e74005e0 Changelog: Add comment about new Xcode compile package requirement 2014-10-27 09:45:19 -07:00
mattsc
3b457ab990 Xcode project file: fix user data directory name
It was accidentally set to ~/Library/Application Support/Wesnoth_1.13
in commit 3d906be.
2014-10-27 09:35:47 -07:00
mattsc
e71d6b6bdb Release notes: Add comment about new Xcode compile package requirement 2014-10-27 08:51:11 -07:00
mattsc
3d906be9ee Xcode project: switch to using the new boost filesystem code
This includes adding a new library (libboost_localew.dylib; with
libboost_filesystemw.dylib already having been added a few days ago),
so a new version of the Mac compile package is needed for compiling.
2014-10-27 08:46:19 -07:00
mattsc
9b2f9a6128 Growl notifications: Fix attempts to pass std::string instead of const char*
This is required on OS X due to the recent return type changes for the
gettext functions.
2014-10-27 08:42:08 -07:00
Chris Beck
652dce400d adjust RELEASE_NOTES phrasing 2014-10-26 18:53:38 -04:00
gfgtdf
4f2c88ec00 use LOG_G instead of std::cerr 2014-10-26 18:41:10 -04:00
Chris Beck
c3296cb2a6 update RELEASE_NOTES 2014-10-26 18:08:33 -04:00
Chris Beck
cb43bb4e3f Merge branch 'backport_reorder_gettext' into 1.12 2014-10-26 17:25:44 -04:00
Chris Beck
c5dd249072 travis: get g++ from the same repo where we get boost 2014-10-26 16:51:51 -04:00
Chris Beck
bcb89aa0c7 fixup travis 2014-10-26 16:30:47 -04:00