Andrius Silinskas
cef9f78468
Added 'faction_lock' and 'leader_lock' for MultiplayerWML.
...
These attributes work similarly as all other lock attributes such as
'gold_lock': 'faction_lock' locks faction selection, while 'leader_lock' locks
both leader and its gender selections.
These attributes were added to fix #21978 .
2014-06-26 22:01:20 +01:00
Turuk
d8514c3275
LoW S10: Added "or" to objectives
...
Previously the objectives were written in a way that indicated the
player would need to complete both.
2014-06-26 16:37:58 -04:00
Turuk
f24eed9efd
LoW S9: Message on Dwarf Recruitment
...
Current message read as if Kalenz could recruit dwarves. It has been
changed to make it clear that only Olurf can recruit dwarves for Kalenz.
2014-06-26 11:26:24 -04:00
Turuk
4fbcb93372
LoW S7: Dialogue change/Message Fix
...
Dialogue changed to have proper English formatting. Eradion death
message fixed to remove potential of an enemy side expressing concern
over his death.
2014-06-26 10:08:21 -04:00
Chris Beck
e62553139c
move is_observer to gameboard, with accessor in playcontroller
2014-06-26 00:40:53 -04:00
Chris Beck
f5a9de40d5
move village_owner function to display_context
...
I would have liked to put it in game_board, but it is needed for
reports so it can't go there
2014-06-25 22:22:07 -04:00
Chris Beck
221863b893
remove unnecessary include from header, despite what iwyu tool says
2014-06-25 21:07:40 -04:00
Chris Beck
236e26e794
Revert "attempt to fix travis compilation"
...
This reverts commit 6e3e8990e8a1b2cbcddf6738c7b63a5cfd0fc4a5.
2014-06-25 20:23:34 -04:00
Chris Beck
7c6e47d7e7
attempt to fix travis compilation
2014-06-25 20:05:49 -04:00
Chris Beck
6e3e8990e8
attempt to fix travis compilation
2014-06-25 19:53:49 -04:00
Chris Beck
399ec11ddf
fixup includes in headers, started as just config, but led to more
...
The changes in config required changes in ai/contexts which
cascaded, also many places were throwing game::game_error without
including its definition except from config.
2014-06-25 19:20:11 -04:00
Chris Beck
2a703f3d70
move include from a header to its compilation unit
...
This include is apparently unnecessary but we don't compile without
it... it seems to only affect this compilation unit though.
2014-06-25 18:08:47 -04:00
Chris Beck
b8427b362b
remove some unnecessary includes
2014-06-25 17:58:25 -04:00
Chris Beck
bb768e8486
advance boost headers one step forwards
2014-06-25 17:52:42 -04:00
Chris Beck
e453a91c33
move headers one file forwards
2014-06-25 17:17:55 -04:00
Chris Beck
09e2ce0dd0
move impl of tstring database to tstring.cpp
2014-06-25 16:56:12 -04:00
gfgtdf
4637f444f0
fix quit game durign linger mode
...
this prevents an assertion error.
2014-06-25 21:25:36 +02:00
gfgtdf
78e1916e68
fixup build after 'remove unused functions + fix comments'
2014-06-25 21:00:55 +02:00
gfgtdf
6bdf2edfee
update playturn.cpp
2014-06-25 18:09:49 +02:00
gfgtdf
179c9a9786
add some copyright notices.
2014-06-25 18:02:06 +02:00
gfgtdf
467ea33855
remove unused functions + fix comments
2014-06-25 18:02:04 +02:00
Chris Beck
7be3abcc0a
fixup d361b6827755ab0008d51106ffbf697a2397af94
2014-06-25 11:59:10 -04:00
Chris Beck
d361b68277
remove some unneeded includes
2014-06-25 11:58:22 -04:00
Chris Beck
cdd4a3d73d
fixup playturn.?pp includes
2014-06-25 11:45:57 -04:00
Chris Beck
bd33724a36
fixup mouse_events.?pp includes
2014-06-25 11:32:40 -04:00
Chris Beck
0b768a6f5e
fixup 1bc0fea10a7731f045510d61f646565e2ec8b4ce
2014-06-25 11:20:29 -04:00
Chris Beck
1bc0fea10a
fixup includes in game_controller.?pp
2014-06-25 10:58:26 -04:00
Chris Beck
67f1fc28a3
Merge branch 'master' of git://github.com/wesnoth/wesnoth
...
Conflicts:
src/unit.cpp
Header conflict
2014-06-25 10:44:45 -04:00
Chris Beck
39f02ae96e
remove some unneeded AI headers from scripting/lua.?pp
2014-06-25 10:40:10 -04:00
Chris Beck
6f08d88526
fixup includes
2014-06-25 10:23:00 -04:00
Chris Beck
58d5b36724
fixup includes
2014-06-25 10:18:43 -04:00
gfgtdf
e47e66e672
Merge pull request #223 from gfgtdf/unit_advancements
...
don't ignore [advancement] on unit construction.
2014-06-25 15:55:36 +02:00
aquileia
d895f7d095
Update l10n-track
...
As per AI0867's request, the deletions of all old map overlays and the
addition of new ones for the German translation now are registered in
l10n-track.
[ci skip]
2014-06-25 15:40:36 +02:00
aquileia
74cb12eea0
German translation: Map overlays
...
Full set of the mainline campaign map overlays.
[ci skip]
2014-06-25 15:40:36 +02:00
aquileia
d5761df10b
German translation: Minor progress on EI
...
Furthermore, minor changes to the German HttT and TRoW translations to match the map overlays.
[ci skip]
2014-06-25 15:40:36 +02:00
aquileia
54218c8729
Remove all old style bigmap overlays but the titlescreen
...
Without the corresponding maps, the overlays are completely unnecessary.
The titlescreen is preserved for UMC use - all other cases are from
campaigns and aren't guaranteed to be included with the game.
[ci skip]
2014-06-25 15:40:35 +02:00
aquileia
f97ee90a82
Map localization: Remove duplicate old generation overlays
...
For those languages where new overlays are available, we don't need
to keep the old ones.
[ci skip]
2014-06-25 15:40:35 +02:00
Elvish_Hunter
9fd8ba5ef9
wmllint GUI: now the focus follows the mouse pointer, allowing use of the mouse wheel on the disabled Text widget
2014-06-25 14:54:56 +02:00
Elvish_Hunter
0ac30c7d0e
Replaced the old description for wmllint_gui with the new one for GUI.pyw
2014-06-25 14:54:56 +02:00
Elvish_Hunter
ebb4a80f46
wmllint GUI: fixed a bug on Python 2.7.7 that froze the application on Windows
2014-06-25 14:54:56 +02:00
mattsc
7e84df7f6c
Update Xcode project
2014-06-25 05:49:59 -07:00
mattsc
d2699280b4
Update Xcode project
2014-06-25 05:33:48 -07:00
Nils Kneuper
17553ffc15
updated German translation
2014-06-25 14:02:23 +02:00
Alexander van Gessel
3f27d381d5
Merge pull request #192 from pjackowski/master
...
Polish translation update
2014-06-25 11:07:36 +02:00
Alexander van Gessel
5ca7121822
Merge pull request #216 from Rift-Walker/scenario_era_mod_defines_mergable
...
Add define functionality to scenarios, eras, and mods
2014-06-25 09:20:38 +02:00
Chris Beck
198b89b61f
fixup includes in commandline_options
2014-06-25 02:16:23 -04:00
Chris Beck
3e07048530
fixup includes in actions/undo.cpp
2014-06-25 01:54:50 -04:00
Chris Beck
da7280366c
remove unnecessary includes from registry.cpp
2014-06-25 01:39:58 -04:00
Chris Beck
8cee306a27
fixup includes in ai/manager.?pp
2014-06-25 01:38:36 -04:00
Chris Beck
c6988fddc2
fixup includes of lua ai headers
2014-06-25 01:28:07 -04:00
