61835 Commits

Author SHA1 Message Date
Elvish_Hunter
681d033bca wmllint: removed an instance of deprecated dict.has_key() 2015-08-15 14:34:10 +02:00
aquileia
5c1047d372 Windows installer: Don't force GPL on end users
Fix bug #21769 by changing 'I Agree' to 'Next'.
2015-08-15 11:06:38 +02:00
Martin Proud
7f57d911b8 Merge pull request #448 from CelticMinstrel/master
Reorganize XCode project
2015-08-15 00:31:19 -05:00
Charles Dang
b59fc35153 DiD S1: fixed incorrectly named key in a [kill] block 2015-08-15 13:20:16 +11:00
Charles Dang
ff6054e33c UtBS S2: fixed an incorrectly named SLF key 2015-08-15 13:09:42 +11:00
Charles Dang
89afb3d0a6 THoT S10: fixed typo in side 4 controller key 2015-08-15 12:57:49 +11:00
lipk
0d6fdfe2cc Merge pull request #452 from aginor/sdl2
Fix all compile warnings when SDL2 is enabled
2015-08-14 13:16:03 +02:00
Andreas Löf
f0eba4b312 Add a macro to clearly mark unused variables as unused and avoid compiler warnings. 2015-08-14 21:39:49 +12:00
Andreas Löf
46afc83f3a Fix all compile warnings when SDL2 is enabled 2015-08-14 20:59:20 +12:00
Ignacio R. Morelle
d3d8970601 fs: Remove legacy non-Boost implementation of the filesystem API
No-one is supposed to use it since 1.11.19 (except for OpenPandora,
but various other changes in master already forced us to drop support
for it), so it's time to enforce this decision for the sake of our
time and sanity.
2015-08-14 05:14:02 -03:00
Charles Dang
730d837296 Drop redundant border_size argument from gamemap::write
This was rendered unnecessary in in2f650419dad963f7ad as the gamemap namespace already has
border_size_ assigned to gamemap::default_border, and 6b78073b49bcebf00b removed the passing
of any other value
2015-08-14 10:11:19 +11:00
Charles Dang
e9d70dbc1e Default [object] silent= to true if no description is provided
Code snippet by shadowm
2015-08-14 10:08:46 +11:00
Charles Dang
079692d424 Clarify false default of [terrain_mask] border= as expected
The wiki states this is supposed to be false. gamemap::overlay already gives border=
a default false value, but this clarifies the value, code-wise.
2015-08-14 09:22:34 +11:00
Charles Dang
fcf8b72efd Partially revert a436c46f1356 and replace [terrain_mask] with [terrain] 2015-08-14 08:41:04 +11:00
Nils Kneuper
f7982497f0 updated Latvian credits 2015-08-13 22:48:47 +02:00
Nils Kneuper
5ad57f09a3 updated Latvian translation 2015-08-13 19:49:11 +02:00
Charles Dang
a436c46f13 Comment out [terrain_mask] inclusion possibly breaking feeding test 2015-08-13 15:29:35 +11:00
Charles Dang
f2334507ae Fixed Help browser not opening to correct section when accessed from editor 2015-08-13 07:14:17 +11:00
Charles Dang
c35fb63472 Rename Quit Game/Quit Editor menu items Quit to Titlescreen 2015-08-13 06:59:51 +11:00
Charles Dang
17d1212a0e General wmlindent run 2015-08-12 17:10:09 +11:00
Charles Dang
730453cf01 LoW S3: fixed pesky comment line preventing wmlindent from affecting file 2015-08-12 16:48:45 +11:00
Charles Dang
2f650419da Cleaned up old code related to border_size, usage, and map header 2015-08-12 16:32:35 +11:00
Charles Dang
6b78073b49 Don't pass border_size and usage to gamemap::read
This also fixes an issue in [terrain_mask] where masks would be incorrectly
offset due to a default border_size of 0
2015-08-12 16:32:32 +11:00
aquileia
5cf8cf2b32 vcproj: Fix File node from PR #447 2015-08-12 00:29:13 +02:00
Charles Dang
8adbae8da1 LoW: dropped commas before chapter titles 2015-08-12 07:29:42 +11:00
Charles Dang
768a418137 Deprecate ON_SIGHTING
Since sighted events now work, this macro is no longer necessary
2015-08-12 06:12:13 +11:00
Elvish_Hunter
f099638b26 wmllint: replaced backticks with repr()
Backticks as shortcut for repr() are removed from Python 3. Although all their usages were already commented out, I fixed it anyway in case the code is uncommented.
2015-08-11 19:41:37 +02:00
Elvish_Hunter
d8478cbed1 wmllint: replaced map and string.strip with list comprehension
string.strip() isn't available on Python 3, because of its redundancy with the .strip() method available on any string.
2015-08-11 19:41:37 +02:00
Elvish_Hunter
7fa2943683 All main WML tools: replaced tabs with spaces 2015-08-11 19:41:36 +02:00
Charles Dang
ad881b5d0b Formatting fixup for 08d5d9c8e8a1 2015-08-12 03:21:23 +11:00
aquileia
08d5d9c8e8 Add nightblade unit description 2015-08-11 18:16:46 +02:00
Ignacio R. Morelle
b9c6ab59d6 Fix WML variable leak in RECRUIT_UNIT_VARIATIONS 2015-08-09 01:52:27 -03:00
Charles Dang
cd50036363 Restore a check to prevent portrait-less units from using a scaled sprite instead 2015-08-09 14:42:28 +11:00
gfgtdf
cd0b12387b better error message 2015-08-09 03:38:24 +02:00
Celtic Minstrel
bec2e6259e Reorganize XCode project
- All files are now ordered alphabetically.
- All referenced header files are now known to the project file.
- Duplicated references to source files and libraries are removed.
- References to defunct sources are removed.
- Source files are now largely stored in a structure mirroring the file system structure,
meaning a few new added groups and some files moved around (some of which were
in nonsensical places before).
2015-08-08 21:28:26 -04:00
Elvish_Hunter
de64146e35 wmllint, wmltools and wmliterator: more Python 3 compatibility stuff
'raw_input' and 'xrange' in Python 3 are renamed respectively 'input' and 'range'.
2015-08-08 20:36:53 +02:00
Elvish_Hunter
b892f764a6 wmlscope: try to make the image size checks more useful 2015-08-08 20:36:53 +02:00
gfgtdf
de1eaa30f7 Use listboxs sorting feature in experinemtal gui2 addon_list
Also fixes the toggle panels that show the addons description and the filter
textbox in the non new-widgets codepath.

