54166 Commits

Author SHA1 Message Date
Alarantalara
2f0ecea7c6 Remove remaining references to green trolls 2013-11-09 10:41:44 -05:00
Alarantalara
8323e6cd21 Trolls haven't been green since 1.0 2013-11-09 10:39:28 -05:00
Alarantalara
847ccce096 Simplify a filter in UtBS:6a 2013-11-09 10:24:52 -05:00
Alarantalara
8b1333aeac Remove unused ids. 2013-11-09 10:24:52 -05:00
Alarantalara
e2245b5e9a Clear saved_x variables once no longer needed. 2013-11-09 10:24:51 -05:00
Alarantalara
63ec880f08 Simplify filters with multiple ids is UtBS:3 2013-11-09 10:24:51 -05:00
David Mikos
32e3b82327 AnimationWML: fix MISSILE_FRAME_FIREBALL_XY macro position for certain directions. 2013-11-10 01:52:40 +10:30
David Mikos
bdbd9e577b AnimationWML: make use of new parallel 'if' support for chill wave macro. 2013-11-10 00:47:16 +10:30
David Mikos
9799bb044f AnimationWML: fix spearman standing direction. 2013-11-10 00:46:26 +10:30
David Mikos
c9230fb69b Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-11-10 00:44:39 +10:30
David Mikos
78abfbc3b4 implement parallel 'if' or 'else' statement support for animation WML. 2013-11-10 00:44:17 +10:30
Ignacio R. Morelle
d145186d7e Fix gcc warning regarding a malformed comment block
Fixes the following gcc warning:

