upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 17:10:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,001 Commits 60 Branches 374 Tags
Commit Graph

62001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mattsc
1d4bde10f6 Update Xcode project file 2015-09-02 07:19:25 -07:00
Ignacio R. Morelle
b68686eb45 Add include guards 2015-09-01 16:35:59 -03:00
Charles Dang
6c333d8278 Updated cb projectfile for 0abde389dc1a 2015-09-01 22:56:10 +11:00
gfgtdf
1748d78e13 Merge pull request #480 from gfgtdf/quit_confirmation 
show confirmation dialog when quitting
 2015-09-01 13:43:28 +02:00
Ignacio R. Morelle
2971916edb i18n: Fix typo in log message 2015-08-31 21:59:05 -03:00
Ignacio R. Morelle
85cf364ea0 i18n: Skip and warn about textdomain names with a slash (bug #23839) 
boost::locale::generator::add_messages_domain() interprets the slash
specially, interpreting everything after it as an encoding name.

It's not clear to me why providing a textdomain with an erroneous name
like this causes Boost.Locale to throw a boost::locale::conv exception
(invalid_charset_error, apparently) when handling t_strings bound to
completely different textdomain, but if we can avoid the issue
altogether then that's good enough.

Made the legacy implementation skip and warn about these names too even
if bindtextdomain(3) says nothing about slashes having a meaning.
 2015-08-31 21:58:57 -03:00
Ignacio R. Morelle
1bd91e75f5 i18n/legacy: Fix typo 
No functional changes.
 2015-08-31 21:33:46 -03:00
Ignacio R. Morelle
185aa1a2f0 i18n: Fix typo 
No functional changes.
 2015-08-31 21:22:07 -03:00
gfgtdf
e5920a1240 fix warning 
previously this happened when bringing up the quit dialog with the
Objectives (GUI2) dialog active: warning gui/event: Unhandled event 12.
 2015-09-01 00:43:20 +02:00
Elvish_Hunter
b23e93a823 GUI.pyw: added exit confirmation dialog 2015-08-31 23:12:06 +02:00
gfgtdf
a247fae572 add comments 2015-08-31 22:59:08 +02:00
gfgtdf
0abde389dc show confirmation dialog when quitting 
when quitting (for example by clicking on the red cross in the corner) the
game now asks for a confirmation, if there is currently a (re-)play or
the editor running.
 2015-08-31 22:45:57 +02:00
Elvish_Hunter
8db92e9af3 wmllint-1.4: replaced backticks with repr() 2015-08-31 22:05:03 +02:00
Charles Dang
50aeac6e30 Prefix help topic sections with bullets as well 2015-08-31 23:51:00 +11:00
aquileia
f986fe7063 Fixup Finnish translation in 10023c9290de 2015-08-31 12:46:11 +02:00
Ignacio R. Morelle
385cd42215 Merge pull request #440 from pquentin/master 
Fix get_exe_dir on OS X
 2015-08-31 02:12:42 -03:00
aquileia
10023c9290 Windows uninstaller: Add option to delete userdata dir 2015-08-31 03:15:03 +02:00
Elvish_Hunter
2bc6aadd49 wmllint-1.4: map, str and dir are Python internal function 
Added underscores to distinguish variable names.
 2015-08-30 11:06:22 +02:00
Elvish_Hunter
e5bcb79ac8 wmllint-1.4: used Python 3 filter() and map() 2015-08-30 10:50:56 +02:00
Quentin Pradet
f71784a05b Fix get_exe_dir on OS X 
Except on Windows, this detects procfs before using it instead of trying
to detect the OS.
 2015-08-30 10:05:28 +04:00
Nils Kneuper
358ffb7277 updated Japanese translation 2015-08-29 10:41:25 +02:00
aquileia
de799cfe6b Update Italian translation 2015-08-29 05:26:36 +02:00
gfgtdf
6e14fc46c3 Remove unused carryover data from saves 
Ths removes the content of [variables] and [menu_item]s from
[carryover_sides] in mid-scenario saves. This data is not needed becasue
it is already merged in the scenario data.
 2015-08-28 23:39:07 +02:00
gfgtdf
a245f0e14e Update changelog 2015-08-28 20:45:22 +02:00
gfgtdf
2fb119d964 revert 'option to disable most of spmp patch' 
That commit was meant as a plan b in case we couldn't fix the spmp
related bugs which are now fixed.
 2015-08-27 15:25:21 +02:00
gfgtdf
30dc78636b allow [event] (and [lua]) inside [campaign] 
Those tags will be copied into each scenario of the campaign.

http://gna.org/bugs/?23769
 2015-08-26 21:53:58 +02:00
gfgtdf
9821133533 Fix savegame compability for [advance]->[advancement] patch 2015-08-26 21:20:06 +02:00
Charles Dang
66b6ca39a1 Merge pull request #476 from Wedge009/Spelling_Corrections 
Spelling corrections
 2015-08-26 18:34:05 +11:00
Wedge009
e37ee6a192 Spelling corrections 
recieve -> receive
intepolate -> interpolate
 2015-08-26 17:31:03 +10:00
Wedge009
f05557a7d9 Spelling corrections 
recieve -> receive
intepolate -> interpolate
 2015-08-26 17:30:44 +10:00
mattsc
f8dc5d027c Merge pull request #464 from CelticMinstrel/trans 
XCode: Copy translations to target if they have been built
 2015-08-25 20:02:32 -07:00
gfgtdf
7cdeafd1e0 Add savegame compability for [advancement]->[advance] patch 2015-08-26 01:04:00 +02:00
Elvish_Hunter
b3a42b4c9b wmlscope: removed dependency from Pillow library 
This was possible because the documentation of the PNG format is quite clear, and the code doesn't need to check JPG images.
 2015-08-25 21:12:52 +02:00
gfgtdf
6270e0a620 remove outcommented code. 2015-08-25 17:05:34 +02:00
gfgtdf
9ba49ddf0e savegame compability code for era_blank change. 
adds compability code for c2e1d71fc2.
 2015-08-25 17:01:31 +02:00
Elvish_Hunter
def724816f wmllint: fixed an error when trying to check if a file is a savegame 
The error was caused by the fact that opening a file with codecs.open() is much stricter than using open(mode=rb), and throws a UnicodeDecodeError if a file can't be read as UTF-8 - which is the case for binary files.
 2015-08-25 14:07:26 +02:00
Ignacio R. Morelle
a55bc98630 Make hanging, chasm stone, and plank bridges conform to naming conventions 
Namely, make the long descriptive name be displayed only in the editor,
and use the "Bridge" shorthand in-game instead.
 2015-08-25 02:31:21 -03:00
Ignacio R. Morelle
1e32ae69f5 Fix hanging, chasm stone, and plank bridge elevations 
The N-S hanging bridge variant does not need an elevation shift, and
all diagonal variants of the other two were missing their own.
 2015-08-25 02:31:17 -03:00
Charles Dang
58b0697b00 DiD S7: apply TC to dummy images 2015-08-25 08:54:53 +11:00
Ignacio R. Morelle
d9d57cf801 Merge pull request #473 from aginor/sdl2graphics 
Fix cmake on OSX and fix alpha blending issue with SDL2 while scrolling
 2015-08-24 18:51:21 -03:00
Andreas Löf
75035a04f2 Fix alpha blending issue when scrolling under SDL2 
SDL2 has a workaround for a broken blitting operation, and on some
hardware accelerated systems this led to an alpha blending issue where
map regions that were frequently redrawn would grow progressively
darker until the alpha blended aspects are black. This disables
alpha-blending on the copy of the scrolled map area as no further
alpha composition should be done without a complete redraw of the
affected area.
 2015-08-24 22:33:24 +12:00
Andreas Löf
c42ba83b82 Fix cmake scripts for use on OSX with homebrew. 
It seems that cmake won't pick up on the FindPackageHandleStandardArgs
macro on its on from homebrew so I've updated the script to include it.
 2015-08-24 19:05:28 +12:00
Charles Dang
bd6f488931 Two more new item icons by doofus-01 2015-08-24 15:30:53 +11:00
Charles Dang
e5d496694e Added several new item icons by doofus-01 2015-08-24 13:53:12 +11:00
Ignacio R. Morelle
870987886c wmllint: Add plain-text substitution rule for [/advance] -> [/advancement] 
I forgot these are plain-text substitutions, so of course we need a
matching rule for closing tags.
 2015-08-23 21:54:34 -03:00
Ignacio R. Morelle
863fb3fd2d wmllint: Add plain-text substitution rule for [advance] -> [advancement] 2015-08-23 21:52:57 -03:00
Ignacio R. Morelle
df9908932d Merge branch 'amla' of https://github.com/CelticMinstrel/wesnoth into staging/pr-468 2015-08-23 21:40:31 -03:00
Ignacio R. Morelle
80ec273c99 Merge pull request #471 from CelticMinstrel/labels 
Fix hidden/empty sides showing in Label Settings
 2015-08-23 21:37:06 -03:00
Celtic Minstrel
bd1b1e45a9 Add final fallback case for side label display names 2015-08-23 18:17:47 -04:00
Celtic Minstrel
e3c38d8e53 Fix hidden sides showing in Label Settings, and some sides showing up as empty 2015-08-23 17:10:08 -04:00