Commit graph

57758 commits

Author SHA1 Message Date
Ignacio R. Morelle
2c675a85b7 Add space after commas in base terrain lists in terrain descriptions in help 2014-12-23 05:10:46 -03:00
Chris Beck
cd984ad0c2 travis: enable x2 build parallelism (it was very good on master) 2014-12-23 00:15:36 -05:00
Chris Beck
45d7882fa7 add documentation, scons check for jpg support in sdl_image
It was reported on Dec 22 2014 in irc that the game is broken if
this is missing, and a search shows that bigmaps and many campaign
story screens use jpg images.

It makes more sense imo to document this as an official dependency
now, and if we decide to change everything to png's then we can go
back and disable the jpg check then.

Conflicts:
	SConstruct
2014-12-22 22:25:23 -05:00
Ignacio R. Morelle
a2d8752a5c Request translating "Base Terrain: " string at runtime (bug #22901) 2014-12-22 22:31:38 -03:00
gfgtdf
cebc936b08 Update changelog
for commits:
385115727f
d7413d1915
ddefdbe53a
f2346bfb73
2014-12-23 02:27:01 +01:00
Ignacio R. Morelle
fd5e4a6db0 UtBS: Hide a stray Kaleh variation in help
AMLAs render variation pages nigh-completely useless for Kaleh anyway.
2014-12-22 22:25:11 -03:00
Ignacio R. Morelle
18250d4fb3 TRoW: Hide Jessene's unmasked variations in help
Not spoilery, but annoying since it's just a visual change.
2014-12-22 22:14:19 -03:00
Ignacio R. Morelle
a82a8eab36 Hide alternate Great Wolf variation from help as it's only a visual variation 2014-12-22 22:06:28 -03:00
Ignacio R. Morelle
5e4554f333 Assign translatable names to WC/Soulless variations (bug #22902)
Backported from master, commit bf75c9d062.

As I said on IRC, whether unit type variations use variation_id or
variation_name to define the variation id is wholly immaterial for
syncing purposes because serialized singular units:

 1) Do not include [variation] definitions nowadays;
 2) Have a single variation=<id> attribute, where the source for the id
    of variations is determined internally during initialization.

One situation that could result in collateral OOS errors is
[store_unit_type]/wesnoth.unit_types retrieving different information
for 1.12.0 and 1.12.1 game clients running the same WML/Lua script. I
suspect this should be relatively rare and it's possible to guard
against synchronization issues by checking for both variation_id and
variation_name for WC/Soulless variations and picking one accordingly.
2014-12-22 21:59:37 -03:00
Ignacio R. Morelle
6fcc2325f0 HttT: Hide Konrad and Li'sar's SoF-wielding variations in help
Otherwise it's a massive spoiler (not that anyone cares since it's
HttT).
2014-12-22 20:20:42 -03:00
Ignacio R. Morelle
be0c1a36db Skip generating help sections for units without hide_help=no variations
This fixes many instances of unit types with "technical" variations in
my campaign After the Storm being assigned help sections of their own.

