54415 Commits

Author SHA1 Message Date
fendrin
280a005bd4 Highres icons for unit and zoomdefault actions. 2013-11-27 02:16:14 +01:00
fendrin
f5cdb19149 A theme for the open pandora handheld device (800x480) 2013-11-27 02:16:14 +01:00
Ignacio R. Morelle
f23ef1672a gui2/tgame_save_oos: Remove wrap attribute not accepted by scroll_label 2013-11-26 19:30:39 -03:00
Bär Halberkamp
fb36b15a6a Added the portrait variations to the HTTT code 2013-11-26 20:06:25 +01:00
Bär Halberkamp
2da8f8b603 Unified naming for the Delfador portrait variations 2013-11-26 20:06:25 +01:00
Alexander van Gessel
ffc68170fe Merge branch 'unit_map_fixes' 2013-11-26 19:22:08 +01:00
Alexander van Gessel
842e4c15ed Fix indentation 2013-11-26 18:05:04 +01:00
mattsc
f5a842352a SotBE S5: make one of the AI leaders a Death Knight
This is mostly just for variety, but gives the player the option to use
different units types more effectively against one leader than the
other.
2013-11-26 08:19:17 -08:00
mattsc
63e7b16c8b SotBE S15: add some road hexes to western part of map
This has negligible effect on the fighting, but means that Kapou'e
doesn't have to spend many turns drudging through difficult terrain to
get to the signpost at the end of the scenario (if he was involved in
the fighting).
2013-11-26 08:07:08 -08:00
mattsc
2139e1d0d0 SotBE S16: eliminate dependence on luck at scenario start
The difficulty of the scenario depended too much on the success of a
small number of attacks, on whether the player succeeded in killing
one, or even both, of the close enemy leaders on the first turn.
Now, Kapou'e has his own keep, out of reach of the two close enemy
keeps.  Minor changes going along with this are making the two AI
leaders warriors (instead of grunts) and not allowing wolves as
replacements for Jetto and Inarix.
2013-11-26 07:56:37 -08:00
mattsc
8c174aa598 SotBE S8: use healer Micro AI for AI sides 2013-11-26 06:55:05 -08:00
mattsc
6f426eacd5 SotBE S8: give the elves most of the villages at scenario start 2013-11-26 06:54:33 -08:00
Alexander van Gessel
a3d1ee7177 unit_map cleanups 2013-11-26 15:40:07 +01:00
mattsc
0977ac2da5 SotBE S7: don't activate bandits until orcs get close 2013-11-25 20:29:35 -08:00
mattsc
754d77bd6d SotBE S7: give side 2 all villages around oasis at start 2013-11-25 20:28:19 -08:00
mattsc
5935ba22df Strip trailing whitespaces 2013-11-25 19:55:06 -08:00
mattsc
f3535c3a4f SotBE S7: use Simple Attack Micro AI to spread poison 2013-11-25 19:37:21 -08:00
mattsc
ffbf2c2891 Simple Attack MAI: add optional parameter 'weapon' 2013-11-25 19:37:20 -08:00
mattsc
ea915d36c2 battle_calcs.attack_rating: bug fix for when AI side has no leader
Check for AI side's leader's existence before trying to calculate
distance from leader.
2013-11-25 19:37:20 -08:00
Alexander van Gessel
a8171d07a0 Turn a config const* into config const*& so assigning to it is meaningful 2013-11-25 23:57:13 +01:00
Andrius Silinskas
6b4ab7c3bc Partially revert be398487ea4d6b8b53cb4e1174f051a74672ebd3.
Fixes bugs #21278 and #21291.
2013-11-25 22:27:37 +00:00
Alexander van Gessel
18c29da7d9 Merge branch 'master' into unit_map_fixes 2013-11-25 22:32:13 +01:00
Alexander van Gessel
8a88f5bb59 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-11-25 20:31:41 +01:00
Alexander van Gessel
28f03f07f0 changelog update 2013-11-25 20:24:57 +01:00
Alexander van Gessel
255504870d Add side filters to [scroll_to] and [scroll_to_unit] 2013-11-25 20:23:54 +01:00
Nils Kneuper
5962d41406 updated Chinese (traditional) translation 2013-11-25 19:43:52 +01:00
Alexander van Gessel
008550e9f2 Comment out unused argument 2013-11-25 19:31:27 +01:00
Alexander van Gessel
e16bf37424 Include map 2013-11-25 17:37:29 +01:00
Alexander van Gessel
6e9872ca0b Restore underlying_id-based ordering for unit_map
This is done by turning the umap back into an ordered map,
getting rid of ilist and making lmap point to umap iterators.
2013-11-25 17:10:46 +01:00
mattsc
78ac0fb562 Update changelog 2013-11-24 18:50:54 -08:00
mattsc
f2e7cfae43 Reset rng random_calls counter when resetting replays
If this is not done, random_calls continues from where it was in the
previous play through the replay, which results in everything being out
of sync.
2013-11-24 15:37:22 -08:00
gfgtdf
8cc26f8082 use NULL instead of 0 for pointer types. 2013-11-24 23:30:51 +01:00
mattsc
071b7550f9 Sync unit names in games (MP and SP) and replays
Otherwise units have different names for the different players in an MP
game and names are different between playing the game and the replay.
That (old) behavior can also cause OOS errors.
2013-11-24 10:04:21 -08:00
mattsc
8305519b2d Sync unit genders in games (MP and SP) and replays
If this is not done, MP games and replays can produce OOS errors, for
example if an event depends on the unit gender.
2013-11-24 10:01:43 -08:00
Ignacio R. Morelle
bdb3e25140 gui2/tgame_save_oos: Use scroll_label instead of label for the main text
This makes it so very long messages do not cause the whole window to
gain a scrollbar.
2013-11-22 18:53:43 -03:00
mattsc
2309ee15e0 Replays: disable the play/stop buttons after end of replay
The diverse play buttons and the stop button should be disabled when
the end of the replay is reached (which is also how it is in 1.10).
Other replay buttons remain active.
2013-11-21 12:34:18 -08:00
mattsc
2cb96755e4 Replays: add prestart and start events back into replays
This requires saving the replay_start gamestate before the prestart
event (as opposed to after the start event) and enabling execution of
the events in replays again.
2013-11-21 12:20:43 -08:00
mattsc
3bfbf58097 Set WML variable turn_number correctly in [pre]start events
There is a C++ function turn() which has value 1 during prestart and
start events.  The same is the case for wesnoth.current.turn in Lua.
By contrast, WML variable turn_number was not updated until after the
start event, resulting in it either being undeclared or containing
whatever the previous value was (such as the last turn number of the
previous scenario).  Now it behaves the same as turn() and
wesnoth.current.turn.
2013-11-20 14:24:52 -08:00
mattsc
0ea4685636 SotBE S10: move objectives from 'prestart' to 'turn 1' event
... so that the first objective is displayed correctly as turn_number
still has the value of the previous scenario's last turn during
prestart and start events.
2013-11-19 13:52:57 -08:00
mattsc
1532d8f2b6 SotBE S6: unload units from galleons preferentially onto land hexes
This is done in Lua, so that it can easily be integrated into the AI
once the AI functionality for synced commands has been committed.
2013-11-19 08:38:08 -08:00
mattsc
4bfd2240e2 Tooltips: ensure that 'use_markup' is always passed by add_tooltip()
Not all parts of add_tooltip() did so previously, resulting in pango
markup of tooltips not always working.  For example, in some cases it
only worked for tooltips on the first mouse-over, but not on subsequent
ones.  That is fixed now.
2013-11-18 18:03:01 -08:00
fendrin
8607866d12 Fix bug #21282 2013-11-19 00:58:39 +01:00
fendrin
6fe2267f80 New default terrain using the new artwork. 800x480 still broken. 2013-11-19 00:58:39 +01:00
fendrin
77321c56c6 New macro for status boxes. Replaced replay ui toolbar image. 2013-11-19 00:58:39 +01:00
fendrin
1d216319bc Save some gui space by removing the parenthesis around the terrain info. 2013-11-19 00:58:39 +01:00
Bär Halberkamp
c9a28f977b Fixed the conflicts 2013-11-18 22:32:54 +01:00
Bär Halberkamp
623d752952 Merge branch 'fix/text/typographic-apostrophes/1' of https://github.com/8573/wesnoth-old
Conflicts:
	data/lan_server.cfg
2013-11-18 22:28:37 +01:00
Bär Halberkamp
f85922d5d8 Merge pull request #83 from 8573/fix/text/lan-server-motd-spelling-and-capitalization/1
Fix two textual errors in data/lan_server.cfg.
2013-11-18 13:18:44 -08:00
8573
ef73e1d08c Fix straight apostrophes in player-visible text.
Fix four instances — one in The Rise of Wesnoth’s dialog, two in the
ogre race description, and one in the “LAN server” “motd” — of the
straight apostrophe (U+0027 ' APOSTROPHE) being used in player-visible
text, where the typographic apostrophe (U+2019 ’ RIGHT SINGLE QUOTATION
MARK) ought to be used instead.
2013-11-18 00:58:56 +00:00
8573
c1c661ed1f Fix two textual errors in data/lan_server.cfg.
Fix two minor textual errors in the value of the `motd` attribute in
data/lan_server.cfg:

* “Wesnoth” was not capitalized when it ought to have been capitalized.

* “shutdown” was used as a verb. “shutdown” is a noun; the verb is “shut
  down”.
2013-11-18 00:58:55 +00:00