Commit graph

26230 commits

Author SHA1 Message Date
nemaara
e6dc9ee0e2 DiD S3: dialogue tweaks 2019-02-27 00:36:00 -05:00
nemaara
e56fc7fa9e DiD S3: update map 2019-02-27 00:35:39 -05:00
nemaara
36f4911d8e
Merge pull request #3845 from nemaara/DiD_S2_dialogue
[DiD] S2 revision
2019-02-27 00:05:34 -05:00
nemaara
e8ecdf91f4 DiD S2: tweak ghoul raising scene 2019-02-27 00:04:28 -05:00
nemaara
58987918f1 DiD S2: modified gold values and tweaked dialogue 2019-02-26 23:48:53 -05:00
nemaara
ceafb91fb5
Merge pull request #3841 from nemaara/DiD_S1
[DiD] Dialogue and slight gameplay revisions to S1
2019-02-26 23:39:31 -05:00
nemaara
212577d486 DiD S1: dialogue tweaks 2019-02-26 23:28:26 -05:00
nemaara
3de1a0b58b DiD S1: gameplay tweak 2019-02-26 23:04:54 -05:00
nemaara
79b5fe1d70 EI S7a: require Dacyn to cross the river 2019-02-26 12:57:30 -05:00
nemaara
282a24fffc TSG S5: typo fix 2019-02-26 12:41:10 -05:00
nemaara
098ef9dfd7 TSG S7b: typo fixes 2019-02-26 12:41:09 -05:00
nemaara
549a4d9c74 TRoW: fix Noble Fighter description 2019-02-26 12:41:09 -05:00
nemaara
243179ce24 TRoW S3: punctuation fix 2019-02-26 12:41:08 -05:00
nemaara
c6b68b0bd8 TRoW S2: typo fix 2019-02-26 12:41:07 -05:00
nemaara
36b45949da TRoW S1: typo fixes 2019-02-26 12:41:07 -05:00
nemaara
afad68aebc TRoW S17c: modified Burin's troll description 2019-02-26 12:04:51 -05:00
nemaara
6ee3c16be8 EI S1: removed early finish bonus for fleeing 2019-02-26 02:10:51 -05:00
nemaara
2ead41e7b2
Merge pull request #3883 from nemaara/DW
DW S3: added event for storm trident
2019-02-26 01:57:10 -05:00
nemaara
07770502e0
Merge pull request #3882 from nemaara/atotb
[AToTB] Added castle ToD to S3
2019-02-26 01:29:58 -05:00
Lovens Weche
4ab25cf039 Fix parser crash in defined multi line str test
The problem is that if we have a "#define" directive followed with an
empty line ending with a newline character then the parser presumes the
value is the newline character instead of the actual value (which is
located on a subsequent line).

The solution is that when parsing an empty line, if "self.in_string" is
False and "self.temp_key_nodes" is not None then we ignore the line
instead of parsing it with the "parse_outside_strings" function.

