62502 Commits

Author SHA1 Message Date
aquileia
74c1b6fade vcproj: Remove unneeded tools
The Proxy Generaor Tool is obsolete since VC10, we don't use the IDL compiler.
2015-10-25 19:12:23 +01:00
Charles Dang
11664f4024 Add backwards compatibility for side id SSF key name 2015-10-26 00:55:56 +11:00
Charles Dang
3781e7839f Rename team_name/user_team_name to team_id/team_name (old syntax still valid) 2015-10-26 00:44:28 +11:00
Charles Dang
175ace6490 Merge pull request #538 from Wedge009/bug_23215_fix
Resolve Bug #23215
2015-10-25 23:06:20 +11:00
Wedge009
4d8bcf6a58 Enable Load Game hot-key in main menu
Apparently a regression from 1.10. Reported in bug #23215.
2015-10-25 22:31:19 +11:00
Charles Dang
ee812a8bd5 Merge pull request #537 from Wedge009/bug_23023_fix
Resolve Bug #23023
2015-10-25 21:47:53 +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
8c4febad76 Merge pull request #380 from cbeck88/fixup_server_controller_tweaks
fixup server controller tweaks, dont tweak host
2015-10-25 21:01:58 +11:00
gfgtdf
9ad56b8d88 Merge pull request #534 from Wedge009/bug_22133_fix
Resolve Bug #22133
2015-10-24 12:56:49 +02:00
aquileia
b7cb892092 Update l10n-track for new logo
Fixes displayed logo for translations.
2015-10-23 12:16:09 +02:00
gfgtdf
5bd7c03c66 remove if that is always true
we already access *gui_ in 'gui_->write(cfg.add_child("display"));' above so this 'if' is useless.
2015-10-22 19:48:38 +02:00
Charles Dang
251aec1f9b Switch a var name from camelCase to underscore case 2015-10-22 17:10:43 +11:00
Charles Dang
b8a9017aaa Move map name to beginning of title and restored version number
Also includes minor cleanup
2015-10-22 13:44:34 +11:00
aquileia
e22555a107 Windows Installer: Remove --config-dir from shortcuts
Flag was superseded by 795dd8c42
2015-10-21 13:25:51 +02:00
Charles Dang
c7aa47443d CB Project: replaced DWINVER with _WIN32_IE
The former doesn't appear to do anything and was probably a typo
2015-10-21 14:44:01 +11:00
Ignacio R. Morelle
2aab35bcf7 Merge branch 'bug/23753' 2015-10-20 23:17:16 -03:00
Ignacio R. Morelle
80af2f7cdd Update changelogs and release notes for bug #23573 2015-10-20 23:15:11 -03:00
Ignacio R. Morelle
8f8fde43ba fs: Use SHGetFolderPath() instead of SHGetSpecialFolderPath()
The former has been "unsupported" since Windows XP, while the latter is
still supported in Vista and later as a wrapper around a newer API.

