55981 Commits

Author SHA1 Message Date
anonymissimus
a701caa36e vc project update (sdl2 files) 2014-03-08 16:34:30 +01:00
anonymissimus
824896679c vc project update (maintenance, cherry-pick from 1.12) 2014-03-08 16:34:30 +01:00
anonymissimus
63488838b2 cb project update (sdl2 files) 2014-03-08 16:34:30 +01:00
Mark de Wever
65a97dc525 Update changelog. 2014-03-08 12:46:43 +01:00
Mark de Wever
e65120075e Make sure cut_surface gets a neutral surface.
Also change its return to an optimised surface. Fixes bug #20876.

From the comment added to the source:
Unlike other image functions cut_surface does not convert the input
surface to a neutral surface, nor does it convert its return surface
to an optimised surface.

Since it seems to work for most cases, rather change this caller instead
of the function signature. (The issue was discovered in bug #20876).
2014-03-08 12:46:31 +01:00
Mark de Wever
690fb03aac Fix using an uninitialised value.
While using valgrind to investigate bug #20876 it warned about this
issue.

Ported from a6eeac04e5dc863013fa3e5e0b723825ddc4fc08
2014-03-08 12:46:21 +01:00
mattsc
778955501a Update OS X user data directory to Library/Application\ Support/Wesnoth_1.13 2014-03-07 19:22:43 -08:00
Ignacio R. Morelle
2147bb3c54 Use blit_surface() instead of SDL_BlitSurface() in the ~BG() implementation
For some reason, ~BG() used SDL_BlitSurface() directly instead of using
the alternate blit_surface() implementation, unlike every other image
path function type in existence that needs to do blitting.

This works the first time when scaling or cropping an image (say,
"misc/blank-hex.png~BG()~CROP(0,0,34,34)"), but the second time it's
used with different scaling/cropping parameters, it yields the result it
would without ~BG() in the pipeline. This is somehow remedied by this
change, and I don't see any potential issues arising from it anyway
(save for a negligible performance impact on ~BG(), maybe).
2014-03-07 22:51:06 -03:00
Ignacio R. Morelle
8b6c921ea5 Bump version to 1.13.0-dev
The version between 1.12.0 and 1.12.1 is 1.12.0+dev, and 1.12.0 hasn't
happened yet.
2014-03-07 19:46:06 -03:00
Mark de Wever
13308d887e Merge branch 'SDL2_compilation_fixes'
This branch makes it possible to compile Wesnoth using SDL2. Running the
resulting binary will not work however, that will be worked upon later.

Note compilation with strict compilation fails and will for the near
future since some struct members changed signedness.
2014-03-07 20:53:12 +01:00
Nils Kneuper
006ba9f5c8 bump version numbers of master to 1.12.0+dev
1.12 branch is split off, so the new name is somehow valid...
2014-03-07 16:03:25 +01:00
Nils Kneuper
b574c449c6 updated Slovak translation 2014-03-07 10:16:04 +01:00
Chris Beck
1e3aec74db fix bug #21671
wesnoth.synchronize_choice checks the return value of toconfig fcn,
and if it indicated that it partially failed to convert the table,
it will chat a warning, IF wesnoth is running in debug mode
(that is game_config::debug = true, which is determined by e.g.
the command line flag --debug)
2014-03-06 18:48:23 -05:00
Chris Beck
9968636c17 update changelog 2014-03-06 17:57:44 -05:00
Chris Beck
df39be5d12 idle controlled teams serialize as "human" controlled 2014-03-06 16:38:47 -05:00
Nils Kneuper
e6c239807d changelog formatting changes 2014-03-06 12:06:31 +01:00
Nils Kneuper
10a8ef2b6e updated Slovak translation 2014-03-06 12:05:45 +01:00
Chris Beck
6d460b9827 fix bug #21757
by fixing up bad commit eb9274bd4c78a5f9a86bc9e0bf748f701d81e6b1.

the code to drop messages older than 5 should run inside the if block,
in the scenario when there were previous message, not outside it (!)
2014-03-05 16:06:35 -05:00
Boldizsár Lipka
6040bfbe8b Merge branch 'master' of https://github.com/wesnoth/wesnoth 2014-03-05 13:39:52 +01:00
happygrue
f0246d3a19 Balance: Increased xp requirement for Rami, Saree 2014-03-04 12:48:51 -05:00
happygrue
349253628d Added missing scenario objective.
Should not break string freeze as it is copied verbatim from the next
scenario.
2014-03-04 12:32:58 -05:00
Alexander van Gessel
81165c725f Merge branch 'master' of github.com:wesnoth/wesnoth 2014-03-04 12:35:51 +01:00
Alexander van Gessel
62b287354f Fix Fisher-Yates implemenation of Lua helper.shuffle (bug #21706) 2014-03-04 11:57:19 +01:00
Alexander van Gessel
741e575dc6 Merge pull request #110 from klapi85/master
PL translation for campain of two brothers
2014-03-04 11:17:48 +01:00
Alexander van Gessel
c1c67f2a57 Run unit tests on travis 2014-03-03 23:24:50 +01:00
Alexander van Gessel
b75dd81604 Merge branch 'master' of github.com:wesnoth/wesnoth 2014-03-03 23:15:16 +01:00
Alexander van Gessel
c83045958b Initialize a variable 2014-03-03 23:14:51 +01:00
mattsc
6170135452 Add missing id attribute to RCA AI candidate action to_config()
With this missing, certain combinations of actions/events would lead to
the ids of all CAs being dropped (e.g. in saves after using
[modify_ai]), which resulted in it not being possible to remove CAs any
more as that is done by id.
This fixes bug #21750.
2014-03-03 12:56:55 -08:00
Boldizsár Lipka
be32749e12 Fix typo in comment. 2014-03-03 15:56:31 +01:00
fendrin
de53e65187 Fix bug #21467: end iterator deref when launching test scenario 2014-03-03 10:35:05 +01:00
fendrin
8f6e7e1e54 Disabled every test for the unit_map class, they don't run anymore. 2014-03-03 08:09:08 +01:00
fendrin
d3814b8441 Disable every unit test for the sdl utils, they don't run anymore. 2014-03-03 08:09:08 +01:00
Ignacio R. Morelle
3135c7b92a Bump changelog version again 2014-03-02 23:04:20 -03:00
Ignacio R. Morelle
52107698fb Expand tabs in the changelog 2014-03-02 23:03:45 -03:00
Ignacio R. Morelle
780cced9c2 terrain2wiki: wesnoth-old.git -> wesnoth.git 2014-03-02 19:17:30 -03:00
JaMiT
237a1a0dc4 Fix compilation on MSVC.
MSVC was throwing error C2244 when trying to match some function
definitions to their declarations. This commit moves those
definitions to their declarations. The declarations are harder
for a human to read now, but at least all supported compilers
can understand it.
2014-03-02 15:07:24 -06:00
mattsc
8f748f9bd2 Xcode project update for 1.11.11
Version number and ingame changelog
2014-03-02 12:34:07 -08:00
Nils Kneuper
5c07956e59 updated German translation 2014-03-02 20:04:55 +01:00
Nils Kneuper
2719619394 post release version bump to 1.11.11+dev 2014-03-02 19:37:01 +01:00
Nils Kneuper
c2d278500e pot-update and regenerated doc files
preparation for 1.11.11
1.11.11
2014-03-02 18:58:25 +01:00
Nils Kneuper
2e2b6a7295 updated Version in Doxyfile 2014-03-02 18:56:16 +01:00
Nils Kneuper
28c8ab9815 version bump to 1.11.11 2014-03-02 18:54:23 +01:00
Nils Kneuper
3ca6988963 applied utils/wesnoth-optipng
Overall statistics (only for files with a smaller recompressed size):
  Original size: 14370 KiB on 172 files
 Optimized size: 12855 KiB
   Total saving: 1514 KiB = 10% decrease
2014-03-02 18:35:49 +01:00
Mark de Wever
857bf5a64a Disable several unit tests for SDL2.
The code will change enough to invalidate the tests, so don't bother to
get them working now.

With this commit Wesnoth compiles with SDL2 as long as strict
compilation is disabled. Running Wesnoth does not work at the moment.
2014-03-02 18:31:17 +01:00
Nils Kneuper
8009ed38b3 updated German translation
* Updated header to more uniform format
* Manual translations in several of the files
2014-03-02 18:23:11 +01:00
Mark de Wever
d03b9beb6a Replace SDL_putenv with SDL_setenv for SDL2.
SDL_putenv no longer exists in SDL2, and SDL_setenv has been added as
its replacement.
2014-03-02 18:03:46 +01:00
Mark de Wever
1857ba5449 Port CVideo::get_available_resolutions to SDL2.
The code is only compiled, but probably also works.
2014-03-02 18:03:12 +01:00
Nils Kneuper
abbad83416 updated German translation using evil foo
updated the German translation using po2po on each textdomain as
source and destination
2014-03-02 17:30:44 +01:00
Mark de Wever
1ad881dac3 Disable CVideo::setMode in SDL2.
This function needs to be rewritten for SDL2, so disable it so
compilation doesn't fail.
2014-03-02 17:01:58 +01:00
Mark de Wever
b88aa5a23f Update the changelog at Zookeeper's request. 2014-03-02 16:49:57 +01:00