Chris Beck
53b1309691
Merge branch 'lua'
2014-12-26 17:18:22 -05:00
Charles Dang
8a3572a62b
Added [remove_event] (equivalent to [event] id= remove=yes)
2014-12-26 22:33:09 +11:00
Chris Beck
2239ab3f65
add a unit test for lua get_sides return object
2014-12-26 01:07:57 -05:00
Chris Beck
017050df70
ilua: eliminate the "_" holds last executed command feature
...
the ilua `_pretty_print` feature has the property that it sets _
to be what was printed, as an interpreter feature so that _
represents the results of the previous expression. However it
appears that this may conflict with some parts of our api, for
instance the _ is used to hold the return value of
wesnoth.textdomain in the lua implementation of [harm_unit].
Note that there is no actual bug that I have observed, I merely
anticipate that this _ feature won't be compatible with our
established gettext conventions.
2014-12-26 00:06:05 -05:00
Chris Beck
e73c57ead7
move wml [endlevel] impl to lua, and split into many lua funcs
...
the [endlevel] tag does alot of things that could quite comfortably
be split into several parts, like setting the next scenario, the
end level text, message duration, credits. this commit adds
separate lua api for each of these, leaving the rest in end_level,
and the lua tag implementation calls these variously.
2014-12-24 16:17:24 -05:00
Chris Beck
36f57ff03a
Merge branch 'to_lua'
2014-12-24 16:12:52 -05:00
Chris Beck
d7bf5be356
move wml [animate_unit] to lua
2014-12-24 15:15:25 -05:00
Chris Beck
171f92a6a5
move wml [open_help] impl to lua
...
also fixes an issue where the help topic was being cast
unnecessarily to a tstring
2014-12-24 14:42:58 -05:00
Charles Dang
2398906fd8
Merge branch 'master' of github.com:wesnoth/wesnoth
2014-12-24 21:45:38 +11:00
Charles Dang
004af104d9
DiD S10: make Volk hang out around his castle and adjacent villages, not just his keep
2014-12-24 21:44:42 +11:00
Chris Beck
75767d3a77
move WML [kill] impl to lua
2014-12-24 05:43:37 -05:00
Chris Beck
9922b98fa3
move wml [inspect] impl to lua (and lua_gui2 namespace)
2014-12-24 05:00:44 -05:00
Chris Beck
ca58a71793
move WML [modify_side] implementation to lua
2014-12-24 04:44:25 -05:00
Chris Beck
0246026940
move WML [event] impl to lua, fixup core wml vs lua loading order
...
This commit moves [event] to be implemented in lua/wml-tags.lua.
It turns out that because of some questionable ordering in
data/core/_main.cfg, none of the tags defined in
data/lua/wml-tags.lua are actually defined at the time that core
is read, instead they are defined right after this. This is broken,
the entire wml library should be defined before core is read. Thus
we reorder some directives in data/core/_main.cfg to ensure this.
This commit adds lua callbacks `wesnoth.add_event_handler`,
`wesnoth.remove_event_handler` as well.
2014-12-24 04:21:58 -05:00
Chris Beck
0e365efc1a
move WML [label] impl to lua
2014-12-24 03:16:49 -05:00
Chris Beck
29da15e1c0
move wml [end_turn] impl to lua
2014-12-24 03:07:49 -05:00
Chris Beck
177b4d5da1
move WML [color_adjust] impl to lua
2014-12-24 02:57:42 -05:00
Chris Beck
96c35f6560
move WML [redraw] impl to lua
2014-12-24 02:44:31 -05:00
Chris Beck
2cc38505dc
move WML [scroll] implementation to lua
2014-12-24 01:06:44 -05:00
Chris Beck
defb9e5051
move replace_schedule impl to lua
2014-12-23 23:35:10 -05:00
Chris Beck
fa32be5602
add time_area registration impl to lua
2014-12-23 23:05:02 -05:00
Chris Beck
09ce8b5774
move clear_menu_item to lua implementation
2014-12-23 22:23:22 -05:00
Chris Beck
41e54fd009
move allow_undo, allow_end_turn impl's to lua
2014-12-23 22:08:45 -05:00
Chris Beck
0d76ac3be7
move the place, remove shroud WML tags to lua implementation
2014-12-23 21:04:45 -05:00
Chris Beck
eb71fc4d3b
move "set_menu_item" to be implemented via lua rather than C++
2014-12-23 19:34:17 -05:00
Charles Dang
f33ca48bbf
DiD S6: I'm an idiot
2014-12-23 17:27:47 +11:00
Charles Dang
df98508c62
DiD S6: forgot to add orc objectives post-Drgoan's death
2014-12-23 17:25:46 +11:00
Charles Dang
bee33dfc10
DiD S6: end level if you kill orcs after Drogan is dead
2014-12-23 17:22:56 +11:00
Charles Dang
93de42fd29
DiD S6: listed killing the orcs as a bonus objective, though it gives no reward
2014-12-23 16:57:22 +11:00
Charles Dang
3921a87f70
DiD S6: don't mention orcs on Drogan's death or endlevel if they're dead
2014-12-23 16:40:05 +11:00
Charles Dang
36833bcfe5
DiD S6: dialog for the rare event you kill the orc leader before Drogan or any town guard
2014-12-23 12:34:04 +11:00
Ignacio R. Morelle
67bb16e408
UtBS: Hide a stray Kaleh variation in help
...
AMLAs render variation pages nigh-completely useless for Kaleh anyway.
2014-12-22 22:20:39 -03:00
Ignacio R. Morelle
ed70afca53
TRoW: Hide Jessene's unmasked variations in help
...
Not spoilery, but annoying since it's just a visual change.
2014-12-22 22:14:42 -03:00
Charles Dang
42eac522ba
DiD: moved the campfires off the road
2014-12-23 12:14:20 +11:00
Ignacio R. Morelle
5a8dddd5dd
Hide alternate Great Wolf variation from help as it's only a visual variation
2014-12-22 22:08:12 -03:00
Ignacio R. Morelle
bf75c9d062
Assign translatable names to WC/Soulless variations (bug #22902 )
2014-12-22 21:40:54 -03:00
Ignacio R. Morelle
ad2fb4bfeb
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:33 -03:00
Charles Dang
f5cb10f276
Removed self-leading help topic link in Cave
2014-12-23 06:07:12 +11:00
Charles Dang
e077850ad2
Fixed some typos found by spellcheck
2014-12-23 05:28:45 +11:00
Charles Dang
cd1bf2ad28
Fixed broken help link to Cavalryman
2014-12-23 05:19:01 +11:00
Charles Dang
57994313c5
DiD: moved some relevant bits into victory events
2014-12-22 19:02:30 +11:00
Charles Dang
dd09239bbb
DiD S6: cleared malin_used_necromancy on victory
2014-12-22 18:51:51 +11:00
Charles Dang
0c05062bfd
DiD S6: removed an unnecessary filter
2014-12-22 18:50:35 +11:00
Charles Dang
3e1b015669
DiD S6: fixed a can-can
2014-12-22 18:34:46 +11:00
Charles Dang
a095ea2a48
DiD S6: fixed two typos of mine
2014-12-22 18:07:51 +11:00
Charles Dang
185535b130
DiD S6: some alternate starting dialog depending on if Malin used necromancy in S1 or not
2014-12-22 18:03:46 +11:00
Charles Dang
7176ae0376
DiD S6: reworded a sentence to alleviate an double 'return'
2014-12-22 17:43:36 +11:00
Charles Dang
64eae325d2
DiD S6: dropped the force CTH on Dela, since a mechanism for her fleeing already exists
...
Expanded said mechanism as well
2014-12-22 14:15:33 +11:00
Ignacio R. Morelle
d5fa4bc7b2
Revert "Compress images with zopflipng."
...
This reverts commit 5d36e382c7919d25e987abf07c40e42e9b2e909e.
It's been found to cause all kinds of terrain glitches on Windows and
Linux. Please do not try experimental image compression alternatives
without discussing and reviewing first.
2014-12-21 19:03:08 -03:00
Chris Beck
95e88fa294
Merge pull request #345 from awleffew/compile_error
...
Fix incorrect stringstream syntax.
2014-12-21 13:24:12 -05:00