Most importantly, used this as an excuse to rewrite the code to take
advantage of the fact that we already link to SHELL32.DLL at runtime
(it implements ShellExecute() and Shell_NotifyIcon(), used elsewhere in
our code), only run on versions of Windows guarantee to provide the
SHGetFolderPath symbol, and thus don't need all the LoadLibrary mumbo
jumbo that made the code considerably uglier and denser.
2015-10-20 22:52:31 -03:00
Ignacio R. Morelle
bc22ec9176 fs: Treat . and .. in userdata/config paths relative to cwd on Windows
This allows asking Wesnoth to store user files in a directory relative
to the install dir if wanted on Windows (e.g. for portable installs to
removable media where the absolute path to the install dir is not
constant or under the user's control).
2015-10-20 22:02:56 -03:00
Ignacio R. Morelle
795dd8c420 fs: Default to Documents for user config/data on Windows
Use Documents\My Games\WesnothX.Y for user config data on Windows like
we currently do when using --config-dir there with a relative path. The
behavior of --config-dir when passed a relative path remains unchanged
with this commit, making the new out-of-the-box default equivalent to
passing --config-dir WesnothX.Y, except this is now enforced by Wesnoth
rather than a finicky installer option.

See bug #23753 for the rationale behind this change.

People who really can't live without the old CWD\userdata layout should
either use --config-dir with an absolute path to their existing userdata
dir, or wait for the next commit (which will help with "portable"
installs to removable devices, for example).
2015-10-20 20:53:41 -03:00
Ignacio R. Morelle
1fe5134e73 fs: Clean up Windows-specific code in set_user_data_dir()
No functional changes. Probably. More about this in the next commit.
2015-10-20 20:53:41 -03:00
Charles Dang
f8ca1e96bc tunit_create: add trait and ability info 2015-10-21 07:57:15 +11:00
Charles Dang
b8937db177 tunit_create: rearranged HP/XP/MP stats 2015-10-21 06:28:15 +11:00
Charles Dang
d3e04c65d6 tunit_create: add attack details to type summary 2015-10-21 05:33:37 +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
33bfaf5ffc tunit_create: cleanup, mostly removing static_casts 2015-10-20 22:50:35 +11:00
Wedge009
01daea8f75 Enable Cancel Orders in Load MP Game
Resolving bug #22133, stating Cancel Orders does not work when loading a MP game.
2015-10-20 22:28:58 +11:00
Charles Dang
675738e635 tunit_create: use type id for return value and help dialog 2015-10-20 15:45:49 +11:00
Charles Dang
6b3baa2a2b tunit_create: use type image icon if available 2015-10-20 15:38:28 +11:00
Charles Dang
013acd316f Switch to GUI2 Create Unit dialog 2015-10-20 14:35:59 +11:00
Charles Dang
0e45d64a71 tunit_crteate: Port Filter functionality from Load Game dialog 2015-10-20 14:33:02 +11:00
Celtic Minstrel
e9cfef3b72 Lua API: Fix unit:vision() and unit:jamming() returning movement cost 2015-10-19 23:16:37 -04:00
Ignacio R. Morelle
49e3d20e7b gui2/tunit_create: Prevent null pointer dereferences
One code path in particular assumed that resources::controller is never
a null pointer, thus breaking unit tests.
2015-10-19 23:10:20 -03:00
Ignacio R. Morelle
9fd59b503f cmake: Use Boost.Filesystem FS API for tools
Otherwise we get configure-time errors due to CMake looking for the
legacy implementation, filesystem.cpp.
2015-10-19 21:48:12 -03:00
Ignacio R. Morelle
03a85fde56 cmake: Tests and tools also need Boost.Filesystem + Boost.Locale
Fixes linker errors found when building after configuring with
`-DENABLE_TOOLS=ON -DENABLE_GAME=OFF -DENABLE_SERVER=OFF
-DENABLE_NLS=OFF`.
2015-10-19 21:46:44 -03:00
Ignacio R. Morelle
e056f1a688 Update changelog for previous minimap fix commit 2015-10-19 21:34:03 -03:00
Ignacio R. Morelle
62e84fa240 Avoid loading terrain minimap images when not specified by WML
Otherwise we build a bogus "terrain/.png" file path and produce spurious
`error display: could not open image 'terrain/.png'` messages in stderr.

Although this is primarily an issue found with certain special overlay
terrains such as ^Xo (Impassable Overlay), this fix covers base terrains
as well.
2015-10-19 21:32:39 -03:00
Charles Dang
21391f9039 tunit_create: added minimal unit preview section and filter box (non-functional) 2015-10-20 08:44:48 +11:00
Charles Dang
701229d69d Added a set of Alignment icons
Designed by me based off and using pieces of previous icons by LordBob
2015-10-20 08:39:09 +11:00
Ignacio R. Morelle
019d829b41 gui2/tgamestate_inspector: Don't skip pages with empty contents
Those are sometimes relevant (for example, empty WML variables or
containers/arrays). We don't want to conceal the truth here because this
is supposed to be a debugging aid.
2015-10-18 22:42:46 -03: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