62423 Commits

Author SHA1 Message Date
Celtic Minstrel
2b5c887f6b Lua API: Let wesnoth.message accept translatable strings 2015-09-23 22:21:31 -04:00
Celtic Minstrel
a20c88c8a3 Simplify unit method names 2015-09-23 22:21:23 -04:00
Celtic Minstrel
0b42f43d2a Lua API: Add some existing wesnoth.* functions as proxy unit methods 2015-09-23 22:21:16 -04:00
CelticMinstrel
f07e463882 Merge pull request #493 from CelticMinstrel/foreach
Enhanced looping tags
2015-09-23 00:50:30 -04:00
Celtic Minstrel
7e26e09061 Fix erroneous handling of [break]/[continue] in [elseif] 2015-09-23 00:25:31 -04:00
Celtic Minstrel
0d49eeeb39 Add SUCCEED/FAIL macros for WML test cases 2015-09-22 23:13:38 -04:00
Celtic Minstrel
c3d51a3438 Update changelog 2015-09-22 22:13:38 -04:00
Celtic Minstrel
33a43990ad Add an explanatory comment to [foreach] 2015-09-22 22:13:36 -04:00
Celtic Minstrel
010d3ff35c attempt to fix travis build 2015-09-22 17:57:16 -04:00
Celtic Minstrel
56879d1f7d attempt to fix travis build 2015-09-22 17:25:15 -04:00
Elias Pschernig
900c84657b Upgraded wesnoth_addon_manager to Python 3
This includes campaignserver_client.py which is also used by wescamp.py
- however wescamp.py is still Python 2 at this point and will need to be
  upgraded at a later point in time.
2015-09-22 16:33:14 -04:00
Celtic Minstrel
d5eea2abbf Fix [show_if] in [message][option] 2015-09-22 16:16:08 -04:00
gfgtdf
52558d0d7c attempt to fix compilation on travis. 2015-09-21 17:18:40 +02:00
gfgtdf
4e775dd824 mark waiting message as translatable. 2015-09-21 16:39:09 +02:00
gfgtdf
58512935d4 add [message] wait_description=
the description provided in wait_description is used when other players
wait for this [message] input.
2015-09-21 15:50:14 +02:00
gfgtdf
4c3e00b3bb readd side_for parameter for [message] with input
this was lost when porting the code to lua.
2015-09-21 15:46:00 +02:00
gfgtdf
76b357dce0 attempt 3 to fix replays. 2015-09-21 14:42:52 +02:00
gfgtdf
fc89dfa6db attempt to fix replays
previously search_in_replay would search for choices in replays even if
it already found all choices. Resulting in error mesages becasue it
finds different unexpected things.
2015-09-21 13:02:44 +02:00
Elvish_Hunter
650f21e582 Fixed [role] not working if type= was not specified 2015-09-21 12:29:13 +02:00
Charles Dang
acdc67fe56 [object] don't show unit reach when highlighting unit 2015-09-21 10:47:21 +11:00
Celtic Minstrel
a3e3f5e719 Update XCode project file 2015-09-20 19:37:21 -04:00
Celtic Minstrel
7f7f0f48d5 Lua API: show_message_dialog now assumes options are translatable 2015-09-20 19:31:22 -04:00
Celtic Minstrel
6a09ef61e7 Update XCode project file 2015-09-20 19:30:54 -04:00
gfgtdf
167199bd16 attempt to fix replays
previously replays were broken becasue the game would ask the viewer for
user choices rather than searching for them in the replay.

We fix this by searching in the replay in user_choice_managers
constructor.
2015-09-21 01:06:43 +02:00
Randypk
504cdb69d1 Updated changelog for bug 23060. 2015-09-21 09:21:14 +11:00
Randypk
5a584381f3 Bug Fix#23060: unit status tooltips do not show.
The rectangle for the unit_stats was overlapping other rectangles, making
it not function properly.  Just resized it to fit. Tested with single
poison effect, both poison and slow, and no effects, all worked.
2015-09-21 09:20:08 +11:00
gfgtdf
2c245afdc2 add description parameter to wesnoth.synchronize_choice(s)
and removed the 'tagname' parmaeter which is now always "input"
2015-09-21 00:13:56 +02:00
gfgtdf
c20a807a87 fix assertion failure in wesnoth.synchronize_choice(s) 2015-09-21 00:13:54 +02:00
Charles Dang
a4fe9c0474 Updated codeblocks projectfile 2015-09-21 07:44:23 +11:00
Charles Dang
e3c47bf482 Merge pull request #495 from Wedge009/Spelling_Corrections
Reverting some spelling/grammar changes from #483
2015-09-21 07:37:12 +11:00
gfgtdf
fd2e513dc9 simplify user_choice_notifer_ingame 2015-09-20 22:32:28 +02:00
gfgtdf
c7c1b750fc fix compiler wanring. 2015-09-20 22:32:24 +02:00
gfgtdf
61fabacd36 fix compiler warnings. 2015-09-20 22:32:22 +02:00
gfgtdf
3ed4eed9fc wait dialog for user choices during prestart events
gna.org/bugs/?23297

