Commit graph

57758 commits

Author SHA1 Message Date
Nils Kneuper
3a4d2121f1 updated Polish translation 2015-03-08 09:51:28 +01:00
Charles Dang
7ee481ca85 Purged some transparent pixels I missed 2015-03-08 03:23:23 +11:00
Charles Dang
70d3aa0657 Improved addon Publish/Delete icons 2015-03-08 03:23:20 +11:00
Chris Beck
f68b05cc63 add a safety check when executing gotos, make sure not lingering
I observed this in 1.12.1+dev mp campaign test somehow... hard to
reproduce but this patch may prevent such a problem, with no
downside.
2015-03-06 19:54:43 -05:00
Chris Beck
bca4894fa0 Update changelog 2015-03-05 15:03:58 -05:00
Chris Beck
e9ba369cc8 Merge pull request #377 from cbeck88/fixup_sliders_1.12
Fixup sliders 1.12
2015-03-05 15:00:17 -05:00
Chris Beck
641b001a92 fix zoom slider focus issue (add a separate class for zoom_slider)
When the slider widget was added to ThemeWML, some work was not
done apparently to make it play nicely with regards to focus and
key events with the other theme wml widgets, causing it to retain
focus for keyboard events indefinitely. At the time this was
resolved by disabling these events, but this cripples the many
other sliders in the game. In this commit we introduce a subclass
zoom_slider which has this functionality disabled, and use that
for zoom sliders, so that we can get the desired functionality
back for the other sliders. See parent of this commit for more
info.
2015-03-05 13:59:32 -05:00
Chris Beck
e1102b394f fix bug #22984: sliders not adjustable with arrow keys
This commit causes sliders to attract focus properly when their
grips are clicked on, and to respond to left and right arrow
presses again. It partly reverts two earlier commits that
affected this functionality.

cf84e1d8aa
49614599fa

It causes the zoom slider to behave slightly badly, because it
does not lose focus when the user clicks elsewhere on the map.
But this bug should be fixed at the source and not by disabling
wanted functionality for all sliders.

Conflicts:
	src/widgets/slider.cpp
2015-03-05 13:59:14 -05:00
Chris Beck
1c1ea67710 update changelog 2015-03-04 15:48:54 -05:00
Chris Beck
1627737166 bug #22936: in mp don't retain local carryover when loading scenario
In 1.12, clients separate carryover information from scenario
information when they are proceeding in a campaign.

Since 1.11.1, a bug was introduced (apparently this commit: d7a35f90)
wherein the clients and host `retain` carryover information in
a separate object from the scenario config, and merge it into
whatever level they recieve from the server. In an mp game, this
means that carryover is applied twice, once by the host when he
uploads the new level, and once again by each of the clients
individually.

Clients in general should not be performing private tweaks to
scenario data, it's better if the host does as much as possible and
the server the rest. In this case, "client-side" carryover update is
wrong because it is not performed by the observers, who only have
the information that was sent to the server.

In this commit we remove the code that causes the non-host clients
to make local copies of this info, and check that the server also
discards its local info after it has uploaded the scenario to the
server.

