55680 Commits

Author SHA1 Message Date
Ignacio R. Morelle
d6d2d2a9ff Update changelogs 2014-02-19 06:39:52 -03:00
Ignacio R. Morelle
1ce9448b1e theme ui: Add descriptions to the user-visible mainline themes 2014-02-19 06:39:51 -03:00
Ignacio R. Morelle
a9c93201c8 theme ui, gui2/ttheme_list: New theme chooser, implement [theme] description
Adds a new 'description' attribute to [theme] and replaces the previous
instance of gui2::tsimple_item_selector used to select themes with a
brand new dialog (that's actually based on it) that allows for
displaying theme descriptions in a nice format.

Because some of the theme names aren't obvious enough to players
("UnitBox" comes to mind), we ought to provide descriptions of each
theme to save people some clicks since it's not possible at the
moment to switch the theme mid-game and see the results immediately.
2014-02-19 06:39:51 -03:00
Ignacio R. Morelle
eadb22f67b gui2/tlabel: Add gold_small variation 2014-02-19 06:39:51 -03:00
mattsc
a48ce6dff2 SotBE S18: make gryphons attack right after moving in 2014-02-18 12:08:32 -08:00
mattsc
5a7de1e4ac SotBE S18: have gryphons open a gap for Kapou'e
… so that the first turn is not as luck dependent as it was before.
2014-02-18 11:49:12 -08:00
ln-zookeeper
27be7b8ae0 Merge branch 'master' of https://github.com/wesnoth/wesnoth-old 2014-02-18 19:39:36 +02:00
ln-zookeeper
5a5368d6f0 Fixed some variables not being cleared 2014-02-18 19:39:22 +02:00
Ignacio R. Morelle
9386e95438 Update RELEASE_NOTES 2014-02-18 14:37:53 -03:00
ln-zookeeper
34181ce220 Fixed screwup in previous commit. 2014-02-18 17:55:19 +02:00
ln-zookeeper
5ef6980507 Further rework of 'Capturing the Ogres'. 2014-02-18 17:26:05 +02:00
mattsc
521f449c2b Merge pull request #97 from cbeck88/location_set_empty
fix logic error in location_set:empty
2014-02-17 19:26:15 -08:00
mattsc
7428db5c24 Update changelog with MP era config access in Lua by iceiceice/cbeck88 2014-02-17 19:23:35 -08:00
cbeck88
7bcd9cb1af Update changelog 2014-02-17 22:13:50 -05:00
cbeck88
acbe949e09 Update changelog 2014-02-17 16:26:28 -05:00
mattsc
56c458b2ff SotBE S17: balancing adjustments to turns, gold, income 2014-02-17 13:12:52 -08:00
mattsc
17d447fa6a SotBE S17: start schedule at morning, not dawn
Makes it a little harder for the player that way in combination with
the other changes.
2014-02-17 13:12:52 -08:00
mattsc
16e71c2b9d SotBE S17: decrease enemy AI aggression during nighttime 2014-02-17 13:12:52 -08:00
mattsc
49afab28d9 SotBE S17: make the enemy AI leader passive
… so that one cannot make him leave his keep suicidally.
2014-02-17 13:12:52 -08:00
mattsc
1c96f82f27 SotBE S17: some tweaks to AI reinforcement events
Change their number, timing and order of messages.  Also put units out
there first, then show the messages.
2014-02-17 13:12:51 -08:00
mattsc
a9b7424e17 SotBE S17: scroll to location where reinforcements appear 2014-02-17 13:12:51 -08:00
mattsc
70f120c96a SotBE S17: make reinforcements appear at southern edge of map
… rather than some hexes north of the edge.
2014-02-17 13:12:51 -08:00
mattsc
ca1952c043 SotBE S17: make all the guards loyal 2014-02-17 13:12:51 -08:00
Chusslove Illich (Часлав Илић)
f063fb4936 Updated l10n-track. 2014-02-17 21:37:00 +01:00
Chusslove Illich
413be729a3 Merge pull request #91 from gunchleoc/master
gd Map overlays for AOI, TSG
2014-02-17 21:35:16 +01:00
anonymissimus
d01e212391 vc project update 2014-02-17 20:48:54 +01:00
GunChleoc
0997271639 Fixed gd map overlays for AOI, TSG 2014-02-17 09:45:36 +00:00
GunChleoc
4d57d19e8c Added gd map localization for HTTT and fixed exported .png overlays for other gd campaign maps. 2014-02-17 09:27:02 +00:00
GunChleoc
bd3061e78b Merge branch 'master' of https://github.com/wesnoth/wesnoth-old.git 2014-02-17 09:13:17 +00:00
Alexander van Gessel
bbe459927f Add a missing space 2014-02-17 05:28:25 +01:00
Chris Beck
9fb47d7f1f negate the output of location_set:empty, fixing logic error and
ensuring that a boolean value is returned
2014-02-16 19:36:09 -05:00
Elias Pschernig
ae3697d4e8 [wesnoth_addon_manager] Also upload sub-sections from the .pbl. 2014-02-16 23:08:26 +01:00
Boldizsár Lipka
d62fbe59fd Clean up scale_surface to use only BLI on the Pandora too. 2014-02-16 23:35:20 +01:00
Elias Pschernig
10df18d7cf [wesnoth_addon_manager] Upload everything in the _server.pbl
There was no reason to filter the list of attributes, anything found in the _server.pbl is now also passed on to the addon server.
2014-02-16 21:12:34 +01:00
Nils Kneuper
e6a15a68aa updated UI description 2014-02-16 14:57:31 +01:00
Nils Kneuper
5f4f1f2bc2 redid screenshots to allow complete description 2014-02-16 14:05:08 +01:00
Nils Kneuper
9295c49b7b pot-update and regenerated doc files 2014-02-16 13:55:26 +01:00
Chusslove Illich (Часлав Илић)
d04b1ba8de Updated l10n-track. 2014-02-16 13:50:37 +01:00
Nils Kneuper
c3bbef109d Merge branch 'master' of github.com:wesnoth/wesnoth-old 2014-02-16 13:47:35 +01:00
Nils Kneuper
f6e42f3bf6 removed old screenshots from manual 2014-02-16 13:47:11 +01:00
Nils Kneuper
93ef14dc3e updated screenshots for manual, part2
* created new screenshots
* wired in screenshots in manual.txt
* updated README to reflect latest version
2014-02-16 13:46:00 +01:00
Nils Kneuper
ff7547cc11 updates of ingame manual, part 1
* removed undergound illuminated image since it is not described in the
text
* updated description for orbs
* updated screenshots for orbs
2014-02-16 13:41:42 +01:00
Nils Kneuper
b609e59a92 updated ingame help screenshots and description of orbs 2014-02-16 13:38:53 +01:00
Ignacio R. Morelle
f29d8cf1a2 preprocessor: Don't indent the immediate location of a preprocessor error
Reverts the second portion of 95bcf34133e84d1333301d81b640f447553f6820
in a way (we still want it on a new line) for consistency with commit
996b31def547be7a093b699ec84c0581208308b9.
2014-02-16 07:53:08 -03:00
Ignacio R. Morelle
996b31def5 parser: parser::error() now takes the position message format as an argument
The optional argument allows us to specify a nicer and more relevant
position message format for the two parser errors that involve more than
one file location: missing closing tags (expected location and opening
location) and invalid closing tags (opening location and (invalid)
closing location).

This makes it easier to tell what's going on even when confronted with a
kilometric preprocessor brace-substitution trail, e.g:

> Found invalid closing tag [/tag2] for tag [tag1]
> Opened at ~add-ons/My_Add-on/scenarios/24.cfg:1090
>     included from ~add-ons/My_Add-on/scenarios/24.cfg:120
>     included from ~add-ons/My_Add-on/_main.cfg:42
>     [...]
> Closed at ~add-ons/My_Add-on/scenarios/24.cfg:1098
>     included from ~add-ons/My_Add-on/scenarios/24.cfg:120
>     included from ~add-ons/My_Add-on/_main.cfg:42
>     [...]

Some day we will be able to make it easier to handle these situations by
ensuring the trail format is concise and relevant, but that day will not
come before 1.13.0. Messing further with the main ::lineno_string()
function (in preprocessor.cpp) would be risky at this point with 1.12.0
approaching.
2014-02-16 07:46:44 -03:00
Ignacio R. Morelle
6eb2e7346c parser: Refactor to pass translated STL strings to parser::lineno_string()
Passing translated strings instead of translatable strings makes a bunch
of things easier:

 * We don't need to worry about forgetting to call gettext _() in
   lineno_string() (which, as a matter of fact, I forgot to do for
   hint_string, oops)
 * We can append and preprend stuff to the *translated* strings before
   passing to lineno_string() without breaking localization! Woo!

Using STL strings instead of C strings also makes things easier and
prettier. The negligible performance impact shouldn't be a concern here
because landing in parser::lineno_string() or parser::error() is a
worst-case situation since it only happens when the parser encounters an
error and cannot continue.

Also, parser::lineno_string() now takes an optional fifth argument
with the tokenizer state message to append to the end of the full
message and trail. We need that for the next commit.
2014-02-16 07:46:44 -03:00
Chusslove Illich (Часлав Илић)
ba30b70fbe Updated l10n-track. 2014-02-16 11:33:20 +01:00
Ignacio R. Morelle
8afb87e58b parser: Refactor the migraine-inducing parser::error() implementation a bit
Reading so many parentheses and string literals in the same expression
is killing my brain and I'm not done with this code yet.
2014-02-16 06:54:25 -03:00
Nils Kneuper
9b36ef3207 fix the issue with cmake adding -NDEBUG 2014-02-16 10:45:08 +01:00
Ignacio R. Morelle
4f243644cb Update utils::indent()'s documentation for factual accuracy 2014-02-16 05:58:02 -03:00