> src/unit_animation.cpp:185:3: error: "/*" within comment [-Werror=comment]
2013-11-09 04:29:55 -03:00
David Mikos
8889225e22 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-11-08 20:17:46 +10:30
David Mikos
a487e247ce AnimationWML 'if' code changes to later implement multiple blocks 2013-11-08 20:17:15 +10:30
Ignacio R. Morelle
3d9487f334 gui2/tgame_paths: Remove empty anon namespace 2013-11-08 06:23:15 -03:00
Ignacio R. Morelle
005dfdd227 gui: Update/remove @todo comment 2013-11-08 06:08:09 -03:00
Ignacio R. Morelle
d28d629981 gui: Make screenshot notification dialog title use Title Case 2013-11-08 05:25:27 -03:00
Alarantalara
caa6d0f0d8 Restore a lost line of dialog with trolls
Ids assigned to units were bad. Using default ids where possible and
making a troll shaman have an id that matches the dialog's requested id
restores the missing lines.
2013-11-07 23:56:32 -05:00
Alarantalara
455792a5ac Remove some missed AI keys from earlier round
Apparently actually saving files is a good idea
2013-11-07 23:17:19 -05:00
gfgtdf
9e7ac8b50e fixing a bug that casued wesnoth to forget default wml hotkeys. 2013-11-08 04:00:59 +01:00
gfgtdf
2fc2f875e7 add me to about.cfg 2013-11-08 00:47:29 +01:00
Andrius Silinskas
51299adce0 Use "random_leader" only when resolving random.
Fixes bug #21218.
2013-11-07 20:34:10 +00:00
Alarantalara
d27769dcac Remove obsolete AI keys from UtBS:8
Missed file in previous commit
2013-11-06 23:16:30 -05:00
Alarantalara
3567d63852 UtBS: Remove obsolete ai keys 2013-11-06 23:10:38 -05:00
Alarantalara
27cd8e6cf8 Simplify filters excluding dust devils and flesh golems 2013-11-06 22:32:27 -05:00
Boldizsár Lipka
67aa875874 Era descriptions. 2013-11-06 22:37:32 +01:00
Boldizsár Lipka
614f088d8a Make a user-exposed string translatable. 2013-11-06 22:33:48 +01:00
Boldizsár Lipka
efda8c12c1 Merge two code blocks in process_event.
They're executed under the same conditions anyway.
2013-11-06 22:33:48 +01:00
Boldizsár Lipka
7944110e7b Remove the tooltip from the minimap. 2013-11-06 22:33:48 +01:00
Boldizsár Lipka
47c0673e95 "Select game type:" -> "Game type:" 2013-11-06 22:33:48 +01:00
Boldizsár Lipka
2ad8a866c4 "Load game" -> "Load Game" 2013-11-06 22:33:48 +01:00
Alexander van Gessel
5786753341 Fix faction->unit links for units with variations 2013-11-05 18:34:55 +01:00
Alexander van Gessel
8ec7ccadce Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-11-05 15:23:53 +01:00
Alexander van Gessel
7feeeb33c4 Fix advance references to units that have variations
Reported by bumbadadabum
2013-11-05 15:23:04 +01:00
Alexander van Gessel
2b61f2a897 Make all help links use make_link(), instead of rolling their own 2013-11-05 15:17:52 +01:00
Boldizsár Lipka
8bba663083 If there are no mods, indicate that in the appropriate label. 2013-11-05 09:54:59 +01:00
Boldizsár Lipka
bc385841a0 Don't display the "Activate" button if there are no mods. 2013-11-05 09:54:59 +01:00
Boldizsár Lipka
c87525b858 Don't assume that move_selection(0) is always successful.
It will fail if the list is empty. Fixes bug #21252
2013-11-05 09:54:59 +01:00
Alexander van Gessel
3fc5473b39 Drop mininum number of autosaves back down to 0 2013-11-04 05:09:53 +01:00
JaMiT
aeabe9b1db Code simplification made possible by previous commit. 2013-11-03 01:06:14 -05:00
JaMiT
3a78062d3e Event handler buffering is no longer needed.
Fixes bug #18713.
2013-11-03 01:06:14 -05:00
JaMiT
21ae9bb837 Move some initializations outside a loop.
The old way made sense with the old loop structure, but with the
new implementation, this way is just as easy and may be easier to
parse by people looking at this file for the first time.
2013-11-03 01:06:14 -05:00
JaMiT
bfe219f945 A new interface for iterating over events of a given name.
This is part of an attempt to black-box the storage of event handlers.
2013-11-03 01:06:14 -05:00
JaMiT
b6efc625e4 Disable event handlers by removing them.
One benefit is that fewer places in the code need to remember to
check for the handler being disabled. There should also be reduced
memory consumption after playing for a while.
2013-11-03 01:06:14 -05:00
JaMiT
9732a77cf4 Remove handlers by pointer resets instead of erasing vector elements.
This eliminates erasing from active_, which will be useful for the
next few commits.
2013-11-03 01:06:13 -05:00
JaMiT
a61be4389e Support null pointers in handler_vec.
I'll get to introducing those null pointers soon enough.
This is more prep work. The null_handler is a temporary measure
so the intermediary commits don't blow up.
2013-11-03 01:06:13 -05:00
JaMiT
cb7cedabf1 Ignore disabled handlers when checking for existing ids and logging.
Before this update, you could have a one-time-only event with an id
fire, then attempt to add another event with that same id. Whether
or not the second event would stick depended on whether or not the
game was saved and reloaded between the first event firing and the
second event being added.
2013-11-03 01:06:13 -05:00
JaMiT
9637affb00 Change the vector of event handlers to be of pointers.
This is the first of a set of changes intended to improve event
handling. (This change by itself is not beneficial.)
2013-11-03 01:06:13 -05:00
JaMiT
4c40d172d5 Convert game_events::manager from struct to class. 2013-11-03 01:06:13 -05:00
JaMiT
8394f3ae0f Restore support for negative healing.
The 1.10 implementation did not rule this out, so I've (finally)
tried to restore what 1.10 allowed, with slightly better accounting
of multiple sources of negative healing. I don't know if this is
the best thing to do, but some UMC authors wanted it back. (They
did not want it enough to answer my questions about it, though.)
2013-11-03 01:06:12 -05:00