64885 Commits

Author SHA1 Message Date
Andreas Löf
90b6b58aa4 Fix crashes in the focus cycling code.
This ensures that the focus_handler is correctly initialised and
that cycle_focus() iterates over the current handlers correctly.
2016-07-14 23:19:49 +12:00
Andreas Löf
fb02c3442f Merge branch 'event_handling_fixes' of https://github.com/Vultraz/wesnoth into Vultraz-event_handling_fixes 2016-07-14 20:00:15 +12:00
Nobun
ffb1588b57 bugfix: wmlxgettext '--recursive' option now work correctly also on path containing symlinks 2016-07-14 06:59:01 +02:00
Charles Dang
61ccf2fc16 WIP: some refactoring of event handling w/ celticminstrel 2016-07-14 14:48:09 +11:00
Charles Dang
5649379426 Swapped order of two frames in the fireball animation
It makes more sense to go from largest to smallest, instead of large, small, medium.
2016-07-13 17:39:58 +11:00
Celtic Minstrel
7e04c7f8e9 Fix issues with constructing name generators from Lua 2016-07-12 11:08:34 -04:00
Celtic Minstrel
c39af95a44 Move name generator and formula API to base Lua kernel 2016-07-12 11:08:33 -04:00
Celtic Minstrel
3c96dbc145 Fix compile error 2016-07-12 11:08:31 -04:00
Celtic Minstrel
0ec01c595b Update XCode project 2016-07-12 11:08:30 -04:00
Charles Dang
49cf5cbbda Fixed assertion failure when selecting a randomly generated map (bug #24709) 2016-07-12 23:40:42 +11:00
Charles Dang
eebfc466b8 Merge pull request #666 from pubudug/registered_users_only_squashed
Added new checkbox to multiplayer game configure dialog to allow only registered users to join the game
2016-07-12 23:33:24 +11:00
Pubudu
129ce2982b Added new checkbox to multiplayer game configure dialog to allow only
registered users to join the game
2016-07-12 11:50:50 +05:30
Celtic Minstrel
d4b8fec953 New features in [role] WML tag
- search_recall_list=yes|no (default yes)
- [else] tag which is run if no unit matches
- auto_recall=yes|no (default no) which recalls the unit if it's on the recall list
2016-07-11 20:13:57 -04:00
ln-zookeeper
937df219c9 Don't issue a warning when no unit found for [role] 2016-07-11 23:41:33 +03:00
gfgtdf
dd82ed03dc fix comments 2016-07-11 22:33:55 +02:00
Charles Dang
24ca142d8d Merge pull request #686 from GregoryLundberg/vscode
Add .vscode to .gitignore
2016-07-12 05:11:28 +11:00
Gregory A Lundberg
5a27d9513f Add .vscode to .gitignore 2016-07-11 11:50:07 -05:00
gfgtdf
f9d8a9a0ab fix compiler warning 2016-07-11 17:50:16 +02:00
gfgtdf
d73d32e8e2 fixup on_event.lua 2016-07-11 15:12:12 +02:00
gfgtdf
9a5eabb207 fixup on_event.lua 2016-07-11 15:09:25 +02:00
gfgtdf
c8d098087c add support for lua_function= in location filters 2016-07-11 14:54:24 +02:00
gfgtdf
2ad3f2ca8e fix LoW death dialogue showing of for enemies 2016-07-11 14:54:20 +02:00
gfgtdf
ac717f70b8 improve on_event.lua
Added some features:
1) on_event now supports a comma separated list of event names in its first parameter

2) on_event now supports a number as second parameter that specifies in which order the event handlers are called.