Closes #3947
2019-02-25 17:51:14 -05:00
elias-pschernig
a7e65de2de fix wmlunits crash (#3931)
* fix wmlunits crash
2019-02-25 10:29:42 +01:00
doofus-01
915cdf93b7 some basic animations - forwardporting PR#3896 2019-02-25 10:19:41 +11:00
josteph
e4cb8efc03 Theme: Remove the empty replay-label from the replay theme. 2019-02-24 17:11:57 +00:00
Severin Glöckner
034618a33d Help: remove space between sprite and text for Fire Dragon 2019-02-23 23:18:31 +01:00
Severin Glöckner
dc69cd5f41 UtBS: change textdomain
The Strings are no longer from wesnoth-help, but campaign-specific ones.
2019-02-23 23:11:50 +01:00
Lovens Weche
44e9d247c3
Merge pull request #3930 from LovCAPONE/bug_3927_fix
Fix parser opens tmp file 2 times then crashes
2019-02-21 14:18:47 -05:00
Lovens Weche
8322efa978 Fix parser opens tmp file 2 times then crashes
When parsing binary data in the wmlparser3 script, a temporary file is
created and opened. The problem is that the temporary file is never
closed and in subsequent functions it is reopened.

The solution is first, create a list of temporary file paths to delete at
program’s exit. In the atexit’s registered cleaning function, all the
files in this list are deleted.

Then in the function that creates the temporary file, we simply close
the file after the binary data has been written in it.

Closes #3927
2019-02-19 18:40:51 -05:00
blaf
845978dc9c Fix #3912: Abilities display in sidebar should use the mouseover hex (#3929)
Show ability of a selected unit as active/inactive with respect to
mouseover hex. For example, selecting an Elvish Ranger that stands on a
forest and highlighting a water hex should show the "ambush" ability in
gray.
2019-02-18 19:45:25 +02:00
nemaara
7cd106d2ce DiD S12: dialogue revisions 2019-02-17 13:57:28 -05:00
nemaara
5699c57f2b DiD S10: added dialogue 2019-02-17 13:57:09 -05:00
nemaara
0e74adb10a DiD S10: dialogue fix 2019-02-17 13:19:27 -05:00
nemaara
e44161349f DiD S8: fixed objective wording 2019-02-17 13:10:23 -05:00
nemaara
858e84599b DiD S1: moved villages 2019-02-16 11:32:33 -05:00
nemaara
dc12f2d5e9 DiD S7: removed redundant code and added dialogue 2019-02-15 13:31:29 -05:00
nemaara
c57f6422f4 DiD S5: typo fix 2019-02-15 12:57:15 -05:00
nemaara
5e6e06255f DiD S5: fixed river label location 2019-02-15 12:39:47 -05:00
nemaara
59cbdbd658 DiD S3: added time area to snow hexes 2019-02-15 12:33:58 -05:00
nemaara
ea1f3da208 DiD S1: dialogue fixes 2019-02-15 12:26:34 -05:00
nemaara
77a8342787 DiD S1: updated map terrain 2019-02-15 12:26:34 -05:00
Jyrki Vesterinen
2396e0e734 Add @viy2 to credits 2019-02-13 18:50:31 +02:00
Lovens Weche
515a3d6626
Merge pull request #3910 from LovCAPONE/bug_3862_fix_proper
Fix wmlparser3 creation unnecessary attributes.
2019-02-12 15:06:24 -05:00
Lovens Weche
7976d69973
Merge pull request #3911 from LovCAPONE/bug_3903_fix
Fix wmlparser3 considers "_" part of attribute value
2019-02-11 14:48:00 -05:00
Lovens Weche
c5c93b6611 Fix wmlparser3 creation unnecessary attributes
In the wml parser, when a node creation spans multiple lines, the code
doesn’t take in account that one of those line can contain a
 #textdomain directive.

In the method “parse_outside_strings” (line 501), the code that
processes the #textdomain directive is inside an if block that is true
only if the node creation doesn’t span across multiple lines
(self.temp_key_nodes is null).

The solution implemented is that in the method “parse_outside_strings”
(line 501), the code that check if a line starts with #textdomain is
moved from inside the block that is true only if the node creation
doesn’t span across multiple lines and put in the method scope after
the first if block that checks if the line is empty.
2019-02-11 11:39:42 -05:00
Lovens Weche
b3b4f97cf1 Fix wmlparser3 considers "_" part of attribute value
The wml parser, when parsing the outside of a string that is
translatable, only assumed “spaces” characters could precede it. If
there are “tabs” characters the code parses the “_” character as an
attribute value.

The solution is to add a stripping code for “tabs” characters.

Code style updated based on recommendations from ProditorMagnus.
2019-02-11 11:32:04 -05:00
Iris Morelle
7a999125ea Re-add server2.w.o to the built-in list of alternate servers
See issue #3873.

[ci skip]
2019-02-11 03:53:47 -03:00
nemaara
82d88ad941 Added default AMLA to Bone Knight 2019-02-10 23:33:05 -05:00
nemaara
b64259e6f3 DiD S10: updated objectives 2019-02-09 12:09:41 -05:00
nemaara
02f915273b DiD S6: dialogue/gameplay fixes 2019-02-09 11:57:40 -05:00
nemaara
f8c2e5114d DiD S5: gameplay and dialogue fixes 2019-02-09 11:46:35 -05:00
nemaara
2b52e04164 DiD S4: reduced orc castle size 2019-02-09 11:13:29 -05:00