64403 Commits

Author SHA1 Message Date
Wedge009
73b92d8fa2 Minor grammar correction.
I may be a pedant, but it's not correct to use 'the most' when referring to the greater of only two things. Plus, I don't really think the bad grammar adds any 'character' here.
2016-05-02 19:09:06 +10:00
Wedge009
eda30529c2 Spelling correction: perentage -> percentage 2016-05-02 19:06:43 +10:00
loonycyborg
d86ce00d89 Update changelog and about.cfg 2016-05-01 22:00:09 +03:00
loonycyborg
a592ab3ad2 Pot-update using wmlxgettext2 2016-04-30 20:23:40 +03:00
loonycyborg
6e1cbe9234 Move #po comments to right before the message they apply to
to ensure that wmlxgettext2 finds them
2016-04-30 19:57:32 +03:00
loonycyborg
c66572ef62 Commit wmlxgettext2, Nobun's python3 reimplementation of wmlxgettext 2016-04-30 19:01:31 +03:00
loonycyborg
149977e9e4 Pot-update and regenerate doc files using scons 2016-04-30 18:36:43 +03:00
Wedge009
3c960aed06 Corrections to MSVC project files. 2016-04-30 23:12:09 +10:00
gfgtdf
0ee7451a00 ignore all other msvc projectfiles than for vc12 2016-04-30 14:42:21 +02:00
Nils Kneuper
222eec7520 updated Japanese translation 2016-04-30 09:09:21 +02:00
Celtic Minstrel
6c9cd2998e Update MSVC project files to VC12 (2013) 2016-04-30 02:31:34 -04:00
gfgtdf
f4d714d690 remove util::array
std::array or boost::array can be used instead.
2016-04-27 21:46:13 +02:00
ln-zookeeper
c876280a95 Special character fixes 2016-04-27 19:03:45 +03:00
gfgtdf
067b2a872f fix apply_to=variation/type
apply_to=variation/type should have no effect when object were reapplied for example at unit creation. This is also the 1.12 behaviour. This also prevents infinite recursion.
2016-04-25 22:55:39 +02:00
ln-zookeeper
694fb9d36e Fixed issues with Sea Serpent description pointed out by beetlenaut 2016-04-25 00:31:15 +03:00
ln-zookeeper
c4d2e72a12 Updates to monster unit descriptions
From https://forums.wesnoth.org/viewtopic.php?f=32&t=43721
2016-04-24 22:01:05 +03:00
ln-zookeeper
dba586ce53 Rewrote feeding's code to give units only one object, not one per kill 2016-04-23 21:44:30 +03:00
Celtic Minstrel
0a809fde2c Fix some Travis compile errors 2016-04-23 10:08:03 -04:00
gfgtdf
1cfa62ff56 Attempt to fix crashes realted to multithreading and std::string
Currently t_string isn't threadsafe, of one thread executes a 't_string
a("a")' and another threads does 't_string b("b")' the progamm might
crash even of those object are completeley unrelated at first glance.

This commit tried to fix this by wrapping the acces to the shared
hash_map object in mutex locks, another attempt to fix this problem
might be to remove the shared hash_map implementation of t_string
completeley.  Unfortunateley i don't know why it was implemented this
way in the first place so i don't know which disadvantages removing it
would have.
2016-04-23 15:43:14 +02:00
gfgtdf
b681fa576a fix in_chat=yes/no in [wml_message] 2016-04-23 15:43:14 +02:00
Charles Dang
0ffccf6f11 Updated CB projectfile 2016-04-23 19:26:36 +11:00
Charles Dang
a60d8d8daf taddon_list: updated GUI2 addons manager layout 2016-04-23 19:02:24 +11:00
Charles Dang
3359961b00 Various new icon graphics by LordBob and button definitions using them
The 'help_30' icon is a Ariel question mark generated with the text tool
in Gimp and not drawn by LB.
2016-04-23 19:01:45 +11:00
gfgtdf
46b4faa44b some code cleanups. 2016-04-21 19:27:20 +02:00
gfgtdf
1a542971e5 attempt to fix crashes during loadingscreen
currently it can happen that the game crashes during loadingscreen. The
reason is that loading scenn uses multiple threads, but t_string has a a
thread unsafe implementation that can cause crashes even when 2 threads
create 2 completeleey unrelated t_string objects.

