Commit graph

57758 commits

Author SHA1 Message Date
mattsc
86b043348c Micro AIs: issue warning if side defined in [micro_ai] tag does not exist
Previously this would cause a whole series of Lua error messages and,
potentially, some code not being executed.
2015-05-19 19:43:23 -07:00
Ignacio R. Morelle
b6be3ace42 1.12 has no PNG screenshots or Lua console completion support 2015-05-17 12:47:53 -03:00
Groggy Dice
86b065fd79 wmliterator: fix unterminated loop in lua-strip
An old add-on triggered a wmliterator crash with this comment:

    #>>>> !!!!! REMOVE THIS AFTER TEST !!!!! <<<<#

The traceback showed that the crash came from the lua-stripping
code, which interprets "<<" as the start of a lua string. But below
it is code to remove quoted strings, and it doesn't crash, even
though there are cases where authors forgot to close a quote.

Two key differences stood out in the otherwise similar second
code: only looking for the endquote string in the text after
beginquote, and testing that endquote was less than 0, not -1.

Changing both gets the loop to terminate. Making it search the
text only after "beginquote+2" means that ">>" will no longer
be found, giving endquote a value of -1. But -1 is not less than
-1, so that must be changed to " < 0" to close the loop.
2015-05-11 02:40:00 -04:00
Charles Dang
8347672d8a Updated the hp bars help image 2015-05-08 18:12:38 +11:00
Ignacio R. Morelle
ba74c1d1dc wesnothd: Don't warn about FIFODIR being unset on Windows
Since to my knowledge it's impossible to create named pipes on Windows on
a regular filesystem and both the listener and the sender have to use the
Win32 API to establish communication instead.
2015-04-30 23:55:25 -03:00
Charles Dang
67a5a89b40 Updated green cloak item image
http://forums.wesnoth.org/viewtopic.php?p=554997#p554997
2015-05-01 13:47:00 +11:00
Charles Dang
f8a279be7e Updated dummy item image by dipseydoodle
http://forums.wesnoth.org/viewtopic.php?p=566137#p566137
2015-05-01 13:46:56 +11:00
Charles Dang
d3b04d1b1e Updated barrel item image by beetlenaut
http://forums.wesnoth.org/viewtopic.php?p=564574#p564574
2015-05-01 13:46:51 +11:00
Nils Kneuper
de645ef26e updated Scottish Gaelic translation 2015-04-27 22:11:18 +02:00
Ignacio R. Morelle
77ce26a989 travis: Use saucy from old-releases.ubuntu.com
saucy went EOL about a year ago so it's no longer in the main mirrors.
2015-04-25 01:12:43 -03:00
Ignacio R. Morelle
fd11a6d93f Merge branch 'campaignd/adminctl-1.12' into 1.12 2015-04-24 00:58:42 -03:00
Ignacio R. Morelle
6292f80d3b campaignd: Implement setpass command
Replaces an add-on's passphrase via FIFO without needing the previous
passphrase.
2015-04-24 00:58:36 -03:00
Ignacio R. Morelle
1b517975e2 campaignd: Fix SIGINT/reload command issues with an unchanged FIFO path
This prevents campaignd from deleting the current FIFO on config reload
if the path in the config hasn't changed, and potentially losing queued
up commands.
2015-04-24 00:58:36 -03:00
Ignacio R. Morelle
d313c8dfb3 Add input_stream::path() method to retrieve the original path 2015-04-24 00:58:36 -03:00
Ignacio R. Morelle
208c177164 campaignd: Implement reload command
By default is has the same effect as SIGINT, but it also takes an
optional 'blacklist' argument which instructs campaignd to only re-read
the blacklist file.
2015-04-24 00:58:36 -03:00
Ignacio R. Morelle
b512a7cc32 campaignd: Implement 'flush' command, flushes config to disk immediately 2015-04-24 00:58:36 -03:00
Ignacio R. Morelle
44eef2a76a campaignd: Implement 'readonly' command, toggles RO mode 2015-04-24 00:58:35 -03:00
Ignacio R. Morelle
7b575ed761 campaignd: Log unrecognized FIFO commands 2015-04-24 00:58:35 -03:00
Ignacio R. Morelle
6986e825e2 campaignd: Log message on shut down request via FIFO 2015-04-24 00:58:35 -03:00
Ignacio R. Morelle
20e55fb67c campaignd: Add dedicated type for parsing admin commands 2015-04-24 00:58:35 -03:00
Ignacio R. Morelle
1cb3d67756 campaignd: Reload configuration on SIGHUP
It's a bit tricky right now because whoever changes the configuration
must make sure to do it within the flush interval or their changes may
be lost before they get to send SIGHUP to campaignd. Another issue is
that the campaigns list may change (new uploads, bumped download counts,
etc.) between editing the config file and sending SIGHUP, and any
changes in the on-memory version of the list will be irreversibly lost.

