upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-18 14:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/wesnoth/wesnoth

Browse Source
This commit is contained in:
Chris Beck 2014-06-13 16:31:50 -04:00
commit d1a4a52f40
9 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
changelog
View File

@ -29,7 +29,7 @@ Version 1.13.0-dev:
on the signpost when the messenger comes back
* S3: make objectives consistent between before and after trolls appear
* S6: remove AI controller. It doesn't work with sides without a leader
* Minor balance tweaks to scenarios 7, 8, 12, 14 and 17.
* Minor balance tweaks to scenarios 7, 8, 12, 14, 15, 17 and 18.
* The Hammer of Thursagan:
* Fixed missing objective in 'The Court of Karrag'.
* Rebalanced scenarios 'Invaders', Mages and Drakes' and 'Fear'.
@ -53,7 +53,7 @@ Version 1.13.0-dev:
* Add 'elemental' trait to mudcrawler line
* Fix sound timings for drake fire animation macros
* User interface:
* Classic Theme which restores the 1.10 UI.
* Classic Theme which restores the 1.10 UI.
* Made orb and minmap colors configurable by the game preferences.
* Remove 'allow_new_game=no' entries from random map new game list
* Fixed bug #22095: An assertion failure in the gamestate inspector.
@ -74,7 +74,7 @@ Version 1.13.0-dev:
* Added support for [elseif] tags inside [if]
* Miscellaneous and bug fixes:
* replace 'fight_on_without_leader'=yes/no with defeat_condition=no_leader/
no_units/always/never which allows the wml developer to decide when a side
no_units/always/never which allows the wml developer to decide when a side
is considered defeated
* Fix Fisher-Yates implemenation of Lua helper.shuffle (bug #21706)
* Fixed issues with the ~BG() image path function not always working with
@ -153,24 +153,24 @@ Version 1.13.0-dev:
commands can be used to script a scenario and use the same code path
as if a human / ai ordered the command. These are intended to facilitate
making some kinds of noninteractive unit tests.
* Support for total conversions, so called "cores".
* Support for total conversions, so called "cores".
* Fix bug #22030: correct index of weapon special disable in attack GUI
* Fix bug #21964: assertion failure when using "controller" attribute with
a number.
* Add [do_command], remove [issue_attack_command] and [issue_move_command],
which are superceded by [do_command]. [do_command] takes the body of a
[command] tag from ReplayWML, (some possibilities not allowed), and
executes the corresponding action. It is replay safe and triggers WML
* Add [do_command], remove [issue_attack_command] and [issue_move_command],
which are superceded by [do_command]. [do_command] takes the body of a
[command] tag from ReplayWML, (some possibilities not allowed), and
executes the corresponding action. It is replay safe and triggers WML
events as appropriate.
* Reallow selection of another unit on same side without deselect first
* Add "strict mode". Using --log-strict=[severity] causes wesnoth to throw
a game_error exception when anything is written to a log as severe as
a game_error exception when anything is written to a log as severe as
that. For example --log-strict=warning causes both warnings and errors
to generate runtime exceptions. This is intended for unit tests.
* Fix bug #22042: filesystem content disclosure issue affecting Lua APIs
* Fix bug #21867: team flag colors not refreshed after making use of
[modify_side] color= unless a new flag set is also provided.
* Fix a bug where in movement records, "skip_sighted" was sometimes
* Fix a bug where in movement records, "skip_sighted" was sometimes
spelled as "skip_sighed".
* Fix bug #22020: make base units with variations help entry clickable
from the 'Unit Description' menu entry or from side pane.
@ -184,11 +184,11 @@ Version 1.13.0-dev:
* [modify_side] may now alter the value of [side] defeat_condition.
* Fix bug #22116: unlock movement when attacking enemy+discovering in fog
* In mp the other players now also proceed to the next scenario if one human player wins.
* Fix bug #21397: "Saving and loading may cause a side's turn is not
* Fix bug #21397: "Saving and loading may cause a side's turn is not
initialized".
* Fix bug which caused no units to be displayed when reloading an end of
scenario save, by stripping them from the save file. However, this does
not fix bug #15545, which was the reason that this behavior was introduced.
* Fix bug which caused no units to be displayed when reloading an end of
scenario save, by stripping them from the save file. However, this does
not fix bug #15545, which was the reason that this behavior was introduced.
* Fix bug #22123 "Replays don't reset map when reset button is pressed, causing OOS"
* Wesnoth reports an error if it evalutes [if] and finds no [then], [else], [elseif]
children, as a chat message from lua.

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/15_Civil_War.cfg
View File

@ -54,7 +54,7 @@
controller=human
team_name=Kapoue
user_team_name=_ "Kapou’e"
gold=300
gold=350
{BLACK_FLAG}
[/side]

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/17_The_Human_Attack.cfg
View File

@ -64,7 +64,7 @@
controller=human
team_name=Kapoue
user_team_name=_ "Kapou’e"
gold=300
gold=350
{BLACK_FLAG}
[/side]

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
View File

@ -87,7 +87,7 @@
team_name=villians
user_team_name=_"Villains"
{GOLD 600 800 1000}
{INCOME 30 40 50}
{INCOME 20 30 40}
[ai]
leader_value=50.0
villages_per_scout=10

18
projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj
View File

@ -324,7 +324,6 @@
B5599B0B0EC62181008DD061 /* reports.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999B70EC62181008DD061 /* reports.cpp */; };
B5599B0C0EC62181008DD061 /* replay_controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999B90EC62181008DD061 /* replay_controller.cpp */; };
B5599B0D0EC62181008DD061 /* replay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999BB0EC62181008DD061 /* replay.cpp */; };
B5599B0E0EC62181008DD061 /* random.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999BE0EC62181008DD061 /* random.cpp */; };
B5599B0F0EC62181008DD061 /* race.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999C00EC62181008DD061 /* race.cpp */; };
B5599B100EC62181008DD061 /* preferences_display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999C20EC62181008DD061 /* preferences_display.cpp */; };
B5599B110EC62181008DD061 /* preferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999C40EC62181008DD061 /* preferences.cpp */; };
@ -599,7 +598,6 @@
B597C5D00FACD6CA00CE81F5 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A9BD210ECA805A002BE442 /* window.cpp */; };
B597C5D10FACD6CA00CE81F5 /* combo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999470EC62181008DD061 /* combo.cpp */; };
B597C5D30FACD6CA00CE81F5 /* unit_id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999750EC62181008DD061 /* unit_id.cpp */; };
B597C5D40FACD6CA00CE81F5 /* random.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999BE0EC62181008DD061 /* random.cpp */; };
B597C5D60FACD6CA00CE81F5 /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A9BD1F0ECA805A002BE442 /* widget.cpp */; };
B597C5D70FACD6CA00CE81F5 /* network.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B55999DA0EC62181008DD061 /* network.cpp */; };
B597C5D80FACD6CA00CE81F5 /* toggle_button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A9BD150ECA805A002BE442 /* toggle_button.cpp */; };
@ -920,6 +918,8 @@
ECBBD73D1928F3F200E434C6 /* terrain_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECBBD73B1928F3F100E434C6 /* terrain_builder.cpp */; };
ECBBD7401928F41500E434C6 /* core_selection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECBBD73E1928F41500E434C6 /* core_selection.cpp */; };
ECC8F41B185FE2E1004AC3BE /* format_time_summary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECC8F419185FE2E1004AC3BE /* format_time_summary.cpp */; };
ECD39893194B830300CF2125 /* saved_game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECD39891194B830300CF2125 /* saved_game.cpp */; };
ECD39895194B844A00CF2125 /* display_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECD39894194B844A00CF2125 /* display_context.cpp */; };
ECF3A0B318AD3E8800DD643A /* wml_error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECF3A0B118AD3E8700DD643A /* wml_error.cpp */; };
ECFA82E3184E59F3006782FB /* command_executor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECFA82DA184E59F3006782FB /* command_executor.cpp */; };
ECFA82E4184E59F3006782FB /* hotkey_command.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECFA82DC184E59F3006782FB /* hotkey_command.cpp */; };
@ -1523,8 +1523,6 @@
B55999BA0EC62181008DD061 /* replay.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = replay.hpp; path = ../src/replay.hpp; sourceTree = "<group>"; };
B55999BB0EC62181008DD061 /* replay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = replay.cpp; path = ../src/replay.cpp; sourceTree = "<group>"; };
B55999BC0EC62181008DD061 /* reference_counted_object.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = reference_counted_object.hpp; path = ../src/reference_counted_object.hpp; sourceTree = "<group>"; };
B55999BD0EC62181008DD061 /* random.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = random.hpp; path = ../src/random.hpp; sourceTree = "<group>"; };
B55999BE0EC62181008DD061 /* random.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = random.cpp; path = ../src/random.cpp; sourceTree = "<group>"; };
B55999BF0EC62181008DD061 /* race.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = race.hpp; path = ../src/race.hpp; sourceTree = "<group>"; };
B55999C00EC62181008DD061 /* race.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = race.cpp; path = ../src/race.cpp; sourceTree = "<group>"; };
B55999C10EC62181008DD061 /* preferences_display.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = preferences_display.hpp; path = ../src/preferences_display.hpp; sourceTree = "<group>"; };
@ -2141,6 +2139,9 @@
ECBBD73F1928F41500E434C6 /* core_selection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = core_selection.hpp; sourceTree = "<group>"; };
ECC8F419185FE2E1004AC3BE /* format_time_summary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = format_time_summary.cpp; sourceTree = "<group>"; };
ECC8F41A185FE2E1004AC3BE /* format_time_summary.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = format_time_summary.hpp; sourceTree = "<group>"; };
ECD39891194B830300CF2125 /* saved_game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = saved_game.cpp; sourceTree = "<group>"; };
ECD39892194B830300CF2125 /* saved_game.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = saved_game.hpp; sourceTree = "<group>"; };
ECD39894194B844A00CF2125 /* display_context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = display_context.cpp; sourceTree = "<group>"; };
ECF3A0B118AD3E8700DD643A /* wml_error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = wml_error.cpp; path = gui/dialogs/wml_error.cpp; sourceTree = "<group>"; };
ECF3A0B218AD3E8800DD643A /* wml_error.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = wml_error.hpp; path = gui/dialogs/wml_error.hpp; sourceTree = "<group>"; };
ECFA82DA184E59F3006782FB /* command_executor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = command_executor.cpp; path = hotkey/command_executor.cpp; sourceTree = "<group>"; };
@ -2424,6 +2425,9 @@
29B97315FDCFA39411CA2CEA /* src */ = {
isa = PBXGroup;
children = (
ECD39894194B844A00CF2125 /* display_context.cpp */,
ECD39891194B830300CF2125 /* saved_game.cpp */,
ECD39892194B830300CF2125 /* saved_game.hpp */,
EC28C59019423528003B0F5E /* save_index.cpp */,
EC28C58D19423426003B0F5E /* utils.cpp */,
EC28C58E19423426003B0F5E /* utils.hpp */,
@ -2651,8 +2655,6 @@
B55999BA0EC62181008DD061 /* replay.hpp */,
B55999BB0EC62181008DD061 /* replay.cpp */,
B55999BC0EC62181008DD061 /* reference_counted_object.hpp */,
B55999BD0EC62181008DD061 /* random.hpp */,
B55999BE0EC62181008DD061 /* random.cpp */,
B55999BF0EC62181008DD061 /* race.hpp */,
B55999C00EC62181008DD061 /* race.cpp */,
B55999C10EC62181008DD061 /* preferences_display.hpp */,
@ -4128,6 +4130,7 @@
B559986C0EC616B3008DD061 /* SDLMain.m in Sources */,
B5599AD30EC62181008DD061 /* wml_exception.cpp in Sources */,
B5599AD40EC62181008DD061 /* button.cpp in Sources */,
ECD39893194B830300CF2125 /* saved_game.cpp in Sources */,
B5599AD50EC62181008DD061 /* combo.cpp in Sources */,
B5599AD60EC62181008DD061 /* combo_drag.cpp in Sources */,
B5599AD70EC62181008DD061 /* drop_target.cpp in Sources */,
@ -4186,7 +4189,6 @@
B5599B0B0EC62181008DD061 /* reports.cpp in Sources */,
B5599B0C0EC62181008DD061 /* replay_controller.cpp in Sources */,
B5599B0D0EC62181008DD061 /* replay.cpp in Sources */,
B5599B0E0EC62181008DD061 /* random.cpp in Sources */,
B5599B0F0EC62181008DD061 /* race.cpp in Sources */,
B5599B100EC62181008DD061 /* preferences_display.cpp in Sources */,
B5599B110EC62181008DD061 /* preferences.cpp in Sources */,
@ -4307,6 +4309,7 @@
EC89A14A1879D17D00A3B0B1 /* lzio.cpp in Sources */,
B5795A680F05858100EB190E /* horizontal_scrollbar.cpp in Sources */,
B5795A690F05858100EB190E /* scrollbar_container.cpp in Sources */,
ECD39895194B844A00CF2125 /* display_context.cpp in Sources */,
B5795A6A0F05858100EB190E /* generator.cpp in Sources */,
B59915070F20E9FF00BAD4C1 /* mp_cmd_wrapper.cpp in Sources */,
B59915280F20EA1400BAD4C1 /* password_box.cpp in Sources */,
@ -4772,7 +4775,6 @@
B597C5D00FACD6CA00CE81F5 /* window.cpp in Sources */,
B597C5D10FACD6CA00CE81F5 /* combo.cpp in Sources */,
B597C5D30FACD6CA00CE81F5 /* unit_id.cpp in Sources */,
B597C5D40FACD6CA00CE81F5 /* random.cpp in Sources */,
B597C5D60FACD6CA00CE81F5 /* widget.cpp in Sources */,
B597C5D70FACD6CA00CE81F5 /* network.cpp in Sources */,
B597C5D80FACD6CA00CE81F5 /* toggle_button.cpp in Sources */,

1
src/CMakeLists.txt
View File

@ -1040,6 +1040,7 @@ if(ENABLE_GAME)
wesnoth-core
wesnoth-lua
wesnoth-game
wesnoth-sdl
)
endif(ENABLE_TESTS)

1
src/config.hpp
View File

@ -40,7 +40,6 @@
#include "game_errors.hpp"
#include "tstring.hpp"
#include "wesconfig.h"
class config;
struct tconfig_implementation;

1
src/game.cpp
View File

@ -38,6 +38,7 @@
#include "serialization/validator.hpp"
#include "statistics.hpp"
#include "version.hpp"
#include "wesconfig.h"
#include "wml_exception.hpp"
#include <cerrno>

2
src/tools/sdl2/sdl2.cpp
View File

@ -162,7 +162,7 @@ int main()
bool run = true;
while(run) {
if(dirty) {
window.clear();
window.fill(0, 0, 0, 0);
draw_command_line(window, line);
draw_command_history(window, history);
dirty = false;