56317 Commits

Author SHA1 Message Date
Charles Dang
def4c7cb3b THoT S12: fixed a typo and a missing word
Then -> Then
We will able -> We will be able
2014-04-10 02:53:51 -07:00
Charles Dang
8a80c370fe THoT S2: added mission period 2014-04-10 02:51:34 -07:00
Charles Dang
165210d8a3 THoT S1: improved a sentence 2014-04-10 02:49:51 -07:00
Charles Dang
578b4324fe NR S10a: fixed typo in comment 2014-04-10 02:46:34 -07:00
Charles Dang
b363705e96 NR S7a: fixed typo in a comment 2014-04-10 02:45:13 -07:00
Iurii Chernyi
47b4f52c9e Merge pull request #143 from Kevin-Xi/bugfix
fix minor bug in get_healing_phase
2014-04-10 11:13:07 +02:00
Charles Dang
45db6360e6 AOI S6: correct user_team_name for side 2 to Undead 2014-04-10 02:11:46 -07:00
Kevin_Xi
841284881a fix minor bug in get_healing_phase 2014-04-10 14:52:43 +08:00
mattsc
7fc8e9797b Micro AIs: avoid code duplication between eval and exec functions 2014-04-09 18:23:46 -07:00
mattsc
6f40ed8046 Micro AIs: use new fight_on_without_leader= key as needed
So that the scenarios with leaderless AI sides work.
2014-04-09 18:21:52 -07:00
Alexander van Gessel
364a756b93 Merge branch 'master' of github.com:wesnoth/wesnoth 2014-04-09 17:06:42 +02:00
Alexander van Gessel
409744c449 Wrap some directory composition in get_dir 2014-04-09 17:06:07 +02:00
Alexander van Gessel
45f52737c8 Merge pull request #139 from aquileia/VC_project_update
Update project files
2014-04-09 08:17:30 +02:00
Chris Beck
84bad5a875 update changelog 2014-04-08 21:24:11 -04:00
Chris Beck
55e716428d [side_drop] sides go to idle, not human (fix bug 21459)
since idle sides don't get initialized until someone takes control
this alleviates 21459. it might possibly aggravate 21397, if that
bug is not fixed by correcting save files with unintialized sides
2014-04-08 20:13:56 -04:00
Chris Beck
81f9e29e40 refactor check_victory, don't use [side] no_leader attribute
1. sides without leaders aren't defeated if
"fight_on_without_leader = true". don't use no_leader
for this purpose anymore.
2. refactor to use a std::set instead of std::vector,
and some related improvements, for what was formerly
the "seen_leaders" data structure
2014-04-08 20:13:56 -04:00
Chris Beck
8c69c73739 add debugging output
help to determine victory conditions associated to victory_when_enemies_defeated
2014-04-08 20:13:56 -04:00
Chris Beck
ec379ce355 create "fight_on_without_leader" field of [side]
this field is intended to allow battles to continue after the death of a leader
if a side has this flag enabled and any units alive, they will be considered
to have a leader regardless of canrecruit.
2014-04-08 20:13:56 -04:00
Chris Beck
3f4879ace4 fix networked idle loop
somehow this was not implemented...
2014-04-08 20:13:56 -04:00
Chris Beck
22c565282a fixup idle loop
(this is probably a bugfix independent of the purpose of this branch)
2014-04-08 20:13:56 -04:00
Chris Beck
eae7ba9c5c fix whitespace 2014-04-08 20:13:56 -04:00
mattsc
cc6cecee2e Update changelogs 2014-04-07 19:43:06 -07:00
mattsc
f260dd3be5 Micro AIs: one more wesnoth.dofile -> wesnoth.require 2014-04-07 14:36:36 -07:00
mattsc
bb5ed2e5a2 Micro AIs: clean up loading of Lua files
Consistently use wesnoth.require, avoid wesnoth.dofile. Move commands
as close to beginning of file as possible in order to facilitate custom
modifications of MAIs.
2014-04-07 14:23:42 -07:00
mattsc
ab61fdf521 Xcode project update: new rng-related files etc. 2014-04-07 09:49:25 -07:00
mattsc
37bc59d630 Xcode project update: remove deleted libraries 2014-04-07 09:43:00 -07:00
mattsc
1945c1f492 Upgrade Xcode project to enable both i386 and x86_64 builds
The largest part of this consist of upgrading the boost and pango/cairo
libraries together with their dependencies, supporting files and
project settings. In addition, architecture, SDK and compiler options
are set to use the native versions of the given OS X version for debug
builds. The OS X deployment target is set to OS X 10.8, because of a
change in the default libraries used by OS X from 10.8 to 10.9.
For this to work, the resources in  wesnoth_compile_mac_1.13.zip need
to be installed as well.
Some other settings, e.g. font defaults, still need to be adjusted.
This will be done in separate commits. Settings for release builds will
be changed later as well.
2014-04-07 09:15:09 -07:00
Ignacio R. Morelle
0dee9a1f47 CodeBlocks project update 2014-04-06 22:46:55 -04:00
Alexander van Gessel
a29ba939b7 Merge branch 'w32_unicode_compilation' 2014-04-06 21:09:45 +02:00
Alexander van Gessel
724adc4ddc Silence a macro redefinition warning 2014-04-06 21:03:39 +02:00
Alexander van Gessel
0b31427854 Fix some win32 API usage
aquileia noticed that with MSVC set to 'unicode', wesnoth didn't compile.
The reason is that much of the win32 API is provided by macros that switch
foo(LPCTSTR) between fooA(const char*) and fooW(const wchar_t*).
We were using foo with const char*.
2014-04-06 20:58:19 +02:00
Alexander van Gessel
b542e8193a Don't use BOOST_STATIC_ASSERT_MSG before 1.47 2014-04-06 19:21:25 +02:00
Mark de Wever
f583f616f0 Merge branch 'SDL_Texture_polishing'
Various minor changes polishing the image load code for textures.
2014-04-06 15:03:34 +02:00
Mark de Wever
6d4545df78 Change destruction order.
The order now is the reverse of the construction, probably doesn't
matter, but feels more like the normal constructor/destructor
creation/destruction order.
2014-04-06 10:44:32 +02:00
Mark de Wever
e1d054d6ff Improve documentation. 2014-04-06 10:42:35 +02:00
Mark de Wever
345fc7f9de Change order of parameters in constructor.
The order of the access mode is now more consistent with the other
constructor.
2014-04-06 10:31:49 +02:00
Mark de Wever
abe73ab915 Check the result of SDL_UpdateTexture. 2014-04-06 10:29:30 +02:00
Mark de Wever
210eb6a7a0 Improve exception path.
When the exception is thrown from the body of the constructor the
destructor is called, so no need to manage the lifetime of the
source_surface_ before throwing an exception.
2014-04-06 10:25:10 +02:00
Mark de Wever
3afebbb988 Remove the keep_surface parameter.
Whether or not the surface should be kept depends on the access mode of
the texture. It is possible to update a static image, but that is not
intended to be used, so remove the part of the API that makes it easier
to do.
2014-04-06 10:21:24 +02:00
Mark de Wever
bf20045ecd Initialise a member in the initialiser list. 2014-04-06 10:15:12 +02:00
Mark de Wever
1ad329c114 Use a SDL_Surface* instead of a surface.
The management of the surface is done in this class, this will probably
conflict with the surface management in the surface class.
2014-04-06 10:03:17 +02:00
Mark de Wever
0500856220 Improve code formatting. 2014-04-06 09:59:53 +02:00
Chris Beck
f051965122 update changelog 2014-04-06 02:26:58 -04:00
Chris Beck
647c3e0c81 fixup user-displayed strings
add missing translation mark, fixup some strings to be more clear
2014-04-06 02:24:47 -04:00
aquileia
edfe6e4a74 Update projectfiles and corresponding readme
- Add the new files introduced by gfgtdf to the VC project.
- Fix the indentation of SConscript.
- Update the README files for Code Blocks and Visual Studio.
2014-04-06 01:08:21 +02:00
Mark de Wever
1e8078d13d Merge branch 'compilation_fixes'
Fixes the compilation of the current master.
2014-04-05 21:24:36 +02:00
Mark de Wever
de74f48fd0 Add a missing link dependency. 2014-04-05 21:19:20 +02:00
Mark de Wever
eea3809e57 Remove old-style-casts. 2014-04-05 15:27:46 +02:00
Mark de Wever
df5ae31bba Remove extra semicolons. 2014-04-05 15:22:05 +02:00
Mark de Wever
0fbf3d4a46 Remove documentation for a non-existing parameter. 2014-04-05 15:11:51 +02:00