47775 Commits

Author SHA1 Message Date
Fabian Müller
06a49792e9 Reverted commit 51664 restoring bug# 17232,
and hopefully closing #18868.
2011-10-27 14:41:34 +00:00
Anonymissimus
25eb66c803 changelog update 2011-10-27 14:16:49 +00:00
Anonymissimus
1656cb48f6 make lua expect [display] to be handled by C++ 2011-10-27 14:16:33 +00:00
Anonymissimus
d6ac51d4fb save and reload [color_adjust] values (fix for bug #18676) 2011-10-27 14:16:17 +00:00
Anonymissimus
56ffd2f2cd make display::color_adjust_red_, green_ and blue_ private
No references require them to be protected.
2011-10-27 14:16:00 +00:00
Anonymissimus
70ad025577 SigurdTheDragon -> SigurdFireDragon at his request 2011-10-27 14:15:21 +00:00
Steven Panek
8062907d42 Made a string more accurate. 2011-10-27 13:50:52 +00:00
Simon Forsyth
58f1f7e759 Simplify terrain string for small forest list 2011-10-27 12:56:46 +00:00
Simon Forsyth
9d84b0f5ad Use sparse forest on mountains 2011-10-27 12:54:09 +00:00
Ignacio R. Morelle
4fa6a776dd gui2/teditor_settings: Make this dialog tidier
* Rearranged most widgets

* Switched to the Dreaded Title Case from Hell in checkboxes and
  labels (because the wiki says so)

* Changed the wording in some labels

* Removed mention of "MDI", a UI design technicism which users do not
  really care about and only makes things more difficult for translators
2011-10-27 08:56:17 +00:00
Elvish_Hunter
4591619ada Added support to [harm_unit] and [find_path] 2011-10-27 08:26:33 +00:00
Ignacio R. Morelle
42c6e92679 gui2/teditor_settings: Remove unused WML macros 2011-10-27 06:28:23 +00:00
Ignacio R. Morelle
281e48942f gui2/teditor_settings: Made sure lighting setting changes...
...are applied immediately when closing settings

Formerly they'd only have an effect when automatic map view updates were
enabled, or when opening the settings dialog again, or when toggling
presets.
2011-10-27 06:19:49 +00:00
Ignacio R. Morelle
11a57483b8 gui2/teditor_settings: Disable sliders on pre_show...
...when custom lighting isn't in use

Sliders are normally disabled when custom lighting is, when the dialog
is running. A missing function call solves the pre_show inconsistency.
2011-10-27 06:09:06 +00:00
Steven Panek
703fcc976c Replaced a village with a village overlay...
...since the temple image is overlaid onto the hex in question.
2011-10-27 04:57:31 +00:00
Steven Panek
60a7fd6d61 Updated the changelog. 2011-10-27 01:45:26 +00:00
Steven Panek
ef47264303 Alias en_PH to en_US. 2011-10-27 01:37:31 +00:00
Steven Panek
2f22255048 Changed the locale= and alternates= key for realz. 2011-10-27 01:19:17 +00:00
Simon Forsyth
417f18117d place beach macros by each other to make relationships clearer 2011-10-27 01:18:30 +00:00
Steven Panek
6bdbe4893f Merged the C locale into the en_US one; aliased C to en_US. 2011-10-27 01:17:02 +00:00
Fabian Müller
6216382d4c Added support for en_US translations. 2011-10-27 00:35:50 +00:00
Fabian Müller
81433c22f7 Fix bug #17323 2011-10-26 23:59:08 +00:00
Simon Forsyth
ed9db5e488 add myself as a Mac OS packager 2011-10-26 23:38:39 +00:00
Steven Panek
675bf84fa2 Give Ratheln the loyalty icon after the hero icon is removed from him. 2011-10-26 20:35:44 +00:00
Steven Panek
355bcae346 Allow undo move to village...
...if the village has already been cleared or if no bandits are spawned.
2011-10-26 19:17:37 +00:00
Anonymissimus
d872a67bae delete a word which obviously doesn't belong there 2011-10-26 17:27:36 +00:00
Anonymissimus
883354251f move a changelog entry claiming a fix to where it was actually fixed 2011-10-26 17:27:19 +00:00
Anonymissimus
2b71c291af code blocks projectfile update 2011-10-26 17:27:02 +00:00
Anonymissimus
4e974060d6 visual studio projectfile update 2011-10-26 17:26:05 +00:00
Fabian Müller
26e3785ea9 Fixed the Tutorial not proceeding with instructions...
...in case the Elvish Fighter send out to the eastern village is quick.
2011-10-26 16:22:05 +00:00
Alexander van Gessel
711b1bc6fa Don't mask built-in functions. 2011-10-26 16:27:24 +01:00
Ignacio R. Morelle
e7c40c615a Forgot to mention why this is relevant for WML coders 2011-10-26 09:02:05 +00:00
Ignacio R. Morelle
3eae602c53 Fix bug #18766 by removing some half-assed...
..."recursion prevention" bullshit I devised back in 2008

A static counter variable wasn't being reset, ever, so a number of
version comparisons during a single session would make the code stop
working.

The basic idea is idiotic and I should probably rewrite this code ASAP.
2011-10-26 08:59:53 +00:00
Ignacio R. Morelle
c172397877 Move struct addon_info to its own header file
(requires no implementation, it will be shared by upcoming code)
2011-10-26 01:11:06 +00:00
Ignacio R. Morelle
cec8fca6c7 gui2/tsimple_item_selector: Set maximum dialog height to 600 2011-10-26 00:43:34 +00:00
Ignacio R. Morelle
01f1145f94 Tutorial: clear floating text on defeat 2011-10-25 21:46:41 +00:00
Ignacio R. Morelle
4e0a4b63f0 Make the Troll Shaman use the new Fire Blast attack icon 2011-10-25 21:36:48 +00:00
Ignacio R. Morelle
ed2175fa04 Make the Royal Warrior use the fancier mace icon used by HIs 2011-10-25 21:27:21 +00:00
Ignacio R. Morelle
8da148dfcb Enable recoloring of the Elder Mage's unused TC pixels 2011-10-25 21:15:10 +00:00
Ignacio R. Morelle
cdc260eaa6 Make L2/L3 Khalifate units use the fancier longsword attack icon 2011-10-25 21:12:45 +00:00
Ignacio R. Morelle
b383c65737 Hadaf, Qanas: fix missing ranged attack animations 2011-10-25 21:02:36 +00:00
Ignacio R. Morelle
01d378a72d Changelog update 2011-10-25 20:52:36 +00:00
Ignacio R. Morelle
31fd6bdaa4 Make the Khaiyal unit and Faris line...
...use the same sounds and timing as the Default Lancer for their
lance attack
2011-10-25 20:49:36 +00:00
Ignacio R. Morelle
7a39f6cac5 Make the Falcon line use spear.ogg, not spear.wav, and adjust timings 2011-10-25 20:49:15 +00:00
Ignacio R. Morelle
b3f735cd27 Make the Naffat line's melee animations longer (-200..-100 -> -200..200) 2011-10-25 20:40:32 +00:00
Ignacio R. Morelle
1b8f5c358d Give all Khalifate units proper defense animations...
...using baseframe placeholders and remove unrecognized (obsolete) WML
2011-10-25 20:37:53 +00:00
Mark de Wever
b9da475424 Avoid copying a singular iterator.
Found a better way to avoid copying singular iterators.

Gabba, tschmitz please review the code and if it's correct it should be
save to revert 2011-10-23T17:48:59Z!koraq@xs4all.nl.
2011-10-25 19:31:45 +00:00
Mark de Wever
c1c40064eb Fix compilation with clang 2.9 / boost 1.47.
This applies a slightly modified version of the patch linked in
bug #18399. The changes are coding-style related.

The patch was intended to fix compilation with boost 1.47, but that
boost version is not yet in Debian so didn't test that part. Since it
does fix compilation with clang 2.9 Iapplied it, without waiting for
boost 1.47 to hit Debian.
2011-10-25 19:31:42 +00:00
Steven Panek
0a1a7ccefd Made it so that Tallin's moves are actually restored;...
...ensured that Tallin gets the right ellipse image set after
transformation.
2011-10-25 17:07:13 +00:00
Anonymissimus
4345f5ea75 added helper functions for starting and stopping wml variable scopes
Usage for "this_unit" in modify_unit, harm_unit and find_path.
2011-10-25 16:52:18 +00:00