58875 Commits

Author SHA1 Message Date
gfgtdf
f0017586d0 fix saved_game::cancel_orders() 2014-10-26 02:57:24 +02:00
gfgtdf
618cc110b3 move some savegame manipulation to saved_game.cpp 2014-10-26 02:38:43 +02:00
gfgtdf
91b845d0a5 use LOG_G instead of std::cerr 2014-10-26 02:38:40 +02:00
Chris Beck
cef5e2ed9c for cmake + ENABLE_PANDORA, reduce SDL_mixer dep to 1.2 from 1.2.12 2014-10-25 19:27:58 -04:00
Chris Beck
419f154f42 in cmake, make PANDORA option force the BFS option to false 2014-10-25 19:23:28 -04:00
Chris Beck
48217f8da0 add boost locale to travis 2014-10-25 19:09:04 -04:00
Chris Beck
bdd109ebcb Fixup boost filesystem options for cmake, scons
The option should control the compilation, in wesnoth-core, of
filesystem_boost.cpp, and gettext_boost.cpp, vs. the old versions.

Using the new code is now the default option, you must explicitly
deactivate with both cmake and scons to get the old stuff back.
2014-10-25 18:53:43 -04:00
gfgtdf
e723de7be3 Merge pull request #311 from gfgtdf/gettext_reorder
new boost gettext implementation that can handle utf8 paths on windows.
2014-10-25 22:54:22 +02:00
gfgtdf
fed433d829 fix image translations 2014-10-25 22:03:05 +02:00
gfgtdf
4fc2368229 fix gettext_boost.cpp 2014-10-25 22:03:04 +02:00
Chris Beck
807f4ead5f Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-10-25 15:03:01 -04:00
Chris Beck
4f382ebc2a gracefully catch exceptions generated by changing the language 2014-10-25 15:02:06 -04:00
gfgtdf
588c008890 fix comilation
move LC_MESSAGES out of wesnoth.cpp and game_config_manager.cpp
2014-10-25 19:02:12 +02:00
gfgtdf
9c799b9a47 fix compilation
it seems like sometimes libintl.h is needed for LC_MESSAGES so we need
to move that last code that uses LV_MESSAGES out of language.cpp into
gettext.cpp
2014-10-25 19:02:10 +02:00
gfgtdf
2fee9e2522 fix unused warnings. 2014-10-25 19:02:09 +02:00
gfgtdf
c4e2c4bf51 use boost locale gettext
This includuces an alternative implementation of gettext.cpp. Libintl gettext doesn't seem to support utf8 filenames on windows. Also it causes problems when changign the language on my msvc build. That why i want to use boost locale gettext at least for our windows builds.
This requires boost locale which is introduced in boost 1.48 (That's why i still hesitate to make it the default on all systems).
2014-10-25 18:56:45 +02:00
gfgtdf
9742c9cb54 make gettext.hpp return std::string.
in 99% of cases the returned value was moved into a std::string anyway. We do this becasue the boost gettext functions also return std::string so it makes replacing them easier.
2014-10-25 18:54:03 +02:00
gfgtdf
c5cf699210 reorder gettext.hpp
We want to put all dependencies of linintl.h to getttext.cpp so we can easily replace gettext/libintl with boost locale gettext by replacing that file.
2014-10-25 18:52:26 +02:00
gfgtdf
6737805258 remove unneeded check
io_type != IO_CLIENT implies io_type == SERVER
2014-10-25 13:34:14 +02:00
gfgtdf
33becb6100 dont always show mpconnect in debugmode in sp 2014-10-25 13:28:16 +02:00
Ignacio R. Morelle
70b953cbd3 Updated big button graphics by LordBob
From <http://r.wesnoth.org/p577072>.

Fixes a weird light source angle issue with the active variants.
2014-10-25 01:39:38 -03:00
Chris Beck
7247d14535 fixup headers in strftime.hpp, (missing <string>) 2014-10-24 19:40:38 -04:00
gfgtdf
f6291d33eb Update filesystem_common.cpp 2014-10-25 01:36:47 +02:00
Nils Kneuper
0c738779da updated Slovak translation 2014-10-24 20:09:09 +02:00
Chris Beck
abb3162fc2 fixup up gui1 button code interactions with filesystem
Image path modifiers should not be present when using the
filesystem::exists function. This fixes a bunch of error messages.
2014-10-24 13:47:05 -04:00
Chris Beck
9b0396629f add build_mingw*.sh to .gitignore
It's convenient for me to do this, because I use scripts to keep
all the configuration info set up correctly, and I have a few diff
versions of mingw and of boost floating around...
2014-10-24 13:20:45 -04:00
gfgtdf
77fb3852f9 make lua require use our filesystem functions
previously only lua dofile did this.
2014-10-24 15:34:41 +02:00
gfgtdf
f126846be2 fix lua stacktraces 2014-10-24 15:34:40 +02:00
ln-zookeeper
366df75cde Switched tutorial Delfador to elvish clothing 2014-10-24 16:27:04 +03:00
ln-zookeeper
b4a6be69f0 Replaced the first story image with a better one 2014-10-24 13:57:48 +03:00
ln-zookeeper
327f1eb04d Added missing {IS_LAST_SCENARIO} notes 2014-10-24 12:05:28 +03:00
ln-zookeeper
46125cfdec Made the map for 17b bleaker and more ruinous 2014-10-24 11:50:53 +03:00
Ignacio R. Morelle
a383a3d3fa Fix Graphics section of the 1.13.0 changelog being out of order 2014-10-24 01:51:25 -03:00
Ignacio R. Morelle
df449c1aee New Ancient Lich baseframe and updated animations by shadowm
This version of the commit removes the orphaned melee attack animation
frame, which is superseded by a 2-frame set. The 1.12.x version of this
commit keeps the file as a copy of the new melee attack animation frame
for compatibility with existing add-ons.

Animation WML and art reference taken from the existing L3 Lich.
2014-10-24 01:50:55 -03:00
gfgtdf
9ae2f1ed42 fix signed unsigned comprision 2014-10-24 04:00:03 +02:00
mattsc
2f793022a9 Changelogs, release notes: remove comments about changed OS X userdir 2014-10-23 18:31:54 -07:00
mattsc
582e4c73e5 Xcode project: set the user directory back to the old default 2014-10-23 18:31:53 -07:00
Chris Beck
1385ab3791 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-10-23 20:10:37 -04:00
Chris Beck
88ed44b374 fixup std::min usage with strings, when saving images
I think this should fix the error reported by Pentarctagon here,
at the very end of his log.

http://forums.wesnoth.org/viewtopic.php?f=4&t=41018&start=15#p577053
2014-10-23 20:09:14 -04:00
gfgtdf
7023416688 cstyle_cast -> static_cast 2014-10-24 00:05:25 +02:00
gfgtdf
8a81fb526d Merge pull request #305 from gfgtdf/istream_fix
we now use boost::istreams instead of boost::filesystem::fstream because the later doesnt work with mingw.
we now use a custom codecvt instead of boost locale because we want to get better error messages for invalid utf8 strings using our _ERR streams
we now use unicode prgamm commandline args on windows..
2014-10-23 23:59:42 +02:00
gfgtdf
2ecf630ad3 fix unicode cast 2014-10-23 22:35:49 +02:00
Chris Beck
635949f313 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-10-23 15:45:03 -04:00
Chris Beck
8ae5a3556d add khalifate description based on 1.12 release announcement text 2014-10-23 15:43:41 -04:00
Chris Beck
24d9aa08a8 use warlord portrait for 'northerners' in help description 2014-10-23 15:34:11 -04:00
Chris Beck
751ab8f025 use grand knight portrait for 'loyalists' help description 2014-10-23 15:31:41 -04:00
Bär Halberkamp
5739831d82 Re-added some incorrectly removed code 2014-10-23 20:21:08 +02:00
Bär Halberkamp
fe7b3ee7ee Updated changelog and players_changelog 2014-10-23 20:18:24 +02:00
Bär Halberkamp
f65228b28a reverted the village radius changes in 17b 2014-10-23 20:17:21 +02:00
Bär Halberkamp
471e7c557e New animation for the Lich Lord 2014-10-23 20:17:21 +02:00