21534 Commits

Author SHA1 Message Date
gfgtdf
612f0960a3 attempt to fix wml parsing error in TRoW scenario 22 2015-12-10 23:24:13 +01:00
gfgtdf
7f13156c28 Revert "Rename team_name/user_team_name to team_id/team_name (old syntax still valid)"
And related commits.

This reverts commit 545253ec2b117b413e7ef40e06e65d358ce20f77.
This reverts commit 1215f65eb875cc3070e8d087ce699c0a2ff8d8b0.
This reverts commit 11664f4024cb760de7db5fec54661cd14fc05ac8.
This reverts commit e948df3424657c5843b1fb65a1319449bb6311bc.
This reverts commit 3781e7839f29915292a2452c37b08a1e1fce9841.

This commits were reverted to exclude them from wesnoth 1.13.2 release because:
1) We are still unsure about the best name oftthese attributes
2) This breaks multiple campaigns, including LoW and the tutorial.
Feel free to revert this revert after 1.13.2 when thse issues can be solved..
2015-12-10 21:29:52 +01:00
gfgtdf
ab1a4629a9 rename [filter] -> [filter_location] in [random_placement] 2015-12-10 01:43:32 +01:00
ln-zookeeper
5147bcd6df Added replacement for "Frantic" by TreizeCouleurs 2015-12-10 01:31:53 +02:00
ln-zookeeper
1ab550cd19 Renamed frantic.ogg to frantic-old.ogg 2015-12-10 01:29:32 +02:00
gfgtdf
0241f5687e fix failing lua_get_sides test 2015-12-09 02:26:39 +01:00
gfgtdf
442a2292a2 fixup removal of [side]name= 2015-12-08 14:52:20 +01:00
Celtic Minstrel
e88ca4bd33 Fix deprecated use of wesnoth.put_unit in test scenario 2015-12-07 20:06:39 -05:00
gfgtdf
f329b1e431 fixup random_placement patch 2015-12-08 01:13:14 +01:00
gfgtdf
a9f141c58e fixup SCATTER_UNITS
was broken in 9d656ad755
2015-12-07 22:40:26 +01:00
gfgtdf
9d656ad755 update [randon_placement]
removes use_delay: one could easily use [delay] inside [command] so
there is no reason to have that there.
changes 'radius' -> 'min_distance'
removes a debugging message
2015-12-07 22:31:56 +01:00
gfgtdf
5db889eb14 reset variable after [random_placement]
none of the usecases found in mainline or in UMC use that variable
afterwards so there is no reason to keep it.
2015-12-07 21:49:15 +01:00
gfgtdf
2a0c24e12f use [random_placement] in some mainline scenarios. 2015-12-07 21:49:12 +01:00
gfgtdf
dc786dc181 add tag [random_placement]
and use it to implement SCATTER_IMAGE,SCATTER_EMBELLISHMENTS and
SCATTER_UNITS
2015-12-07 21:49:09 +01:00
Charles Dang
4a76986762 Experimental Lobby: fixed some broken image paths 2015-12-07 02:27:50 +11:00
Charles Dang
523d14d261 Fixed spelling of 'focused' in data 2015-12-04 18:56:05 +11:00
gfgtdf
f5d1332e1d more LoW cleanups 2015-12-03 01:39:07 +01:00
gfgtdf
6e6fc464b2 more LoW cleanups 2015-12-03 01:39:04 +01:00
gfgtdf
ebbbd49024 more LoW fixes 2015-12-03 01:39:00 +01:00
gfgtdf
739324013e more LoW fixes 2015-12-03 01:38:56 +01:00
aquileia
88d4c15c87 Exclude test strings from gettext 2015-12-02 00:37:14 +01:00
aquileia
5adfa80eed Unify khalifate unit plural forms
Noted by Chewan
2015-12-02 00:36:53 +01:00
aquileia
4f7ad480f3 German translation update
Authored by Chewan, proof-read and amended by aquileia and chber.

Includes a fix by Dennis_ for the steadfast ability, see
http://r.wesnoth.org/t43237

