62841 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
de44790d7d Make [*time_area] Lua API functions take a single time area id
This means the Lua code implementing the WML tags are now solely
responsible for parsing the comma-separated id list. It just so happens
that I added code for that without realizing that I was duplicating
existing functionality on the C++ side.

As a result:
 * wesnoth.add_time_area and wesnoth.remove_time_area can operate on
   time area ids that contain commas (if someone feels this is needed
   for some weird reason)
 * [time_area] no longer warns about adding time areas with commas in
   their ids (actually adding the first id of the list instead)
 * [time_area] remove=yes and [remove_time_area] still handle
   comma-separated lists of ids, in the Lua side instead of C++.

This makes the Lua API for this consistent with [event]/[remove_event].

Since the Lua API functions in question are undocumented at this moment,
it's unlikely this impacts anyone, really.
2015-11-26 23:29:16 -03: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
bb87a306e9 log/windows: Drop test code that was never meant to be pushed upstream 2015-11-25 04:53:08 -03:00
Ignacio R. Morelle
edb8be4bce log/windows: Leave Windows version unspecified
If this breaks compilation for MSVC++ users, make sure MSVC++ passes
-D_WIN32_WINNT=0x0501 to the compiler, or revert this commit. CB and SCons
already do that, so...
2015-11-25 04:50:50 -03:00
aquileia
5d825d4aca vcproj: Update for 53ed94d & aae8e70
[skip ci]
2015-11-24 22:02:33 +01:00
Ignacio R. Morelle
03648f7f9e Remove a few superfluous includes 2015-11-23 20:00:40 -03:00
Ignacio R. Morelle
da9a3c4b6e Make libc_error a subclass of std::exception 2015-11-23 18:48:43 -03:00
gfgtdf
b7f9775872 fix crash in [set_variables]
http://gna.org/bugs/?24100
2015-11-23 17:29:02 +01:00
gfgtdf
3f37e4a51d Revert "fix crash in set_variables"
This reverts commit a7bb6b1fa57fe736115820fbdbdff56a50acaf0a.

This didn't really fix it, it just made the code more complicated.
2015-11-23 17:27:04 +01:00
Ignacio R. Morelle
71009d939f Merge branch 'feature/win32-stdio-redir' 2015-11-23 03:42:28 -03:00
Ignacio R. Morelle
758f929a7b Update changelog and RELEASE_NOTES 2015-11-23 03:42:15 -03:00
Ignacio R. Morelle
baae0bd708 log/windows: Auto-disable log file if a console is attached at startup
This change only actually concerns binaries built with the console
subsystem flag, which isn't the case with our official project files or
SCons recipe.
2015-11-23 03:42:14 -03:00
Ignacio R. Morelle
53ed94da25 log/windows: Integrate implementation of --wconsole
This makes it so we no longer try to steal the console back to a log
file when using --wconsole with the new redirection code. Now the
--wconsole switch triggers a special mode of the log file manager that
uses a native console instead of log files.

As a necessary bonus to appease compilers, the GUI2 version info dialog
now uses the correct log file path when not started with the --wconsole
switch. Yay!
2015-11-23 03:42:14 -03:00
Ignacio R. Morelle
bc9fb0c111 log/windows: Close stdout and stderr on destruction if redirected
No real reason to do this since these resources should be automatically
released on process exit anyway, but, better safe than sorry I guess.
2015-11-23 03:21:48 -03:00
Ignacio R. Morelle
900dc5b070 log/windows: Implement log file rotation
A maximum of 8 previous log files are kept around in the logs directory.
Older files are automatically deleted during initialization.

I could've achieved this with stat calls, really, but the log filenames
are simpler and faster to process.
2015-11-23 03:21:48 -03:00
Ignacio R. Morelle
aae8e70c7a log/windows: Add our own stdout/stderr redirection on Windows
This replaces SDL 1.2's built-in stdout/stderr redirection, which writes
the log file to the process working directory (usually an
admin-restricted location) instead of a more accessible user-writable
location.

My approach combines stdout and stderr into a single log file which
includes the process id and timestamp in its filename in order to
accomodate multiple instances and (coming later) log rotation. The log
file is created in the user's temporary directory defined by Windows,
and then relocated to the game user data dir as soon as it is set-up the
first time, placed in the Windows-specific logs/ subdir.

