54883 Commits

Author SHA1 Message Date
Alexander van Gessel
8219e4be8f Add --data-path option 2013-12-28 14:12:42 +01:00
Alexander van Gessel
63cf0fe6e3 documentation about --user{config,data}-{dir,path} 2013-12-28 14:12:23 +01:00
Alexander van Gessel
bf8b05ff31 Split --config-{dir,path} into --user{config,data}-{dir,path} 2013-12-28 12:38:11 +01:00
Alexander van Gessel
65240630e8 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-27 23:05:41 +01:00
Alexander van Gessel
146fff09b4 Adapt filesystem functions to userdata/userconfig split 2013-12-27 23:01:11 +01:00
Alexander van Gessel
2b22f942e0 Get rid of an unnecessary variable 2013-12-27 21:30:10 +01:00
mattsc
d5e27a2e3f Correct the example given for MODIFY_AI_ADD_ASPECT
The [facet] tag is needed, but was not shown.
2013-12-27 10:20:24 -08:00
fendrin
2cbeb506d1 Second batch of renaming and sorting of the hotkey enumeration. 2013-12-27 15:20:31 +01:00
Andrius Silinskas
c8f861cee4 Partially revert e45df51a0d1b3b37e6d15c6f5cdf861e5c504de8.
Fixes bug #21214.
2013-12-27 13:45:54 +00:00
fendrin
1aeb4e4a3c Clean up of the hotkey enumeration.
Removed obsolete ones.
Renamed the selection related members to get some naming consistency.
Added some needed to control the state of menues.
Grouped related ones together.
2013-12-27 12:26:47 +01:00
fendrin
4c18bed7c0 Remove debug output. 2013-12-27 05:39:38 +01:00
fendrin
0affe77221 Implemented the area feature properly.
Adds remove, add, rename, save and local time menu entries to the editor
"Area" menu.

