Commit graph

57758 commits

Author SHA1 Message Date
Nils Kneuper
431a89ed40 Italian 2015-11-06 23:38:51 +01:00
Ignacio R. Morelle
567d4ac916 Update changelogs with missing items from RELEASE_NOTES
Missed the release but whatever.
2015-11-06 05:02:52 -03:00
Ignacio R. Morelle
92760fe1e5 wmllint: Ignore id in [trait] for unit id checks 2015-11-06 00:08:49 -03:00
Ignacio R. Morelle
437bd79dbb Bump version 2015-11-05 22:06:47 -03:00
Ignacio R. Morelle
1ce2ee82e8 Version 1.12.5 2015-11-05 21:37:04 -03:00
Ignacio R. Morelle
f0aee56195 pot and documentation update, no string changes 2015-11-05 21:34:25 -03:00
Ignacio R. Morelle
6be88bea57 Update players_changelog 2015-11-05 20:30:36 -03:00
Ignacio R. Morelle
229126d638 Merge branch 'staging/pr-497-1.12' into 1.12 2015-11-05 00:07:31 -03:00
Wedge009
240f3c0c52 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:05:18 -03:00
Nils Kneuper
45f9dd4b6e updated Japanese translation 2015-11-04 21:37:58 +01:00
Nils Kneuper
b2d7e9a179 updated Portuguese translation 2015-11-04 21:34:59 +01:00
aquileia
22f46e3ddf Merge pull request #544 from Wedge009/MSVC_(1.12)
backport MSVC settings to 1.12
2015-11-04 05:04:12 +01:00
Wedge009
14ee4108dc Back-port settings from master
Back-port majority of MSVC project settings changes from master, including build and working directories.
2015-11-04 15:01:08 +11:00
ln-zookeeper
2212e7cecd Added the EI Captured fix to RELEASE_NOTES and players_changelog too 2015-11-01 20:14:57 +02:00
Nils Kneuper
80cb21dbb2 updated British English translation 2015-11-01 10:37:50 +01:00
Nils Kneuper
fdf20cf520 updated Spanish translation 2015-11-01 10:35:56 +01:00
Nils Kneuper
f4dca84208 updated Scottish Gaelic translation 2015-11-01 10:33:57 +01:00
Ignacio R. Morelle
e0594b2b44 Merge pull request #543 from Wedge009/bug_20299_fix_(1.12)
Resolve incorrect fake unit types (bug #20299) [1.12]
2015-10-31 20:17:20 -03:00
Ignacio R. Morelle
a713f7e360 Merge pull request #546 from Wedge009/bug_23023_fix_(1.12)
Properly correct the broken Desert Sands / Oasis help entry (bug #23023) [1.12]
2015-10-31 20:09:04 -03:00
Wedge009
769807e085 Ensure base editor name can fall back to base name (in addition to overlay fall back). 2015-10-30 22:30:56 +11:00
Ignacio R. Morelle
604d9c53be pot and documentation update 2015-10-30 01:57:02 -03:00
Wedge009
f421d837f7 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:21:41 +11:00
Wedge009
708007c8b3 Resolve incorrect fake_unit used in planning moves (bug #20299)
Check IDs match before re-using an existing fake_unit. IDs can be different in the situation described by bug #20299, where the user selects the next unit while planning a move.

Back-port of PR #523.
2015-10-29 20:42:55 +11:00
Ignacio R. Morelle
4a25f5cae9 Update changelog for fix for bug #20900 2015-10-28 17:05:55 -03:00
Wedge009
a490c514d3 Resolve Bug #20900
Bug report refers to a more thorough patch #3972 which seems to have never been accepted. All I'm trying to do here is add the file_exists check which fixes the hanging while minimising the changes needed.

(MSVC debug mode still fails due to a vector assertion failure (teams vector reference), which makes testing/debugging the editor difficult.)

If anyone feels like adding all the error messages/handling included from the patch, go right ahead.
2015-10-28 17:03:09 -03:00
Nils Kneuper
947266de18 updated Polish translation 2015-10-27 18:38:45 +01:00
Charles Dang
896de072ab Merge pull request #541 from Wedge009/bug_fixes_(1.12)
Bug Fixes from Master (1.12)
2015-10-27 21:44:48 +11:00
Wedge009
ba228fff54 Allow compilation in MSVC14/2015. 2015-10-27 21:27:13 +11:00
Wedge009
8365d0e2ee Fixed broken Oasis terrain help entry (bug #23023) 2015-10-27 21:26:32 +11:00
Wedge009
50fecf8cc7 Fixed Player Start labels not being updated with repeat map generations (bug #20036) 2015-10-27 20:55:02 +11:00
Wedge009
a50d90b8d8 Correct some atrocious spelling mistakes in change log. 2015-10-27 20:54:06 +11:00
Charles Dang
cd326abaed Revert "Manual backport of 4d8bcf6a58 from master"
This reverts commit ae9d4687fd.

This causes conflicts with the ctrl+o binding for the Load Map hotkey and was deemed
not worth fixing for 1.12.
2015-10-26 17:22:48 +11:00
Charles Dang
ae9d4687fd Manual backport of 4d8bcf6a58 from master 2015-10-26 05:14:20 +11:00
Ignacio R. Morelle
2cd9cfe176 Update credits 2015-10-24 23:02:58 -03:00
Ignacio R. Morelle
60b52761dd Update changelog 2015-10-24 22:38:17 -03:00
Wedge009
0b5ed477c3 Improve hot-key handling for SDL 1.2 builds
This is an extension of #450 and a correction of #470. The sdl2 branch already contains a superset of the improvements made here and will eventually be merged into master, thus overriding this work. So only include these changes in the current 1.12.x release branch.

To ensure we don't have a repeat of the mistakes in #470 I tested the following combinations (mostly Windows, some in Linux):
letter (a, b, c, etc)
punctuation (;, ., etc)
function (F1, F2, F3, etc)
Shift+letter
Shift+punctuation
Shift+function
Ctrl+Return
Ctrl+Enter
Ctrl+j
Ctrl+m
Ctrl+function
Ctrl+`
Ctrl+Shift+2 (@ on US keyboards)
Ctrl+;
Ctrl+Shift+; (colon on US keyboards)
Ctrl+Tab
Ctrl+PrintScreen
Ctrl+Pause
Ctrl+Insert
Ctrl+Delete
Ctrl+Home
Ctrl+End
Ctrl+PageUp
Ctrl+PageDown
Ctrl+Alt
Ctrl+Ctrl
Ctrl+Space
Ctrl+Alt+Space
Ctrl+direction
Ctrl+Shift
Ctrl+CapsLock
Ctrl+NumLock
Ctrl+ScrollLock

Revision of notes from #470:
Instead of specifically checking for Ctrl+j and Ctrl+m, I now make this a general check: that letters should match their respective key codes. This will still cover the Ctrl+Return/Enter combination fixed in #450, but also some of the combinations noted by others testing that PR.

Ctrl+Tab was one combination noted to not work in Linux (though it did in Windows) as it was being mis-read as Ctrl+i. Ctrl+Tab will now work correctly in Linux.

Strangely, Ctrl+Scroll Lock and Ctrl+Pause (while working in Linux) were both being mis-read as Ctrl+c in Windows. This change will cover Ctrl+Scroll Lock but Ctrl+Pause will also be read as Ctrl+Scroll Lock, because of the key code SDL detects. Similarly, Ctrl+Num Lock becomes Ctrl+Pause instead. I don't think this can be resolved because the key code is simply being read incorrectly (this includes SDL 1.2 and SDL 2.0 in Windows).

Unfortunately, I cannot test whether there will be any improvement or regression in OS X.

With hot-key handling being rewritten for SDL2 this change may seem moot, but it will still improve things for the current 1.12 release. This change also resolves concerns some have had regarding the special-case nature of the Ctrl+j/Ctrl+m check previously used.
2015-10-20 06:37:07 -03:00
Ignacio R. Morelle
ec1cb54aa3 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:30:06 -03:00
gfgtdf
8f770ba95b attempt to fix saves from replay
https://gna.org/bugs/23310
2015-10-19 03:11:25 +02:00
Ignacio R. Morelle
4534767b37 Revert "More corrections for hot-key detection in SDL1.2"
This reverts commit 5bd79efa8b.

The patch turns out to break some hotkeys such as the command box (:,
which is shift+. on Latin American keyboards). The author suggests
focusing on the hotkey system rewrite that's part of the SDL 2 port
effort rather than trying to patch the old one on 1.12.
2015-10-18 21:17:49 -03:00
Wedge009
5bd79efa8b More corrections for hot-key detection in SDL1.2
This is an extension of https://github.com/wesnoth/wesnoth/pull/450.

Instead of specifically checking for Ctrl+j and Ctrl+m, I now make this a general check: that letters should match their respective key codes. This will still cover the Ctrl+Return/Enter combination fixed in PR 450, but also some of the combinations noted in that PR.

Ctrl+Tab was one combination noted to not work in Linux (though it did in WindowS) as it was being mis-read as Ctrl+i. Ctrl+Tab will now work correctly in Linux.

Strangely, Ctrl+Scroll Lock and Ctrl+Pause (while working in Linux) were being mis-read as Ctrl+c in Windows. This change will cover this hot-key as well.

Unfortunately, I cannot test whether there will be any improvement or regression in OS X.

With hot-key handling being rewritten for SDL2 this change may seem moot, but it will still improve things for the current 1.12 release. This change also resolves concerns some have had regarding the special-case nature of the Ctrl+j/Ctrl+m check previously used.
2015-10-17 05:54:21 -03:00
Ignacio R. Morelle
7ce73bd302 Update changelog 2015-10-17 02:41:13 -03:00
Ignacio R. Morelle
f136c87210 Merge branch 'feature/editor-mru-1.12' into 1.12 2015-10-17 02:40:33 -03:00
Ignacio R. Morelle
80dedf7cbc hotkeys: Use a matching arrow icon style for submenus 2015-10-09 20:46:31 -03:00
Ignacio R. Morelle
cb7b2173aa editor: Make Recent Files limit customizable and increase default to 10 2015-10-09 19:44:26 -03:00
Ignacio R. Morelle
744dd6cd39 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:27:51 -03:00
Charles Dang
cafd94f18d Add missing [ai] block to Drakes (default) faction (bug #23404) 2015-10-01 13:32:03 +11:00
Charles Dang
a175966610 E1 S10: end scenario when research begins if enemies are defeated (bug #23899) 2015-10-01 00:28:31 +11:00
gfgtdf
8db68ed2a3 Update RELEASE_NOTES 2015-09-27 15:05:06 +02:00
gfgtdf
7c958621ee Backport 'Fix capture event fired when undoing'
https://gna.org/bugs/?23695
db54a8dce5
2015-09-27 15:04:24 +02:00
gfgtdf
df6a293edd Merge pull request #510 from gfgtdf/1.12
add optional fire_event parameter to get_village
2015-09-27 02:23:43 +02:00