This commit was tested both on LoW and on a custom test campaign,
see bug tracker for details.
2015-03-04 14:52:06 -05:00
aquileia
6093cea634 Remove WIP drake encyclopedia from translatable files 2015-03-01 14:42:48 +01:00
aquileia
ffea3c524a Update german translation 2015-03-01 13:56:33 +01:00
Nils Kneuper
ddbd01e03a updated German translation 2015-03-01 11:30:06 +01:00
gfgtdf
8590be52b7 Update changelog 2015-02-23 19:38:45 +01:00
gfgtdf
f276e408ad fix OOS when undoing after deactivating DSU
backports 730dcfdd0b
2015-02-23 19:07:38 +01:00
aquileia
bb28225dae Update localized help images 2015-02-20 16:52:52 +01:00
aquileia
6b4ce21fb5 wesnoth-help: German translation update
Mostly by Chewan, proof-read and amended by Crommy and aquilea
2015-02-20 01:32:44 +01:00
aquileia
2ec833e025 Another German translation update
[skip ci]
2015-02-19 01:53:25 +01:00
aquileia
4a797fc54e Minor update to the German translation 2015-02-18 15:34:19 +01:00
Nils Kneuper
8e920cb612 updated Chinese (Traditional) translation 2015-02-13 23:12:50 +01:00
gfgtdf
58acbeaa19 fix replay play button available too soon
https://gna.org/bugs/?23238
2015-02-04 13:50:37 +01:00
Nils Kneuper
f5143225d9 updated Chinese (Traditional) translation 2015-02-01 21:10:36 +01:00
aquileia
449caec62e Replace dragon fire breath animation 2015-01-31 17:38:55 +01:00
Nils Kneuper
88e813d17f updated Chinese (Simplified) translation 2015-01-31 12:00:56 +01:00
aquileia
a0f115db09 Make x-offset of chill wave directional 2015-01-30 15:46:48 +01:00
aquileia
0f12cdbec1 Use base_unit for wose sapling, dwarvish rune lord 2015-01-30 15:45:58 +01:00
aquileia
802978ce9b Move campaign units to their respective textdomain
Even though they solely use strings from wesnoth-units, a uniform style is preferable
2015-01-30 15:45:57 +01:00
aquileia
595cafcef9 Fix c1b25aa4f not to introduce a string 2015-01-30 01:18:31 +01:00
aquileia
807a6ad9d3 TRoW: Autumn Shyde unit for Dionli, sprite by zerovirus
[skip ci]
2015-01-30 01:18:31 +01:00
aquileia
2b366684bc Merge pull request #369 from aquileia/bigmap_12
Bigmaps for TB, DM, NR, THoT and LoW S24
NR dialogue fix
2015-01-30 00:58:49 +01:00
aquileia
b389cab0d3 LoW: Fix track of chapters 3-5
While chapter 3 only skipped one track, leading to an off by one error,
the track of chapter 4 had to be fixed and the SAURIANS track for chapter
5 had to be made completely anew.

[skip ci]
2015-01-28 05:23:00 +01:00
aquileia
c753aa4aaa NR: Fix story formatting by using speech macros everywhere
[skip ci]
2015-01-28 03:31:31 +01:00
Ignacio R. Morelle
862eabb04a pofix: Coalesce imports 2015-01-25 22:01:30 -03:00
Ignacio R. Morelle
b305bd2be4 pofix: Add download path string fixes for the 1.12.1 release 2015-01-25 21:56:16 -03:00
Ignacio R. Morelle
089e18b6be pofix: Read *.html files from the command line 2015-01-25 21:56:16 -03:00
Ignacio R. Morelle
f2b76c5ab1 pofix: Implement -w switch to apply only website-related string fixes
This is intended to be used for applying string fixes for the website
repository without reading the full game string fixes table and avoiding
potential future collisions between both.

Also removed an obsolete entry from 1.10.
2015-01-25 21:56:16 -03:00
mattsc
5d7807063d Xcode project update for 1.12.1
Version number and ingame changelog
2015-01-25 16:50:29 -08:00
aquileia
de3dc93b69 Port NR tracks to the AOI bigmap
[skip ci]
2015-01-25 03:34:57 +01:00
Charles Dang
dbc7499710 THoT S7: specify Master Perrin as male 2015-01-24 23:10:37 +11:00
Charles Dang
532836777a DM: specify Leollyn as male 2015-01-24 23:07:48 +11:00
aquileia
b6a2c4ec16 Port THoT track to the SoF bigmap 2015-01-24 12:32:38 +01:00
aquileia
5c10b9b131 Port TB tracks to the Liberty bigmap 2015-01-24 12:27:53 +01:00
aquileia
f7378ff0e6 Port DM tracks to the HttT bigmap 2015-01-24 12:23:26 +01:00
aquileia
39f57beff2 Fix order of track markers in LoW Cliffs of Thoria
Rearrange some markers for BOOK_STAGE2 and TREASURY_STAGE4, delete three
markers which didn't belong in ALLIANCE_STAGE3.
2015-01-24 12:23:23 +01:00
aquileia
21b86f061d Fix map used in LoW epilogue 2015-01-24 12:23:20 +01:00
Ignacio R. Morelle
37e158733d Bump version 2015-01-23 20:35:45 -03:00
Ignacio R. Morelle
eb0a47a3d2 Version 1.12.1 2015-01-23 18:21:14 -03:00
Ignacio R. Morelle
c935aa8d4c DiD S2: Silence wmllint warnings about unrecognized singular units 2015-01-23 18:19:14 -03:00
Ignacio R. Morelle
57d2088e6b Exempt variation_name in core units from wmllint translation mark check
Needs to be reverted and replaced with real support for variation_id +
variation_name in wmllint (as well as the legacy
variation_name-as-variation_id behavior).
2015-01-23 18:16:07 -03:00
Ignacio R. Morelle
7ac23e20cd wmlindent pass 2015-01-23 18:13:24 -03:00