21496 Commits

Author SHA1 Message Date
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
Wedge009
63788d5f4a Properly correct the broken Desert Sands / Oasis help entry (bug #23023)
Reverts the previous change to the terrain.cfg and allows the terrain code to fall back to name if editor name is unavailable.
2015-10-30 00:10:14 +11:00
Charles Dang
e948df3424 Updated unit tests to use new team id/name syntax 2015-10-26 13:40:44 +11:00
Wedge009
61b3a9037b Correct Desert Sands / Oasis Help Entry
Reported in Bug #23023.
2015-10-25 21:23:24 +11:00
Charles Dang
121d97e6d9 Merge pull request #528 from tranceitionalMynd/revert-526-pull-request-tmynd
Revert "Added Death of Galtrid to losing conditions for the Human All…
2015-10-25 21:04:28 +11:00
Charles Dang
cd9c23fea0 tunit_create: more minimal display of level 2015-10-21 00:45:38 +11:00
Elvish_Hunter
e07de1bf48 GUI.pyw: fixed regexps not being handled correctly on non Windows systems
This fix relies on the fact that argparse doesn't require the equal sign any more.
2015-10-20 15:02:32 +02:00
Elvish_Hunter
491ba7924f wmlindent: upgrade from optparse to argparse 2015-10-20 15:02:32 +02:00
Elvish_Hunter
2d4ef7a42d wmlscope: upgrade from optparse to argparse 2015-10-20 15:02:32 +02:00
Elvish_Hunter
42ac2e0fe7 wmllint: upgrade from optparse to argparse
This has two advantages: first, it enforces a help style which is consistent across the various tools; second, it makes easier adding new command line options.
Another interesting fact is that those options requiring additional parameters do not need the equal sign any more; that is, writing --foo=bar is now the same as writing --foo bar.
2015-10-20 15:02:32 +02:00
Elvish_Hunter
1a0d04d7b2 GUI.pyw: fixed a bug that caused the output to not be printed on Windows 2015-10-20 15:02:32 +02:00
Charles Dang
21391f9039 tunit_create: added minimal unit preview section and filter box (non-functional) 2015-10-20 08:44:48 +11:00
ln-zookeeper
4deeef797d New attack sounds for mudcrawlers 2015-10-18 19:05:34 +03:00
Charles Dang
2de99cad74 tunit_create: add sort functionality 2015-10-19 01:48:15 +11:00
ln-zookeeper
3a5f25b999 New ink sounds 2015-10-18 15:00:25 +03:00
Charles Dang
a599a3338e Revert "Experimental fix for GUI2 listbox headers outside vertical scroll area"
This reverts commit 88faaac46e26627b88ff7e5f0ebc387871581dc5.
2015-10-18 20:25:41 +11:00
Ignacio R. Morelle
4346856ed2 Merge pull request #529 from niegenug/master
Tab-completion added for in-game whispers
2015-10-17 19:52:59 -03:00
neverEnough
58c78e2c5e updated data/core/about.cfg; /changelog; /players_changelog 2015-10-17 23:59:39 +02:00
Charles Dang
88faaac46e Experimental fix for GUI2 listbox headers outside vertical scroll area 2015-10-18 02:52:45 +11:00
Ignacio R. Morelle
cb9d873955 gui2/ttoggle_button: Add hover/selection bg color to listbox header variant
Copied from GUI1.
2015-10-17 10:52:24 -03:00
Charles Dang
a8fdbeda10 Game Load: move Delete button into same row as first checkbox 2015-10-17 23:14:42 +11:00
Charles Dang
83a3d3680b Game Load: removed unnecessary instruction text 2015-10-17 23:06:14 +11:00
Charles Dang
497a82d7cc Unit Create: move gender selection below listbox 2015-10-17 19:20:42 +11:00
Charles Dang
d87a5fc0c5 Unit Create: specified max height 2015-10-17 19:12:29 +11:00
Charles Dang
8d5fc6e449 Game Load: cleaned up layout a little 2015-10-17 04:49:29 +11:00
Charles Dang
cd4d5ffa59 Game Load: specified max height 2015-10-17 03:11:31 +11:00
tranceitionalMynd
528780717b Revert "Added Death of Galtrid to losing conditions for the Human Alliance." 2015-10-15 07:21:09 -05:00
tranceitionalMynd
8cb1cf47e0 Added Death of Galtrid to losing conditions for the Human Alliance. 2015-10-14 08:51:02 -05:00
ln-zookeeper
a437c538d5 New staff and club sounds, from material by leorock116 2015-10-12 01:03:47 +03:00
Charles Dang
cc5f614bc0 HttT S1: removed unused variable 2015-10-10 15:21:09 +11:00
Ignacio R. Morelle
e186057336 editor: Make Recent Files limit customizable and increase default to 10 2015-10-09 19:47:52 -03:00
Ignacio R. Morelle
25a5facce3 editor: Add Recent Files menu with recently loaded/saved files
File paths are recorded into the game preferences up to a (currently
hardcoded) limit of 6 and opening or saving maps adds or bumps existing
entries to the top. We may allow users to change the MRU limit in
Advanced Preferences in a later commit.

Adds two translatable strings.

In order to fit file paths in the menu without filling up the whole
screen sideways, we use only the file names for now. Because identical
file names could prove to be an actual issue later, I intend to look
into ellipsizing paths correctly in a later step.

(Note that I'm piggybacking on the crummy submenu support we already had
in the themable UI so that this can be safely backported to 1.12. It's
decidedly not optimal usability-wise, but it'll have to do for now.)
2015-10-09 19:47:38 -03:00
Charles Dang
dfabf72030 Revert "Remove multiplayer/ inclusion from editor"
This reverts commit 872444a28c1e6e3d98543e180bed235edb09bd3f.
2015-10-10 03:47:01 +11:00
Charles Dang
0dbaabbb3e Split 6p Team Survival map into own file 2015-10-09 15:27:39 +11:00
Charles Dang
872444a28c Remove multiplayer/ inclusion from editor 2015-10-09 15:22:14 +11:00
Charles Dang
1a6161a8ab Make Edit Side dialog to use new share_vision tristate 2015-10-08 17:13:09 +11:00
Celtic Minstrel
f224e2a073 Fix WML unit tests 2015-10-07 20:09:57 -04:00
Celtic Minstrel
9859091c7c Convert test scenario maps to new format 2015-10-07 14:19:48 -04:00
Charles Dang
68363b3e21 Convert benchmark scenario maps to new format 2015-10-08 05:09:14 +11:00