3) on_event now passes wesnoth.current.event_context to the handler function, since the handler function will most likeley need it.
2016-07-11 14:01:04 +02:00
Andreas Löf
8c94170c46 Fix bug #24762: Avoid modifying the event handlers at the wrong time
This resurrects the old check that was used to determine when it was
safe to create the buttons. It avoids it happening as a result of an
actual draw-all event, instead only happening when the GUI is being
updated.
2016-07-11 21:36:34 +12:00
PoignardAzur
6347c646e2 LoW: Remove Elvish_Horse_Archer alt advancement 2016-07-10 18:01:23 -04:00
gfgtdf
3f97305ba1 Merge pull request #677 from jyrkive/md5-use-std-array
Modernize the MD5 hash calculation API
2016-07-10 13:17:56 +02:00
Jyrki Vesterinen
fa55702353 Modernize the MD5 hash calculation API
Return a std::array instead of a raw pointer, and take a const pointer as
an input parameter.
2016-07-10 08:28:49 +03:00
gfgtdf
c84db15ccf fix compiler warning 2016-07-10 01:00:14 +02:00
gfgtdf
aab0d16d01 fix assertion failure in mp. 2016-07-09 22:45:25 +02:00
gfgtdf
64b77a691d fix msvc warning
'found */ outside a comment'
2016-07-09 22:31:14 +02:00
gfgtdf
f4253c220a fix side specific variables
this fixes wesnoth.get_side_variable and wesnoth.set_side_variable
2016-07-09 21:42:10 +02:00
gfgtdf
685b69495a fix lua unit.upkeep getter 2016-07-09 21:42:10 +02:00
gfgtdf
16014a9795 fix [set_variable] rand= 2016-07-09 21:42:10 +02:00
gfgtdf
69fb6aa9e7 don't allow strange characters in unit type ids.
Using characters like " or ' in unit type ids has a high change of
breaking code, in particular the statistics code assumes that the
unit type ids can be used as wml varaible keys.
2016-07-09 21:42:10 +02:00
gfgtdf
bbc32856f1 handle [args] also in [lua] tags outside events. 2016-07-09 21:42:10 +02:00
gfgtdf
9ee327f417 fix [end_turn] not working is side turn events of ai sides
as reported in forums, the ai did still one move before ending its turn
if [end_turn] was used in a side event.
2016-07-09 21:42:10 +02:00
gfgtdf
40ff1ec986 make utils.split return empty set on nil values
previously it returned a "nil" string
2016-07-09 21:01:35 +02:00
Andreas Löf
64b90042c4 Fix bug #24762: Recreate buttons GUI buttons on a full redraw
This re-creates the main display-gui() buttons on a full redraw to take
into account that the theme expects them to be out of sync. As a
consequence I have also been forced to refactor how said buttons are
managed and introduced a new method to join the same event context
as another component.
2016-07-09 21:54:48 +12:00
gfgtdf
f5b6fbe942 Merge pull request #681 from GregoryLundberg/GL_Option_Message_deprecated
[option]message= deprecated, use label=
2016-07-05 20:14:55 +02:00
Gregory A Lundberg
010f943a40 [option]message= deprecated, use label=
According to the Wiki, since 1.13.2 message= is an alias for label=.

Using message= provokes a warning about it being deprecated.

This replaces message= with label= in the entire mainline (where it had not already been changed).
2016-07-03 13:41:44 -05:00
Charles Dang
240b940618 Fixed [teleport] not working 2016-07-03 04:34:54 +11:00
Charles Dang
41145a783c wmllint rules for 20b90a29fa38 2016-06-30 18:29:50 +11:00
Charles Dang
20b90a29fa Rename Heavy Infantrymane idle frames for consistency 2016-06-30 18:22:43 +11:00
Andreas
9c179bdc65 Merge pull request #673 from jyrkive/bug-23712
Fix bug #23712: Mage of Light halo not drawing correctly
2016-06-28 19:33:45 +12:00
Jyrki Vesterinen
0bc068113a Fix bug #23712: Mage of Light halo not drawing correctly
The halo is recreated when the mage starts to move, and it's initially
placed in the top-left corner of the screen. On the next frame the game
corrects its position. Correcting the position clears the list of hexes the
halo overlaps, which essentially means "the overlapped hexes aren't known,
update them when the halo is redrawn". However, the game also uses the list
of overlapped hexes to determine when the halo should be invalidated, and
thus redrawn: because the list was empty, the halo was never invalidated,
and it stayed at the top-left corner.

Fixed by placing the halo in the right position to begin with. This commit
includes my previous fixes as well, though, because the code was simply
incorrect before (even if it doesn't break anything any more).
2016-06-26 22:26:20 +03:00
Nils Kneuper
944a1d962a updated Polish translation 2016-06-26 12:31:57 +02:00
loonycyborg
dfe2f331a8 Fixed the direction of horizontal scrolling with mousewheel 2016-06-25 16:53:58 +03:00
gfgtdf
9db9a26143 Merge pull request #672 from jyrkive/fix-build
Fix build with Visual Studio 2013
2016-06-24 13:18:32 +02:00
Jyrki Vesterinen
b640c82f74 Fix build with Visual Studio 2013
Add #include <cstdint> to src/utils/context_free_grammar_generator.hpp. It
appears that without it, uint32_t ends up being different types in the
header and the implementation file (at least in Visual Studio 2013), which
makes the compiler complain that the print_nonterminal() function hasn't
been declared.
2016-06-24 11:56:18 +03:00
Charles Dang
febf4f3d3c Apple OS X -> macOS 2016-06-24 01:09:06 +11:00