This commit tries to fix this problem by removing all constructions of
t_string objects in the loadingscreen class to its constructor. Copy
constructors of t_string are still called, but afaik these doesn't cause
crashes liek this because they don't add new values in the t_string
hash_index registry,
2016-04-21 19:27:20 +02:00
ln-zookeeper
799695a04b Allow side 3 to release Jetto 2016-04-20 21:07:05 +03:00
ln-zookeeper
329fa031d9 Scroll to show the city in the intro 2016-04-20 21:06:04 +03:00
aquileia
23abf97f36 travis: Add C++14 build with g++-5
For now, C++14 builds are allowed to fail.
2016-04-20 03:57:53 +02:00
aquileia
a58dee4daf travis: Reorder before_install instructions 2016-04-20 03:57:53 +02:00
ln-zookeeper
9d95682b82 Made the scenario able to cope with lack of potential escapees 2016-04-20 02:01:41 +03:00
ln-zookeeper
9b931a574c Removed the red tents from top of drake villages 2016-04-20 01:47:47 +03:00
Ignacio R. Morelle
8d290fc5b7 cmake: Fix linking issues with wesnoth and test targets
The GUI2 combobox widget code is linked into a separate .a library that
does not include one of its dependencies, gui2::tdrop_down_list. This
causes link order issues and renders the wesnoth and test targets
unlinkable with GCC 5.3.1 and binutils 2.26 at least.
2016-04-18 21:57:46 -03:00
Ignacio R. Morelle
20f67bf4a0 cmake: Disable -Wno-old-style-cast on Lua unit tests
Otherwise strict compilation fails due to code using macros such as
lua_number2int() which contain C-style casts.
2016-04-18 21:56:55 -03:00
ln-zookeeper
6bc34aea7c Added melee and defend animations for Naga Hunter 2016-04-18 10:39:36 +03:00
mattsc
8e78bebb02 Fix the AI's move-to-targets CA ignoring tunnels 2016-04-17 19:43:56 -07:00
ln-zookeeper
7bcb4a5873 Updated generic portrait of Mermaid Initiate
By Tet and eyerouge, from https://forums.wesnoth.org/viewtopic.php?f=23&t=29715
2016-04-16 21:55:11 +03:00
Celtic Minstrel
69feb7f3f4 Merge pull request #649 from CelticMinstrel/master
Name generator tweaks + Lua API
2016-04-15 15:52:40 -04:00
Celtic Minstrel
6b8b83c90d Female names grammar for the Khalifate
(Loosely based on a list of female Arabic names from behindthename.com)
2016-04-15 15:51:25 -04:00
Celtic Minstrel
c50e941af7 Use a mutable field instead of const_cast 2016-04-15 15:51:24 -04:00
Celtic Minstrel
afb85a2000 Context-free generator: Strip whitespace in nonterminals
This means that whitespace in the following positions is now ignored:
- At the beginning of a line
- Preceding the = or } character
- Following the { character

All other whitespace is still significant.
2016-04-15 15:51:23 -04:00
Celtic Minstrel
1649930113 Lua API for the name generators 2016-04-15 15:51:23 -04:00
Charles Dang
cdd1370276 Updated CB projectfile 2016-04-15 08:50:13 +11:00
Charles Dang
3ad092aa2b Hi-res colored cursors by LordBob 2016-04-15 03:49:38 +11:00
Lari Nieminen
d33e1f339d Merge pull request #648 from sigurdfdragon/HttT_S10_Fixes
HttT s10 fixes
2016-04-14 11:43:06 +03:00
sigurdfdragon
0b316b39a9 HttT S10: Clean up side 3 status table entry. 2016-04-13 19:12:46 -04:00
sigurdfdragon
868084f6e7 HttT S10: Change image when eggs are captured. 2016-04-13 19:00:44 -04:00
sigurdfdragon
7e5e3acc57 HttT S10: Clarify objectives. 2016-04-13 18:28:37 -04:00
Celtic Minstrel
a9dbbe9c05 Merge pull request #644 from Dugy/master
Unit name generator using context-free grammar
2016-04-11 17:22:55 -04:00
Dugy
9e35e4d83e Added credit and described the change in changelog 2016-04-11 22:14:21 +02:00
Dugy
f84e8f4795 Added a new way to generate unit names, using rules of a context-free grammar. 2016-04-11 22:14:21 +02:00