If we are waiting for a synced user choice during a prestart events we
now show a gui2 dialog that informs the player about why the client is
waiting and also offers the player the option to quit the game.
2015-09-20 22:32:19 +02:00
gfgtdf
de3db53447 refactor get_user_choice
this prepares a patch to implement wait dialogs for user choices during
prestart events.
2015-09-20 21:52:48 +02:00
gfgtdf
3c11aa63f8 move get_user_choice function to a new file 2015-09-20 21:52:47 +02:00
gfgtdf
663db4f70f show notification when waiting for remote choices.
The game now shows a notification when waiting for a remove user choice
(like for example a unit advancement choice) for longer than 2 seconds.
This does not work during prestart events yet.
2015-09-20 21:47:37 +02:00
gfgtdf
cce53d5aa9 fix a compiler warning 2015-09-20 21:47:34 +02:00
gfgtdf
9c9f8f5a6e split wesnoth.synchronize_choice function
previously there was one function which sometimes returned a wml table
and sometimes a map integer to wml tables dependent on its parameters.

Now there are 2 different functions: wesnoth.synchronize_choice and
wesnoth.synchronize_choices. the first one handles the case where you just
want to get a choice from one side and thus it returns just one wml
table. The second function handles the case where you want to get
choices from multiple sides. that function retruns a table of wml
tables.

I also added an optional string parameter to that function specifying
the type of that choice (this is useful to make replays more robust and
readable)
2015-09-20 21:47:31 +02:00
Elias Pschernig
4c034d7705 Clean up wmlparser3.py a bit, fix json and xml output. 2015-09-20 14:53:49 -04:00
Wedge009
eb05d043e0 Reverting some hyphenation.
celticminstrel objects to some of the hyphenation. Geven the American English origin and nature of the majority of the English-speaking Internet, I suppose it's okay to allow American-style compound words where they've already proven dominant in computing/programming/Internet contexts.
One exception here is 'hot seat', where its use has not yet been established in mainstream lanugage.
Also, the made-up phrase 'goto-mode' has had spacing introduced.
2015-09-21 04:32:07 +10:00
Wedge009
0403519491 Reverting 'x and I' to 'me and x'
celticminstrel suggests the gramatically incorrect 'me and x' form works better in an informal, spoken context so, for the most part, reverting this change.
2015-09-21 04:30:49 +10:00
Charles Dang
00d96b3016 Fixed a variable typo pointed out by Elvish_Hunter 2015-09-20 23:49:06 +11:00
Ignacio R. Morelle
48def4ff0a Replace alphanumeric and operator spelling
Some (all?) versions of MSVC++ doesn't like it without including
<ciso646>, and we don't really want to use the alternate operator
spellings anyway.
2015-09-20 06:09:22 -03:00
Elvish_Hunter
e39f6376c8 wmllint-1.4: use string formatting or interpolation instead of concatenation 2015-09-20 10:27:37 +02:00
Celtic Minstrel
d527ea4740 Fix up loop implementations to reflect recent changes 2015-09-20 01:05:55 -04:00
Celtic Minstrel
2fec74a6ac Add default scope_type to handle_event_commands 2015-09-20 01:01:57 -04:00
Celtic Minstrel
0ffda44b27 Add break/continue support to the new loops 2015-09-20 01:01:52 -04:00
Celtic Minstrel
aec99429c4 Merge branch 'break-continue' into foreach 2015-09-20 00:48:39 -04:00
Celtic Minstrel
3c329408ce Implement [break], [continue], [return] tags (they take no arguments) 2015-09-20 00:47:23 -04:00