Based on 0d5c50a7 (1.12 branch) but slightly expanded.
2015-12-02 00:36:34 +01:00
gfgtdf
76da10bd44 split early finishing bonus between players in LoW 2015-11-30 03:10:16 +01:00
gfgtdf
d755d3b820 add [endlevel] bonus=number
instead of bonus=yes/no you can also pass a number, so bonus=0.5 will
give you only half of the bonus gold.
2015-11-30 02:49:08 +01:00
gfgtdf
15df645d02 More LoW cleanups 2015-11-30 02:49:04 +01:00
gfgtdf
91943451c7 move most of [endlevel] implementation to lua
as a side effect we get read/write fields
side.carryover_bonus/carryover_add/carryover_percentage in lua sides.
2015-11-30 02:49:01 +01:00
gfgtdf
554547beac more LoW cleanups 2015-11-30 02:48:57 +01:00
gfgtdf
9bc839e6b1 more LoW clenaups 2015-11-30 02:48:54 +01:00
gfgtdf
d8c679c5db make allied human side sides 2,3,4 in scenario 6,9,10,11 in LoW
this was already done in the other scenarios.
2015-11-29 17:18:03 +01:00
gfgtdf
da163512f9 fix mp connect beeing shown before LoW scenario8 2015-11-29 17:17:57 +01:00
gfgtdf
a3bc17a9fe more LoW cleanups 2015-11-29 17:17:55 +01:00
Charles Dang
f3003cf83a LoW: small fixup to 1e45c14e6825 2015-11-28 12:08:42 +11:00
gfgtdf
816df4d706 more LoW cleanups 2015-11-28 02:03:03 +01:00
Charles Dang
f751739aea Manually reapply 730453cf01c242b 2015-11-28 09:18:57 +11:00
Charles Dang
691c4c4ae4 Manually reapply a1e66d6f2a4ca 2015-11-28 09:18:56 +11:00
Charles Dang
9f8b702828 Manually reapply 376ffc16efd1c36 2015-11-28 09:18:55 +11:00
Charles Dang
adb894dd21 wmlindent pass 2015-11-28 09:18:54 +11:00
Charles Dang
1e45c14e68 Manually reapply d6c67db110b6ed37 2015-11-28 09:18:54 +11:00
Charles Dang
498a79060e LoW: moved North Elves common village setup into a file 2015-11-28 09:03:26 +11:00
gfgtdf
fe3adedcf6 more LoW cleanups 2015-11-27 22:18:31 +01:00
gfgtdf
6d47bd0780 LoW cleanups
removed attributes that were already defined by the {PLAYABLE} macro.
2015-11-27 21:09:22 +01:00
gfgtdf
59233ce903 attempt to fix bug in [message]
previously this bug http://i.imgur.com/9B7bquA.png happend in LoW scenario3.
2015-11-27 18:13:07 +01:00
gfgtdf
be68ebc0a7 merge LoW from 1.12 into master
This commit manually merges all LoW commits from the 1.12 branch into
master.

This might revert some 1.13 commits which i wasn't able to merge
correctly.
2015-11-27 17:17:53 +01:00
Ignacio R. Morelle
9d85887ed1 Add [remove_time_area] and allow [time_area] remove=yes to take an id list
[remove_time_area] is syntatic sugar but it's used to implement
[time_area] remove=yes now, just like [remove_event]/[event].
2015-11-26 22:38:03 -03:00
gfgtdf
8a04442ce2 Fix Low Carryover
http://gna.org/bugs/?23674

We don't want to use the units and gold stored in the global variables if we already get them from normal carryover becasue that results in having them twice.
2015-11-26 21:58:22 -03:00
Ignacio R. Morelle
1aaa341e35 wmllint: Ignore id in [trait] for unit id checks 2015-11-06 00:09:34 -03:00
Ignacio R. Morelle
a7a86fc388 Merge pull request #545 from Wedge009/bug_23023_fix
Properly correct the broken Desert Sands / Oasis help entry (bug #23023)
2015-10-31 20:08:31 -03:00
Ignacio R. Morelle
ba8da92135 Restore executable bit on the WML tools GUI frontend 2015-10-30 02:43:35 -03:00
Ignacio R. Morelle
851eddfd5e Restore executable bit on WML tools 2015-10-30 02:43:02 -03:00