Hopefully soon I'll add some socket commands to address these
limitations.
2015-04-24 00:58:35 -03:00
Ignacio R. Morelle
dbeef1c9a5 campaignd: Create [campaigns] list in load_config()
Needed for implementing config reloading.
2015-04-24 00:58:35 -03:00
Ignacio R. Morelle
9c62c53e5c Fix up commit 9514710 by adding return statements
Otherwise the add-on isn't actually rejected.
2015-04-24 00:32:15 -03:00
Ignacio R. Morelle
d463d94a06 Purge RELEASE_NOTES 2015-04-18 04:09:18 -03:00
Ignacio R. Morelle
4c3468dc37 Exclude RELEASE_NOTES from releases 2015-04-17 03:04:34 -03:00
Ignacio R. Morelle
bde80f6887 scons: Rewrite a couple of conditionals for compatibility with Python 2.3 2015-04-16 05:49:47 -03:00
Ignacio R. Morelle
08c6652a2b Add missing changelog entries for bug #23454 fixed in 1.12.2 2015-04-15 20:35:41 -03:00
Ignacio R. Morelle
2bd381617a gui: Make file menu paths use path delimiters uniformly (bug #23224)
In particular, this forces using \ on Windows.
2015-04-15 06:10:26 -03:00
Ignacio R. Morelle
1ee80160fc Complete INSTALL revamp ported from master
This is a port of commits 15ac0224ca and
038090a1fe, without master-specific
dependencies and with the SDL version requirement lowered to 1.2.7.

Unsupported/legacy build configurations are still not mentioned in this
commit because they overcomplicate everything.
2015-04-13 02:30:45 -03:00
Ignacio R. Morelle
62c5ef5b89 pofix: Add download path string fixes for the 1.12.2 release 2015-04-13 02:30:45 -03:00
Nils Kneuper
caf812dd56 enforce cmake default build type (bug #23445)
If no build type is selected it can happen that the game builds without
any optimization. Now the user has to explicitly specify the 'none'
type if they want it.
2015-04-12 11:57:35 +02:00
Ignacio R. Morelle
18557d342e fs: Demote a few BFS-specific error log statements to info level
Some of these don't even exist in the legacy non-BFS implementation, but
it's possible they might prove useful for debugging later.

Fixes some spurious errors printed when browsing directories outside the
user's home dir on Linux/*BSD/etc., as well as a few recently introduced
in the GUI2 test suite by commit
db28dca52c.
2015-04-12 02:06:10 -03:00
gfgtdf
b79a88d05c fixup 20e9706c11
that commit changed uintmax_t to be 4 bytes long instead of 8 bytes long in windows which makes us uncapable to read files >4GB.

boost::filesystem::file_size retrun type is boost::uintmax_t so we don't need to include files for this line.
2015-04-12 02:04:56 -03:00
Ignacio R. Morelle
8b72d6c764 Force xgettext to add the Add Hotkey and Clear Hotkey button tooltips
Fixes the first issue mentioned in <http://r.wesnoth.org/p580885>.

This will be backported later for version 1.12.3.
2015-04-11 17:32:58 -03:00
Ignacio R. Morelle
d4676ed1bd Bump version 2015-04-08 19:36:23 -03:00
Ignacio R. Morelle
b3ca056d7c Update changelog for bug #23217 2015-04-08 18:31:54 -03:00
Ignacio R. Morelle
32dcdf6ecb Version 1.12.2 2015-04-08 18:13:08 -03:00
Ignacio R. Morelle
eb5cae24df Tweak changelog entry wording 2015-04-08 18:11:00 -03:00
Ignacio R. Morelle
343d05caa2 Revert "remove support for legacy-style unit abilities descriptions"
This reverts commit 2656a5d070.

Removing features or compatibility paths is not allowed in stable
branches unless required to solve a security vulnerability or other
severe issue.
2015-04-08 18:09:22 -03:00
Ignacio R. Morelle
002c00b063 pot and documentation update, no string changes 2015-04-08 18:09:05 -03:00
aquileia
945f1be275 VC project: Remove libintl include 2015-04-08 23:03:42 +02:00
Chris Beck
c05460f8f2 Merge branch '1.12' of https://github.com/wesnoth/wesnoth into 1.12 2015-04-08 17:00:18 -04:00
Chris Beck
2656a5d070 remove support for legacy-style unit abilities descriptions 2015-04-08 16:59:56 -04:00
Elvish_Hunter
a886387ad1 wmllint: backported better fix for bug #23217 2015-04-08 22:47:10 +02:00
gfgtdf
b8a55aa15b fixup 'fix carryover in with scenario generation in mp'
I am not wure whether this is needed, but it is better to do so.
2015-04-08 22:34:25 +02:00
gfgtdf
408e6f300f fix carryover in with scenario generation in mp
http://gna.org/bugs/?23454
2015-04-08 20:57:30 +02:00
Nils Kneuper
025562fc88 updated Scottish Gaelic translation 2015-04-08 18:01:09 +02:00
Nils Kneuper
157ae4f021 updated Spanish translation 2015-04-08 17:59:48 +02:00
Ignacio R. Morelle
0d566d81c8 Add changelog entry for bug #23331 2015-04-08 07:01:34 -03:00
Ignacio R. Morelle
8f8419ad9d Update changelogs with an entry for bug #23440 (CVE-2015-0844)
The new section doesn't respect alphabetical order and goes at the top.
This is on purpose. Please do not change this.
2015-04-08 00:43:38 -03:00