54215 Commits

Author SHA1 Message Date
David Mikos
6409d08243 AnimationWML: simplify core DEFENSE macro WML 2013-11-10 15:47:11 +10:30
Ignacio R. Morelle
62d4e0e266 gui2/tgame_paths: Documentation 2013-11-10 02:03:41 -03:00
Ignacio R. Morelle
887f4d7385 preferences: Use radio buttons for mixer sample rate selection 2013-11-10 01:49:25 -03:00
Ignacio R. Morelle
523b9b0b94 preferences: Disable mixer sample rate input box when the option to use a custom rate isn't selected 2013-11-10 01:49:16 -03:00
Alarantalara
7945bed9d8 Remove checks for Garak being alive in possession event
If he were dead, the player would already be defeated
Also puts death of possessor before possessee as that makes more sense
in my mind
2013-11-09 22:47:39 -05:00
Alarantalara
6e64145779 Rename *_challenged to *_defeated
Value is set on defeat, not challenge - name should reflect that
2013-11-09 22:09:18 -05:00
Alarantalara
c4a532ea5f Merge victory events 2013-11-09 21:55:36 -05:00
Charles Dang
0316f68d7d Tweaked a line 2013-11-10 13:44:14 +11:00
David Mikos
5ba836e80b AnimationWML: add 'base_score' to filtered DEFENSE* macros. Fixes fencer 'hit' animation. 2013-11-10 13:10:46 +10:30
Charles Dang
60c6bc07ef "in the moment" -> "the moment" 2013-11-10 13:33:21 +11:00
Alarantalara
a4afb096d1 Name the elves' team in all scenarios 2013-11-09 21:19:11 -05:00
Alarantalara
4fd160c025 Clean up the side list
This mostly involves hiding all the sides without significant presence
from the list, leaving only the human sides and the cultists as named
opponents.
2013-11-09 21:10:19 -05:00
Alarantalara
06caec35cb Update Xcode project for new files
Files added in commit 6ebf28bd303a16b5c20a5bada14a1d108b54ada2
2013-11-09 20:57:59 -05:00
Alarantalara
1518816d15 Merge sides 3 and 9 in UtBS:8
Sides are allied with each other, have no leader, the same team name
and almost identical AI parameters. Having an entire side and AI just
to control 2 units is overkill.
2013-11-09 20:54:41 -05:00
Alarantalara
095dcb1328 Add alternate dialog if the dwarf/troll ally sees the ants 2013-11-09 20:39:47 -05:00
gfgtdf
6ebf28bd30 Merge pull request #82 from gfgtdf/split-lua
put functions declared in lua_api.hpp in a new file lua_api.cpp
2013-11-09 14:55:13 -08:00
JaMiT
2a2d17715b Alphabetizing sections. 2013-11-09 16:29:42 -06:00
JaMiT
345380730c Properly cast an initialization to unsigned.
I suppose SIZE_MAX would also work, but that looks like C++11.
2013-11-09 16:28:59 -06:00
JaMiT
cc235eeb9b Expand changelog entry for 3a78062d3e0cc8b48d4e5e5bc226fc3aac0a37d9. 2013-11-09 16:28:59 -06:00
JaMiT
cb4ede899e Shift some WML menu item management from handlers to wmi_container.
I think it will be easier to maintain this management if it is all
done in one file.
2013-11-09 16:27:04 -06:00
JaMiT
0412958bb1 Add a const qualifier. 2013-11-09 16:27:04 -06:00
JaMiT
222a2dbb97 Shift some WML menu item management from play_controller to wmi_container.
I think it will be easier to maintain this management if it is all
done in one file.
2013-11-09 16:27:03 -06:00
JaMiT
1232194d05 Shift some WML menu item management from action_wml to wmi_container.
I think it will be easier to maintain this management if it is all
done in one file.
2013-11-09 16:27:03 -06:00
JaMiT
baab9dfd7e Shift some WML menu item management from action_wml to wmi_container.
I think it will be easier to maintain this management if it is all
done in one file.
2013-11-09 16:27:03 -06:00
Alarantalara
b5bfcb78b7 Remove all test units from UtBS
The debug utilities within Wesnoth are more than sufficient and don't
clutter files
2013-11-09 15:47:04 -05:00
Bär Halberkamp
d6073e7bae More fixes to line length 2013-11-09 21:12:12 +01:00
Bär Halberkamp
a253a5c2e6 Fixed lines in the changelog being too long 2013-11-09 21:10:55 +01:00
Bär Halberkamp
172ad8c895 Improved my latest commits' changelog entries 2013-11-09 20:55:20 +01:00
Alarantalara
feb71ce769 Nym is always a female elf
No need to make the female part stated twice
2013-11-09 14:36:39 -05:00
Alarantalara
c3e9bd86a4 Group conditional messages in UtBS epilogue 2013-11-09 14:26:18 -05:00
Alarantalara
88ccc2ef0e Convert most of CHECK_IF_FREED_ALL_MERFOLK to an event 2013-11-09 13:49:06 -05:00
Alarantalara
a3f867897e Just recall Esanoo where he starts 2013-11-09 13:49:06 -05:00
Bär Halberkamp
a7bcae2b66 simplified the Dwarvish Thunderer line's AnimationWML 2013-11-09 18:05:22 +01:00
Bär Halberkamp
652023dbb0 More updates to undead movetypes 2013-11-09 17:55:22 +01:00
Bär Halberkamp
26e3d709bf Changes to the movetypes of some undead units 2013-11-09 17:55:21 +01:00
Alarantalara
15627a5a1d Clear more instances of upkeep (all campaigns)
Redundant full upkeep values
Loyal trait and upkeep set
Units with canrecruit=yes
2013-11-09 11:22:02 -05:00
Alarantalara
d224385d72 More elimination of obviously redundant keys
upkeep=full is default, free isn't needed to canrecruit=yes, ids never
referred to (and in one case is duplicated and so incorrect)
2013-11-09 10:56:16 -05:00
David Mikos
af324c3d39 AnimationWML: Prune 'if' terrain branches in parallel 'if' blocks like hits or direction. 2013-11-10 02:20:02 +10:30
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
gfgtdf
b5e3d189b4 renaming luatype to luatypekey 2013-11-09 15:16:08 +01:00
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