These changes mostly effect the non new-wigets codepath. The new-widgets
codepath (which already had a sorting feature) still works like before
except that it was adjusted to the changes to the cfg file.
2015-08-08 16:33:08 +02:00
Ignacio R. Morelle
32342a5fc4 gui2/tlabel_settings: Exclude from GUI2 unit test
The dialog is not tested currently, which causes the GUI2 unit test to
fail (imagine that). Since the class constructor requires a hefty amount
of fluff to work (in particular, a display_context object), might as
well just disable it for the time being.
2015-08-08 03:08:29 -03:00
Ignacio R. Morelle
74a81069b9 Merge pull request #447 from CelticMinstrel/master
Interface to fine-tune displayed labels (and some other label stuff)
2015-08-08 01:29:15 -03:00
Celtic Minstrel
f619b4cc63 Update build stuff
(Sconscript, CMakeLists, tests, project files)
2015-08-07 22:50:34 -04:00
Celtic Minstrel
e130a960cb Update credits and changelog 2015-08-07 22:50:24 -04:00
aquileia
79b7bf1777 Windows Installer: Update icons 2015-08-08 04:24:01 +02:00
aquileia
d8b5e7b3c1 Windows installer: Remove userdata dir selection
Due to UAC, especially virtualization of the Programs directory, it is preferable to force 'My Games' as the location.
2015-08-08 03:53:05 +02:00
aquileia
c7ffe8dfd7 Windows installer: Update to NSIS 3
Compatibility changes:
- Plugins moved to a different directory

New Features:
- Unicode installer
- Could now detect Windows 8 - 10
2015-08-08 03:53:05 +02:00
aquileia
4a272b301d Windows installer: Use FILE /oname to avoid copying files 2015-08-08 03:53:04 +02:00
aquileia
1c3fa278ff Windows installer: Cut down on shortcuts
From the impressive number of 9 start menu shortcuts, 2 were removed.

An additional 4 were removed for Windows 8, where the app list can't collapse folders.
2015-08-08 03:53:04 +02:00
aquileia
12066d87c5 Windows Installer: Translate 'Battle for Wesnoth' and shortcuts
The title is now localized, as are the start menu shortcuts. As localized
titles can be longer than the English string, a third line was explicitly
added to the welcome page (else NSIS cuts the line in half).

The manual shortcut points to the translated manual version, if available.

Due to lack of Unicode support in NSIS 2, only translations matching the
codepage are displayed correctly.

The desktop.ini file isn't removed during uninstallation as it may contain
info on other programs, e.g. if the player chose to place the shortcuts in
'Games'.
2015-08-08 03:53:04 +02:00
aquileia
46af40eb61 Windows Installer: Add GPL translations
Source:
https://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html
http://www.gnu.org/licenses/translations.html

Changes:
- Links to the English original added in the headers.
- Portuguese translations reindented to fit width of textbox.
- Reference between Chinese GPLs removed.
- UTF8 BOM added (else NSIS doesn't recognize the encoding).

Thanks to @chisquare130 (Xara) for checking the Chinese versions.
2015-08-08 03:53:03 +02:00
aquileia
01dfc6783f Windows installer: Remove components page
We only have one module anyways, thus there's no choice in the component selection menu.
2015-08-08 03:53:03 +02:00