56345 Commits

Author SHA1 Message Date
Mark de Wever
6817aa33b7 Let CVideo::window_state use main_window. 2014-03-09 15:03:53 +01:00
Mark de Wever
546ba048c2 Show the window icon with SDL 2. 2014-03-09 14:59:36 +01:00
Mark de Wever
7a0873f0aa Show the window caption with SDL 2. 2014-03-09 13:55:13 +01:00
Mark de Wever
632710bdad Move window caption initialisation code.
The code is moved from game_controller::init_language to
game_controller::init_video. This makes porting the code to SDL 2
easier. In SDL 2 the caption must be set after the main window exists.
It could be set in the constructor of the Window, but that can be done
once we drop SDL 1.2 support.
2014-03-09 12:17:25 +01:00
Mark de Wever
26aad8b7ab Implement rendering with SDL 2.
The game now starts and can be played. There are a lot of visual
glitches, but visual it is playable.

The text input is completely broken, due to the changes in the
SDL 2 API and the band-aid compile fixes.
2014-03-09 11:40:22 +01:00
Boldizsár Lipka
4c6cad1327 Don't use uninitialized data member for variable initialization.
Fixes an MSVC warning. Spotted by Anonymissimus.
2014-03-09 00:08:48 +01:00
Boldizsár Lipka
b474ebace4 Add libwesnoth-sdl.a to .gitignore. 2014-03-08 21:31:54 +01:00
Boldizsár Lipka
7b6c125ffd Add an sdl2 option to SCons.
It allows building Wesnoth with SDL2. False by default. The SDL2 versions of
SDL_image, SDL_mixer, SDL_net and SDL_ttf are required, too.
2014-03-08 21:30:04 +01:00
Mark de Wever
ff3588c99b Add the initial SDL_Window wrapper code.
With this wrapper in place, Wesnoth shows a main window, all black and a
lot of errors on the console.
2014-03-08 19:31:10 +01:00
Mark de Wever
cb4c16749b Merge branch 'remove_old_platforms'
Removes support to ease the transition to SDL2.
2014-03-08 18:19:16 +01:00
Chusslove Illich (Часлав Илић)
c84782713c Unfuzzied images fuzzied due to conversion and optimization. 2014-03-08 17:08:57 +01:00
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
8a0c80d83f Remove OS/2 support.
It is unknown whether the platform still works with the current Wesnoth
code. To ease the SDL 2.0 transition support is removed. If a maintainer
steps up support can be added again.
2014-03-08 14:47:56 +01:00
Mark de Wever
11001bc8dd Remove BeOS support.
It is unknown whether the platform still works with the current Wesnoth
code. To ease the SDL 2.0 transition support is removed. If a maintaine
steps up support can be added again.
2014-03-08 14:39:54 +01:00
Mark de Wever
2ab7d78cdf Remove AmigaOS support.
It is unknown whether the platform still works with the current Wesnoth
code. To ease the SDL 2.0 transition support is removed. If a maintainer
steps up support can be added again.
2014-03-08 14:10:49 +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