Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into guifixes
Browse files Browse the repository at this point in the history 
Conflicts:
	src/events.cpp
	src/hotkey/command_executor.hpp
	src/video.cpp

Resolved manually.
  • Loading branch information
@aginor
aginor committed Feb 21, 2016
2 parents a275ea9 + 8952ca0 commit b8f1891
Show file tree
Hide file tree
Showing 1,510 changed files with 212,502 additions and 104,218 deletions.
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Expand Up @@ -61,7 +61,11 @@ option(ENABLE_LIBINTL "Enable using libintl for translations instead of Boost.Lo
option(ENABLE_HISTORY "Enable using GNU history for history in lua console" ON)

if(ENABLE_SDL2)
find_package(SDL2 2.0.0 REQUIRED)
if(UNIX AND NOT APPLE AND NOT CYGWIN)
find_package(SDL2 2.0.2 REQUIRED)
else (UNIX AND NOT APPLE AND NOT CYGWIN)
find_package(SDL2 2.0.4 REQUIRED)
endif (UNIX AND NOT APPLE AND NOT CYGWIN)
else(ENABLE_SDL2)
find_package(SDL 1.2.7 REQUIRED)
endif(ENABLE_SDL2)
Expand Down
12 changes: 6 additions & 6 deletions INSTALL
View file
Expand Up @@ -26,11 +26,11 @@ order to build Wesnoth:
* Program Options >= 1.36.0
* System >= 1.36.0
* SDL2 libraries:
* SDL2 >= 2.0.4
* SDL2_image >= 2.0.0 (with PNG and JPEG support)
* SDL2_mixer >= 2.0.0 (with Ogg Vorbis support)
* SDL2_ttf >= 2.0.12
* SDL2_net >= 2.0.0
* SDL2 >= 2.0.2 (2.0.4 on Windows and OS X)
* SDL2_image >= 2.0.0 (with PNG and JPEG support)
* SDL2_mixer >= 2.0.0 (with Ogg Vorbis support)
* SDL2_ttf >= 2.0.12
* SDL2_net >= 2.0.0
* Fontconfig >= 2.4.1
* Pango >= 1.21.3 (with Cairo backend)
* Vorbisfile
Expand Down Expand Up @@ -95,7 +95,7 @@ rebuild Wesnoth frequently (i.e. for development and testing).
NOTE: It has been reported that using GCC 3.3.6 and earlier versions with
optimizations enabled will result in a build that is incapable of using
multiplayer. See <https://gna.org/bugs/?10326> for further details. We
recommend using GCC 4.x to build Wesnoth.
recommend using GCC 4.x and later to build Wesnoth.


3. SCons Build
Expand Down
15 changes: 12 additions & 3 deletions RELEASE_NOTES
View file
Expand Up @@ -20,6 +20,7 @@ Example contents.

[rasection="WML/Lua compatibility changes and deprecations"]
[list]
[*]wesnoth.set/get_dialog_value now takes/returns an integer (0 or 1) instead of a boolean for toggelbuttons and toggelpanels. The reason is that wesnoth now also supports tristate buttons and comboboxes where it can returns values other than 0 or 1.
[/list]
[/rasection]

Expand All @@ -31,6 +32,10 @@ The game now uses SDL2 for all operations. There is still a fall-back option of
The hotkey implementation has been changed to rely on scancodes over characters. This means that the hotkey configuration now uses the same physical buttons on the keyboard, regardless of the keyboard layout.
[/rasection]

[rasection="New WML event"]
A new 'unit placed' event has been added, making it possible to better implement certain kinds of event-driven behavior. [wiki=EventWML]See the wiki for details[/wiki].
[/rasection]

==========
KNOWN BUGS
==========
Expand All @@ -40,7 +45,14 @@ KNOWN BUGS

[list]
[*]The MP server has trouble with Local player types in campaigns (bug [bug]21965[/bug]). We have decided to postpone dealing with this. In the meantime, you might try assigning such sides to the host, or running multiple instances of Wesnoth.
[*]2p mp survival map Dark Forecast is bugged (24200).
[/list]
[*]Doubled-up GUI1 dialogs don't redraw the secondary in SDL2 (bug [bug]24294[/bug]).
[*]Window state handling inconsistent across different OSes in SDL2 builds (bug [bug]24270[/bug]).
[*]Area under Objectives not redrawn on resize (bug [bug]24261[/bug]).
[*]Menu and Action buttons disappear on resize (bug [bug]24260[/bug]).
[*]Wesnoth does not exist on the panel (bug [bug]24202[/bug]).
[*]SDL2 build handled input incorrectly once window focus is lost when menus are open (bug [bug]24212[/bug]).
[/raissue]

[raissue="Carried over from 1.12.x"]
Expand All @@ -66,13 +78,10 @@ This is likely caused by outdated libraries in the packaging process. There is n
The following issues affecting Wesnoth on Apple OS X are known and they are pending fixes. Many of them require significant re-engineering that can only be done in 1.13.x development releases later, or cannot be properly addressed due to a lack of experienced OS X coders in our team. Thus, unless someone can contribute patches to address them, it is unlikely that these bugs will be fixed.

[list]
[*]Color cursors are forcibly disabled on this platform due to severe performance issues (bug [bug]18112[/bug]).
[*]The default variable-width font is used instead of a monospace font even where a monospace font is required (bug [bug]23628[/bug]).
[*]Helvetica is used as the default variable-width font instead of DejaVu Sans (bug [bug]23560[/bug]).
[*]Fullscreen mode does not fill the entire screen when maximum resolution is selected in Preferences → Display, and user interface elements are scaled and distorted.
[*]System commands do not work while Wesnoth is running in fullscreen mode (bug [bug]21943[/bug]).
[*]The mouse cursor is not mapped correctly to the game screen contents on Retina displays due to problems with detected vs. real screen resolution mismatches (bug [bug]20332[/bug]).
A workaround is in place making Wesnoth default to 800x600 on OS X regardless of the incorrectly-detected maximum resolution.
[*]Trackpad tap clicking is sometimes not recognized ([url=http://forums.wesnoth.org/viewtopic.php?f=4&t=39788]forum post[/url]).
[*]Unofficial builds with OpenMP support enabled randomly freeze (bug [bug]18144[/bug]).
[*]Consecutive line breaks (paragraph breaks) are not rendered as expected (bug [bug]21649[/bug]).
Expand Down
10 changes: 8 additions & 2 deletions SConstruct
View file
Expand Up @@ -179,6 +179,12 @@ if env['distcc']:

if env['ccache']: env.Tool('ccache')

SDL2_version = '';
if env["PLATFORM"] is "win32" or env["PLATFORM"] is "cygwin" or env["PLATFORM"] is "darwin":
SDL2_version = '2.0.4';
else:
SDL2_version = '2.0.2';


Help("""Arguments may be a mixture of switches and targets in any order.
Switches apply to the entire build regardless of where they are in the order.
Expand Down Expand Up @@ -360,12 +366,12 @@ if env["prereqs"]:
if env['sdl2']:
def have_sdl_net():
return \
conf.CheckSDL(require_version = '2.0.0') & \
conf.CheckSDL(require_version = SDL2_version) & \
conf.CheckSDL("SDL2_net", header_file = "SDL_net")

def have_sdl_other():
return \
conf.CheckSDL(require_version = '2.0.0') & \
conf.CheckSDL(require_version = SDL2_version) & \
conf.CheckSDL("SDL2_ttf", header_file = "SDL_ttf") & \
conf.CheckSDL("SDL2_mixer", header_file = "SDL_mixer") & \
conf.CheckSDL("SDL2_image", header_file = "SDL_image")
Expand Down
73 changes: 61 additions & 12 deletions changelog
View file
@@ -1,28 +1,77 @@
Version 1.13.2+dev:
* Greatly improved SDL 2 support. SDL 2 is now used by default build when
building. This fixes the following bugs, among others:
* Bug #18112: Color cursors cause slow mouse movement at menus
* Bug #20332: Cursor not mapping correctly on Retina display when in Windowed
mode
* Bug #24138: SDL 2 crash on resize after starting a game and returning to
the title screen
* Bug #23908: SDL 2 SDL_BlitSurface causes crashes
* Bug #23821: Text input is broken in GUI1 under SDL 2
* Bug #23820: SDL 2 alpha blending issues
* Bug #23918: UI graphics garbled on OS X 10.11 El Capitan
* Bug #24214: SDL 2 build handles fullscreen toggle badly
* Bug #23934: Resize actions are laggy
* Bug #24209: Screen becomes black upon minimise and restore
* Bug #24213: SDL 2 build leaves menu items stuck if window dimensions
change while open
* Campaigns:
* Liberty:
* Added some animations for the Rogue Mage line.
* Fixed Relana appearing as male.
* Sceptre of Fire:
* Added some animations for Dwarvish Miner.
* Improved sprite for Dwarvish Caravan.
* Son of the Black-Eye:
* Added some animations for the Orcish Shamans.
* Under the Burning Suns:
* Updated sprites for Naga Hunter and Naga Guardian line.
* Updated sprites for Naga Hunter, Naga Guardian line, Crab Man.
* Crab Man changed to Monster Crab.
* Graphics:
* Improved or new terrain graphics: Stones with Sand Drifts, Igloo Village,
Adobe Village.
* Language and i18n:
* Updated translations: British English, Russian, Swedish
* New translation: Asturian
* Updated translations: British English, Galician, Russian, Swedish
* Sound effects:
* Fixed various subtle timing problems with attack sounds.
* Terrains:
* New terrain: Desert Mountains (Mdy), Impassable Desert Mountains (Mdy^Xm),
Ruined Adobe Village (^Vdr).
* User Interface:
* GUI1 comboboxes now use the thinner menu frame style.
* Implemented a new GUI2 Attack dialog
* Added gui2 comboboxes.
* Removed prompt when purging the WML cache from Preferences.
* WML engine:
* Added new event "unit placed", which triggers when (and regardless of how)
a unit appears on the map.
* Added support for color= in [unstore_unit] and [print]
* removed network and network_ai controlles, whether a side is networked is
now stored in the is_local attribute.
* Eventnames (received in wesnoth.game_events.on_event) now have all their
spaces replaced with underscores.
* lua can now read/write the 'persistent' attribute of sides.
* lua can now read/write the 'alignment' attribute of units.
* Added {CURRENT_FILE} and {CURRENT_DIRECTORY} macros.
* add support for relative dirs in wesnoth.dofile/require
* Added name= and write_name= attributes in [item]
* Miscellaneous and bug fixes:
* Fix the new log code on Windows to actually use Unicode-aware functions
in a couple of places so Wesnoth does not quit on startup when trying to
relocate the log file to a path with Unicode characters (bug #22897,
definitely fixed this time).
* Decreased high memory consumption caused by the animated water.
* Fix bug #23108: exclude aborted attacks from statistics
* imgcheck now runs on Python 3
* Fix bug #15259: Secondary click uses control-click instead of command-click in OS X
* New hi-res icon using new logo for OS X
* Greatly improved SDL2 support. SDL2 is now the default build.
* Fix bug #24138: SDL2 crash on resize after starting a game and returning to title screen
* Fix bug #23908: SDL2 SDL_BlitSurface Causes Crashes
* Fix bug #23821: Text input is broken in GUI1 under SDL2
* Fix bug #23820: SDL 2 alpha blending issues
* Fix bug #23918: UI Graphics in OS X 10.11 El Capitan
* Fix bug #18112: Color cursor causes slow mouse movement at menus
* Fix bug #24214: SDL2 build handles fullscreen toggle badly
* Fix bug #23934: Resize actions are laggy

* Removed the "wmlmove" Python tool
* Fixed [event] in [unit_type].
* Fixed oos caused by mp replay turn feature.
* Fixed oos bugs caused by plattform dependent rounding from double to int in lua.
* Fixed custom (lua-defined) scenario tags beeing removed from [replay_start]
* fixed savefile bloat caused by unit variations (walking corpses)

Version 1.13.2:
* Add-ons client:
Expand Down
47 changes: 12 additions & 35 deletions data/advanced_preferences.cfg
View file
@@ -1,28 +1,22 @@
#textdomain wesnoth
[advanced_preference]
field=compress_saves
# po: Associated save_compression_short^ entries need to be as short as
# po: possible to avoid stretching the advanced preferences list too
# po: much.
name= _ "Compress saved games"
type=combo
default=gzip
[option]
id=gzip
name= _ "save_compression^Gzip"
name_short= _ "save_compression_short^gzip"
description= _ "save_compression_desc^Default compression, faster"
[/option]
[option]
id=bzip2
name= _ "save_compression^Bzip2"
name_short= _ "save_compression_short^bzip2"
description= _ "save_compression_desc^Best compression, slower"
[/option]
[option]
id=none
name= _ "save_compression^No"
name_short= _ "save_compression_short^no"
description= _ "save_compression_desc^Large plain text files"
[/option]
[/advanced_preference]
Expand Down Expand Up @@ -55,20 +49,6 @@
default=yes
[/advanced_preference]

[advanced_preference]
field=local_tod_lighting
name= _ "Local time of day area lighting"
type=boolean
default=yes
[/advanced_preference]

[advanced_preference]
field=startup_effect
name= _ "Show titlescreen animation"
type=boolean
default=no
[/advanced_preference]

[advanced_preference]
field=show_combat
name= _ "Show combat"
Expand All @@ -87,13 +67,6 @@
step=5
[/advanced_preference]

[advanced_preference]
field=lobby_whisper_friends_only
name= _ "Accept whispers from friends only"
type=boolean
default=no
[/advanced_preference]

[advanced_preference]
field=lobby_auto_open_whisper_windows
name= _ "Auto-open whisper windows in lobby"
Expand All @@ -108,14 +81,6 @@
default=yes
[/advanced_preference]

[advanced_preference]
field=flip_time
name= _ "Reverse time graphics"
description= _ "Choose whether the sun moves left-to-right or right-to-left"
type=boolean
default=no
[/advanced_preference]

[advanced_preference]
field=scroll_to_action
name= _ "Follow unit actions"
Expand Down Expand Up @@ -205,6 +170,18 @@
default=no
[/advanced_preference]

[advanced_preference]
field=advanced_graphic_options
name= _ "Graphics scaling options"
type=custom
[/advanced_preference]

[advanced_preference]
field=orb_color
name= _ "Customize orb colors"
type=custom
[/advanced_preference]

#ifdef __UNUSED__
[advanced_preference]
field=joystick_support_enabled
Expand Down
2 changes: 1 addition & 1 deletion data/ai/dev/akihara_recruitment.cfg
View file
Expand Up @@ -5,7 +5,7 @@
#endif

[ai]
id=ai_akihara
id=ai_dev_akihara
description=_"Multiplayer_AI^Dev AI: Default + Experimental Recruitment (C++ Akihara)" # wmllint: no spellcheck
version=10800
[stage]
Expand Down
2 changes: 1 addition & 1 deletion data/ai/micro_ais/scenarios/scenario_micro_ai.cfg
View file
Expand Up @@ -5,7 +5,7 @@
name= _ "Micro AI Tests"
next_scenario=null

map_data="{multiplayer/maps/Dark_Forecast.map}"
map_data="{multiplayer/maps/Dark_Forecast_basic.map}"

{DEFAULT_SCHEDULE}
turns=-1
Expand Down
2 changes: 1 addition & 1 deletion data/ai/micro_ais/scenarios/simple_attack.cfg
View file
Expand Up @@ -5,7 +5,7 @@
name= _ "Simple Attack"
next_scenario=micro_ai_test

map_data="{multiplayer/maps/Dark_Forecast.map}"
map_data="{multiplayer/maps/Dark_Forecast_basic.map}"

{DEFAULT_SCHEDULE}
turns=-1
Expand Down
23 changes: 16 additions & 7 deletions data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg
View file
@@ -1,7 +1,7 @@
#textdomain wesnoth-aoi

# Warning: If you are not a native and literate English speaker, do
# not try to modify the storyline text. It is deliberately written
# not try to modify the storyline text. It is deliberately written
# in a somewhat archaic and poetic form of English, and some previous
# attempts to "fix" it inflicted damage that was difficult to undo.

Expand Down Expand Up @@ -50,10 +50,10 @@
[side]
side=1
controller=human
recruit="Elvish Archer, Elvish Fighter, Elvish Scout, Elvish Shaman"
recruit="Elvish Archer,Elvish Fighter,Elvish Scout,Elvish Shaman"
{GOLD 200 150 100}
income=0
team_name=good
team_name=Elves
user_team_name= _ "Elves"
{FLAG_VARIANT wood-elvish}

Expand All @@ -62,18 +62,27 @@

facing=nw

{NAMED_LOYAL_UNIT 1 "Elvish Rider" 15 18 "Lomarfel" ( _ "Lomarfel")}
[+unit]
facing=ne
[unit]
side=1
type=Elvish Rider
id=Lomarfel
name= _ "Lomarfel"
profile=portraits/lomarfel.png
x,y=15,18
[modifications]
{TRAIT_LOYAL}
{TRAIT_RESILIENT}
[/modifications]
{IS_LOYAL}
facing=ne
[/unit]
[/side]
# wmllint: validate-on

[side]
side=2
controller=ai
recruit="Orcish Archer, Orcish Grunt, Wolf Rider"
recruit="Orcish Archer,Orcish Grunt,Wolf Rider"
{GOLD 100 125 150}
income=0
team_name=Orcs
Expand Down

0 comments on commit b8f1891

Please sign in to comment.