59075 Commits

Author SHA1 Message Date
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
Chris Beck
88dcdeb1ee fixup help pages for units, only one sprite (as usual)
Only show one sprite, not all the scaled samples.
Only show ~xBRZ(2), not the straight baseframe.
2014-10-24 18:42:18 -04:00
Chris Beck
1582026ec9 implement advanced graphics options back-end
This commit makes the `image` namespace check the advanced options
when selecting how to scale a sprite. It also makes the advanced
graphics options window flush the caches when an option is changed.

This permits the user to experiment with different graphics
algorithms while playing the game.
2014-10-24 18:42:18 -04:00
Chris Beck
07b6eeedb2 add "advanced graphics" preference dialog, for scaling algo options
This commit also gives the smart enums in src/make_enum.hpp
introspective capabilities, by giving them a static const size_t
which tells how many possible values they may take (hence the range
of the enum.) It was convenient for the dialog implementation
to have this.

Note that, I had to make use of __attribute__((unused)) to compile
this. I apply this using a macro which adds it for gcc, clang, and
mingw which I know respond to this attribute. I don't know what is
the equivalent MSVC device, or if it is even necessary, so its
possible that this commit needs to be fixed up.

We also disable unit tests for the new advanced graphics dialog,
there are no tests for it right now...
2014-10-24 18:42:18 -04:00
Chris Beck
3f18331a08 as a test, use xBRZ when zooming images
This also sets the max zoom to 288 so you can reach 3x and 4x if
desired.
2014-10-24 18:42:18 -04:00
Chris Beck
760cb18b3e Revert "Anchor unit overlays to the topleft corner of the sprite."
This reverts commit 8f49cbad5508d761c1139c65e064c31ea3c79a00.

This commit breaks the game when you zoom in, since I'm trying to
make changes to how that works it is inconvenient to have to deal
with it right now. This bug was assigned to lipk more than a month
ago when he first introduced it.

Conflicts:
	changelog
	src/unit_drawer.cpp
2014-10-24 18:42:18 -04:00
Chris Beck
8932fda902 add wesnoth default scaling results along-side xBRZ in help pages 2014-10-24 18:42:17 -04:00
Chris Beck
6040e9bf01 fixup xbrz blending handling of alpha channel
xbrz reference implementation assumes that there is no alpha in
the sprites, and indeed, when it would blend any colors would zero
out the alpha channel. This is not suitable for our needs, as our
sprites have alpha, and SDL treats 0 alpha as being transparent.

This commit adds --placeholder-- alpha channel code. It does not
do proper alpha compositing, it just checks if either the source
or blend pixel has < 50% alpha (if so it ignores and takes the
other), and otherwise it applies full alpha to the pixel. This
seems to work fine in the ``typical'' cases I have observed but
a ``real'' implementation is needed here.
2014-10-24 18:42:17 -04:00
Chris Beck
eeb92161e0 xBRZ trial commit
This commit adds the xBRZ algorithm to the codebase, and adds
an imagepath modification to use it, and adds a bunch of extra
images showcasing it to the unit help pages.

xBRZ was obtained from sourceforge (xBRZ.zip):
http://sourceforge.net/projects/hqmame/files/

It is modified, the original program wants to be compiled as
C++11, so I had to make minor changes so that it can compile as
C++98 w/ boost.

Main changes: get boost/cstdint and typedef uint32_t from there,
comment out all static asserts
change all cases of lambda functions to boost bind instances or
otherwise.
Fix non-utf8 characters.
dos2unix on all new files
Renanme files .h -> .hpp, as config.h is in our .gitignore
Suppress warnings from unused functions.
Fixup warnings from negligible initialization of POD types
Mark some templates results with attribute unused
2014-10-24 18:42:17 -04: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
Ignacio R. Morelle
459126e658 Add other UtBS fixes to players_changelog 2014-10-23 15:10:48 -03:00