Required adding a new method to unit_type that's actually cheaper than
checking for variations().empty(), as it doesn't involve allocating new
objects.
2014-12-22 20:14:59 -03:00
Ignacio R. Morelle
6221971368 mp: Fix game password being sent under the wrong parent node (bug #23015)
The password was sent under the client message's root node, rather than
the [create_game] subnode where the MP server expects to find the
password. This caused games created by affected clients to always lack a
join password.

This bug was presumably introduced by commit
13e22fd6f1 (1.11.6+dev).
2014-12-21 23:25:39 -03:00
Ignacio R. Morelle
7970552244 Add missing line break to log message (bug #23073) 2014-12-21 18:57:42 -03:00
Fabian Müller
618023e857 Backport 7dea2b92ab 2014-12-21 22:39:23 +01:00
Chris Beck
b8952d64cb Merge branch '1.12' of https://github.com/wesnoth/wesnoth into 1.12 2014-12-21 02:14:52 -05:00
Chris Beck
b7db0607f4 bug fix: host could move idle units on idle side's turn 2014-12-21 02:14:08 -05:00
ln-zookeeper
0a5868a0c0 Reinstated a commented-out easter egg 2014-12-20 19:01:44 +02:00
Matthias Schoeck
7c725f3772 Lurkers Micro AI: bug fix for attempting to attack petrified units 2014-12-15 19:21:25 -08:00
gfgtdf
ddefdbe53a Update gettext_boost.cpp
backports
ae86186db7
c96db7a17e
e99202c580
2014-12-15 02:51:13 +01:00
ln-zookeeper
3c60833fb1 Toned down the trolls on easier difficulties 2014-12-13 14:18:53 +02:00
ln-zookeeper
920b45da5e Simplified an event filter 2014-12-13 14:03:22 +02:00
ln-zookeeper
31ddd64825 Fixed bug #23054
bug #23054: EI: Captured - quick troll warrior ambushes rescuers
pre-disguise
2014-12-13 14:02:47 +02:00
ln-zookeeper
cc86e8d25e Ensure that at least one elf is spawned every time 2014-12-13 13:10:00 +02:00
ln-zookeeper
dcbeae4a77 Fixed bug #23059
bug #23059: SG: Vengeance - message using "name" doesn't display
2014-12-13 13:09:39 +02:00
ln-zookeeper
aa7b7eb80e Fixed bug #23048
bug #23048: EI: Evacuation - ill-formed terrain modification causes
horizontal line
2014-12-13 01:40:22 +02:00
Chris Beck
be63e12b1d refactor commit 0f887872a7 2014-12-10 19:49:58 -05:00
gfgtdf
f2346bfb73 catch boost locale conversion_error and add debug info
backports 
9f798cb4f1
f8dd7d6c87
d9352503b2
2014-12-10 23:12:10 +01:00
ln-zookeeper
8d4c34d62f Simplify an event 2014-12-09 16:36:16 +02:00
ln-zookeeper
5a2e76e79e Scrap the random guard placement
The guard placement randomization is practically impossible to write so
that it'd guarantee a route through the map without making it too
trivial.

Now, there are 3 separate hardcoded guard layouts, one of which will be
chosen at random.
2014-12-09 16:20:01 +02:00
gfgtdf
73a8176833 remove unused lua code
this lua codes weren't used, on the other hand they break modifications that could be used with LoW otherwise.
2014-12-07 20:49:53 +01:00
Chris Beck
ebea24c946 bugfix: swallow exceptions in save_blocker dtor
See code comments for more discussion.
2014-12-04 18:46:05 -05:00
Charles Dang
ac88447af1 UtBS S10: 'tallest peak was build' -> '[...] built' 2014-12-04 19:10:06 +11:00
ln-zookeeper
0a5cdbc395 Fix bug #23024 by repositioning {SOUND:SLOW} 2014-12-04 09:42:18 +02:00
anonymissimus
53aae073f0 disable unknown pragma warning from boost header 2014-12-03 23:07:44 +01:00
Chris Beck
2fa43e3df9 Merge pull request #335 from cbeck88/mp_connect_bool_test
check properly if a config attribute value is not a boolean
2014-11-30 19:26:58 -05:00
anonymissimus
7ae79e8b18 vc project update 2014-11-30 18:24:33 +01:00
anonymissimus
9c39e7c79c add and use constructor (instead of assignment)
This fixes a MSVC warning about "cannot instantiate
customcodecvt_do_conversion_writer".
2014-11-30 18:24:32 +01:00
anonymissimus
0f887872a7 replace typedef'ed type uintmax_t by its long form unsigned long long
It seems this type is not yet available in MSVC9, only in later versions.

Conflicts:

	src/filesystem_boost.cpp
2014-11-30 18:24:32 +01:00
mattsc
99b6c428d8 Reorder items in changelog 2014-11-28 19:59:44 -08:00
anonymissimus
e9c1b5acb3 CB build system update
changes (including commit 571b8ed1e4)
(other than adding/removing/moving/renaming files)

-updated boost headers and libs to 1.57
-added defines _WIN32_WINNT=0x0501 and DWINVER=0x0501 since otherwise
a boost header from asio doesn't compile
solution found here:
http://stackoverflow.com/questions/18793605/boost-asio-netbeans-error
It is the minimum target system of the created application, 0x0501 means
windows XP, the lowest officially by wesnoth supported windows OS.

Modified my existing package using Pentarctagon's thread (and .bat file)
http://forums.wesnoth.org/viewtopic.php?f=5&t=40694&sid=84843537e1f713bf9805db75f0a4f94b
until I got 1.12 and master to build and execute with it.
CodeBlocks uses the recent boost filesystem fix now.
The package is available at
http://sourceforge.net/projects/wesnoth/files/unofficial/Windows%20Compile%20Stuff/
2014-11-29 00:49:17 +01:00
mattsc
721fda8fcf SotBE S6: reduce randomness of unit types unloading from galleons
This is done to keep the difficulty of the scenario more consistent. We
now always unload one level 2 unit and two level 1 units (assuming that
at least 3 landing hexes are available).
2014-11-28 12:27:13 -08:00
mattsc
6651371679 Update Xcode project file with config_assign.cpp removal 2014-11-28 09:19:25 -08:00
mattsc
77f88377e7 Lurkers MAI: bug fix for attack error when lurker runs into ambush
If the lurker move is interrupted by an ambush, the attack action
previously sometimes caused an error, because the lurker might not get
to its target.
2014-11-27 19:07:47 -08:00
mattsc
ad43d71278 Big Animals MAI: bug fix for units sometimes not attacking 2014-11-27 07:02:10 -08:00
anonymissimus
cdc246930c remove config_assign.cpp which causes a warning as it's empty 2014-11-26 23:11:26 +01:00
anonymissimus
b5c251447f vc project update
not using recent boost filesystem changes
2014-11-26 23:05:05 +01:00
anonymissimus
571b8ed1e4 cb project update
not using recent boost filesystem changes
2014-11-26 22:23:09 +01:00
gfgtdf
d7413d1915 fix windows document folder name with unicode usernames
backports b4d49a3675
2014-11-26 04:31:43 +01:00
Chris Beck
856f3acab7 check properly if a config attribute value is not a boolean
I don't know if this commit is related to or fixes any bugs, but
there are many bugs reported about fog / shroud / mp campaigns it
seems, and these lines always looked a bit squirrely to me. Since
boolean config values can be indicated by "yes", "no", "true" or
"false", testing for the presence of "yes" / "no" only seems like
it won't work in general, even if it works oftentimes. This commit
replaces it with a test for whether the to_bool function is
selecting the default boolean value.
2014-11-25 12:52:34 -05:00
Ignacio R. Morelle
aeafa091ca Changelog entry for previous commit 2014-11-25 03:47:20 -03:00