The local time menu still segfaults if there is no area defined.
2013-12-27 05:26:26 +01:00
fendrin
2389475c1c Disable the buttons of empty menues. 2013-12-27 05:26:26 +01:00
mattsc
04b8609149 Update auto-generated macro reference page with AI macros 2013-12-26 20:03:24 -08:00
mattsc
12c73569ca AI macros: update comments for display on wiki reference page
This is for the auto-generated page at
http://www.wesnoth.org/macro-reference.html
2013-12-26 20:00:45 -08:00
Ignacio R. Morelle
f94e7b48f0 test suite: Create and configure an RNG instance for the unit_map test
Otherwise we fail an assertion check later because
unit::generate_gender() wants an RNG to be configured.
2013-12-26 18:53:17 -03:00
Ignacio R. Morelle
9d4c7e21c8 test suite: Create a hotkey_manager instance for the MP connect test
Otherwise we fail an assertion check later because the implementation of
hotkey::get_hotkey_null() tries to access the last item of an empty
container.
2013-12-26 18:51:44 -03:00
mattsc
99bd9dce7b TRoW S15: add new attack and retreat AI candidate actions
The attack CA is very aggressive and almost exclusively tries to deal
maximum damage, but will not execute an attack if therre's a chance of
dying for the attacker.  The retreat CA is the same as that used in the
Experimental AI.
2013-12-26 11:48:18 -08:00
ln-zookeeper
74929fb284 Reworked the scenario so that your objective is to avoid anyone dying and that amount of carryover gold depends on how long you last. Missing the necessary AI changes and a whole lot of balancing. 2013-12-26 21:09:13 +02:00
David Mikos
5cf466942a Override updates for window resizing and scrollbar changes for textbox text best fit. 2013-12-26 14:03:28 +10:30
David Mikos
1f94869fd7 Fix bug with scrollbar overlaying text in GUI textbox (fixes bug #21364) 2013-12-26 12:14:46 +10:30
Bär Halberkamp
d1a9f1f259 EI: Improved scenario 6's map 2013-12-25 23:05:53 +01:00
Bär Halberkamp
8d8d6947ce Simplified AnimationWML for the Orcish Shamans 2013-12-25 23:05:53 +01:00
Alexander van Gessel
e2bbbc2e59 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-25 17:42:08 +01:00
Alexander van Gessel
ddd568fce4 Have network_asio not wait forever on invalid package sizes 2013-12-25 17:41:48 +01:00
Bär Halberkamp
b146cdd54d Fixed a typo: horse_canter.wav -> horse-canter.wav 2013-12-25 16:21:42 +01:00
Bär Halberkamp
f8a5162e25 Updated Khalifate AnimationWML 2013-12-25 16:21:42 +01:00
Ignacio R. Morelle
94ad6e92fd campaignd: Add missing blank in the error response for missing add-ons 2013-12-24 19:58:28 -03:00
Ignacio R. Morelle
55e32d55de Update changelog 2013-12-24 19:57:54 -03:00
Ignacio R. Morelle
6b7abb4c8a campaignd: Abort sending if the pack size is negative (bug #20893)
Sending an add-on whose size could not be determined means that the pack
in which it is stored is inaccessible in some way. Proceeding in this
situation, with the network::send_file() fix for the same condition,
results in the built-in add-ons client stalling forever waiting for
campaignd to send data to it, so we must respond with an [error] tag
instead.

This is the final step in fixing bug #20893.
2013-12-24 19:51:28 -03:00
Ignacio R. Morelle
b04da7940f network: Abort send_file() if the file size is negative (bug #20893)
Sending a file whose size we can't know (because stat() failed) probably
means it is inaccessible. Trying to proceed in this situation leads to a
series of numeric errors described in the first comment to bug #20893.
2013-12-24 19:51:28 -03:00
Ignacio R. Morelle
5e2168bec0 gui2/tprogress_bar: Limit set_percentage() argument to 100 (bug #20893)
This makes it so the set_percentage() argument is limited to
unsigned(100) instead of having an assertion check fail when it is
greater than 100.

Part of bug #20893.
2013-12-24 19:51:28 -03:00
Alexander van Gessel
e6c210a705 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-24 23:41:40 +01:00
Alexander van Gessel
1933e99c4b Replace 'widescreen' with an actual aspect ratio 2013-12-24 23:41:23 +01:00
Espreon
e30bb5b138 Updated the Latin translation. 2013-12-24 16:59:54 -05:00
Ignacio R. Morelle
9a7457e4ca Add a tip on parallel builds to the CB readme 2013-12-24 16:55:30 -03:00
Ignacio R. Morelle
e3332d670d Add a note about 64-bit Windows builds to the CB readme
It seems there are people who can't tell the difference between tdm-*
and tdm64-*.
2013-12-24 16:53:47 -03:00
Ignacio R. Morelle
9a589eb585 Line-wrap CB readme to 80 columns 2013-12-24 15:11:43 -03:00
David Mikos
acb4cb1952 Fix quote termination issue in about.cfg with recent commit 2013-12-24 10:47:09 +10:30
happygrue
e96f430780 Fixed a typo. 2013-12-23 18:31:37 -05:00
happygrue
b38b51e5dc Updated info for happygrue, jb, Turuk 2013-12-23 18:28:57 -05:00
Ignacio R. Morelle
c6f6331827 preferences: Prevent ghost widgets glitch in Advanced by hiding all first
Hiding all Advanced preferences control widgets before deciding which to
unhide for the current selection avoids the situation where a previously
hidden widget is unhid and captures the background including a visible
widget about to be unhidden, resulting in the newly visible widget
restoring the previous widget's surface when drawn.

The bug this commit fixes only became possible when we gained a third
advanced preferences control widget/advanced preferences option type. It
is possible that the widget construction/placement/visibility toggling
orders are mismatched, but to be honest I'm not too interested in
messing with that further given this sensible workaround.
2013-12-23 19:32:06 -03:00
happygrue
95fa91e0c2 Updated CodeBlocks walkthrough with user input. 2013-12-23 13:47:15 -05:00
anonymissimus
d4401e5777 vc project update 2013-12-23 18:37:56 +01:00
anonymissimus
713a183805 avoid a compile error
(ambiguous call of overloaded function)
2013-12-23 18:37:56 +01:00
fendrin
13446f55c9 Fix the default theme for small resolutions to some degree. 2013-12-23 07:58:22 +01:00
David Mikos
21e6369670 if mp mods conflict and scenario type changes, update text accordingly 2013-12-23 16:19:54 +10:30
David Mikos
91f3c75eda Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-23 16:11:43 +10:30
David Mikos
b3fe2faea4 if mp mods conflict on game creation screenfix jump to scenario type. 2013-12-23 14:17:46 +10:30
Ignacio R. Morelle
5e2845bfea gui2: Do not optimize intermediate surfaces on tcanvas::blit()
This method only uses intermediate surfaces when blurring on a
non-neutral target, but it's still a waste of time for short-lived
surfaces.
2013-12-22 23:34:11 -03:00