The most pressing issues this solves are the lack of built-in
stdout/stderr redirection in SDL 2's SDL2main.lib entry point, and
Unicode path issues with SDL 1.2 (bug #22897). Additionally, it allows
us to not have to rely on UAC virtualization anymore; this is arguably
far more important because it has been known to break on occasion (e.g.
<http://r.wesnoth.org/t42970>), and starting with version 1.13.2 we want
to declare Windows Vista - 10 compatibility in our side-by-side manifest
(see commit e119f4071f047c6d740ebec4636985fdf39349bc).

Currently missing features coming later:

 * Log rotation (otherwise the logs/ dir may grow forever)
 * wesnothd support (although the code is already required to be linked
   into wesnothd due to it being required by the FS API)
 * Integration with the version info dialog
2015-11-23 03:21:42 -03:00
gfgtdf
a7bb6b1fa5 fix crash in set_variables
http://gna.org/bugs/?24100

This only changes the vit == vit_const case.
2015-11-23 00:49:22 +01:00
gfgtdf
729d17a783 remove outcommented code 2015-11-17 21:21:57 +01:00
gfgtdf
8e78def64d Add a comment 2015-11-17 21:10:39 +01:00
gfgtdf
9ce59881d2 fix wesnothd::game::send_data_sides 2015-11-17 20:59:36 +01:00
loonycyborg
296c217e5d scons: change sdl check so it sets up pkg-config and PATH if passed non-empty sdldir
Needed for specifying local installs of sdl on non-windows platforms.
2015-11-17 15:32:08 +03:00
Andreas Löf
3036b4ee49 Merge branch 'master' into sdl2 2015-11-17 17:44:09 +13:00
gfgtdf
c26e139091 attempt to fix a compiler warning 2 2015-11-15 20:31:22 +01:00
gfgtdf
29ff731327 attempt to fix a compiler warning 2015-11-15 20:30:05 +01:00
loonycyborg
627acb9b0b scons: Add SDL calls to SDL test program 2015-11-15 17:54:28 +03:00
Nils Kneuper
9bdf63097e updated Slovak translation 2015-11-15 10:54:59 +01:00
Ignacio R. Morelle
a81f076f6b Add command line changes tl;dr for bug #23753 2015-11-10 18:33:04 -03:00
Charles Dang
961463e555 Tweaked design of Lawful and Neutral alignment icons 2015-11-07 19:13:36 +11:00
Nils Kneuper
565d0ebade updated RACV translation 2015-11-06 23:40:40 +01:00
Nils Kneuper
d5263814cc updated Italian translation 2015-11-06 23:38:38 +01:00
Ignacio R. Morelle
a63b5fa0c3 Update players_changelog 2015-11-06 03:49:58 -03:00
Ignacio R. Morelle
1aaa341e35 wmllint: Ignore id in [trait] for unit id checks 2015-11-06 00:09:34 -03:00
aquileia
c281b3af08 l10n: Add Sgt. Groovy's logo translations 2015-11-05 11:54:14 +01:00
Ignacio R. Morelle
e5538b3ad8 Merge pull request #497 from Wedge009/bug_18637_fix
Work-around for planning moves on planned recruits (bug #18637)
2015-11-05 00:03:00 -03:00
Ignacio R. Morelle
b874d4d302 Merge pull request #548 from niegenug/trackleaves
Added user's leave notification for ingame players
2015-11-05 00:01:28 -03:00
Nils Kneuper
10e95a3dec updated Japanese translation 2015-11-04 21:37:33 +01:00
neverEnough
7832a22f8f Whisperers get cleaned when user disconnects
From previous commit "Tab-completion added for in-game whispers" <6280229> now whisperers set removes disconnected users. Now <b549ac2> regarding bug #9742 should be completed.
2015-11-04 15:17:34 +01:00
neverEnough
bc8cdb3c5b Added user's leave notification for ingame players
Also updated changelogs
2015-11-04 15:12:26 +01:00
Wedge009
53e79232e7 Avoid crash when planning moves on planned recruits (Bug #18637)
Attempt to work-around bug #18637, where planning moves on planned recruits results in a crash (because get_unit() is null when move::init() is called).

This isn't a comprehensive fix because clicking on a planned recruit will still result in the usual display feedback for planning a move. The difference here is that attempting to place a planned move will result in nothing happening when the mouse button is clicked (as opposed to the assertion failure or crash which happens currently). It is better than nothing, I believe, unless there are negative side-effects of which I am unaware of.

As per the bug report, the ideal solution is to either get planned moves on planned recruits working properly, or disallow this movement altogether.
2015-11-05 00:30:29 +11:00
Nils Kneuper
8d22b2f5f3 updated British English translation 2015-11-01 10:37:32 +01:00
Nils Kneuper
7199804dda updated Spanish translation 2015-11-01 10:35:34 +01:00
Nils Kneuper
df97d242ef updated Scottish Gaelic translation 2015-11-01 10:33:33 +01: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