54571 Commits

Author SHA1 Message Date
Andrius Silinskas
2707e9ad9d Fixed MP Configure screen for low res.
Elements on the left side were put into an options pane as it was done with
elements on the right side.
2013-12-09 10:12:46 +00:00
Boldizsár Lipka
96b48b2360 Return the number of actual children instead of keys. 2013-12-08 23:21:18 +01:00
Boldizsár Lipka
f2cbf64a07 Make option_display::process_event non-pure virtual. 2013-12-08 22:20:29 +01:00
Boldizsár Lipka
5f21a5e06e Display custom options in sections; don't display inactive options. 2013-12-08 22:20:29 +01:00
Boldizsár Lipka
006c2f428d Add a function to config that tells the total number of children. 2013-12-08 22:20:29 +01:00
Boldizsár Lipka
d36e39b2a7 For custom sliders, show the current value in the label. 2013-12-08 22:20:28 +01:00
Boldizsár Lipka
ff7629865b A bit more sophisticated layout for custom options. 2013-12-08 22:20:28 +01:00
Boldizsár Lipka
1e982840ad Make custom sliders and textboxes wider. 2013-12-08 22:20:28 +01:00
Boldizsár Lipka
ea6317433f Set initial values for custom options. 2013-12-08 22:20:28 +01:00
Boldizsár Lipka
34f1c268b8 Display custom options directly on the configure screen. 2013-12-08 22:20:28 +01:00
Boldizsár Lipka
17cd340253 Ignore project files for all versions of QtCreator. 2013-12-08 22:20:28 +01:00
Nils Kneuper
8f23b615b0 fixed number of chars per line for changelogs 2013-12-08 11:08:26 +01:00
Nils Kneuper
45a01d6674 updated Japanese translation 2013-12-08 11:07:02 +01:00
Alexander van Gessel
9a0512772e Don't increment an iterator if it's past the end
Found by coverity
2013-12-08 03:58:05 +01:00
Alexander van Gessel
c217ce7a12 Don't increment an iterator if it's past the end
Found by coverity
2013-12-08 03:56:14 +01:00
Alexander van Gessel
095adba856 Add missing break
Found by coverity
2013-12-08 03:35:05 +01:00
Alexander van Gessel
04ad48f8fa Add missing break
Found by coverity
2013-12-08 03:34:08 +01:00
Alexander van Gessel
cb5cc6dee9 Add missing braces around a multiline block
Found by coverity
2013-12-08 03:23:47 +01:00
Alexander van Gessel
fe7729a07c Add a !null assert
Found by coverity
2013-12-08 03:08:03 +01:00
Alexander van Gessel
86d6111c3e Add a !null assert
Found by coverity
2013-12-08 03:06:12 +01:00
mattsc
e7f1741237 RCA AI: fix a bug that kept surrounded units from attacking
In the equation below the line changed, support is a measure of how
many AI units can come and aid the attacking unit.  For a surrounded
unit, support=0, and thus the attack rating (value) was previously
always zero, meaning that the unit never attacked.
This fixes bug #21334:
2013-12-07 16:43:21 -08:00
Alexander van Gessel
20b0f3ac94 Fix a nullref if an unknown unit type is present in the statistics
Found by coverity
2013-12-08 00:23:38 +01:00
Mark de Wever
923e85b773 Remove a duplicate declaration.
The issue was discovered by GCC-4.4.
2013-12-07 19:00:18 +01:00
Alexander van Gessel
316da34400 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-07 17:46:42 +01:00
Alexander van Gessel
2cd65c999c Assert that a pointer isn't null
Found by coverity
2013-12-07 17:46:21 +01:00
Alexander van Gessel
39f5f45f20 Make the initially selected modificiation determine the button text 2013-12-07 17:05:32 +01:00
Elias Pschernig
12700cd539 [units.wesnoth.org] fix typo 2013-12-07 16:55:01 +01:00
Alexander van Gessel
4ef3d2fe32 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-07 16:23:53 +01:00
Alexander van Gessel
af98164a73 Restore original precision after writing a double
Found by coverity
2013-12-07 16:23:14 +01:00
Mark de Wever
84d5572ee8 Fix an include guard.
Issue spotted by Clang.
2013-12-07 16:15:18 +01:00
David Mikos
34b865832a AnimationWML: fix issue with 'duration' and frame progressive images 2013-12-07 22:22:08 +10:30
fendrin
4194f414b4 Replaced outdated images for the orcish shaman units. 2013-12-06 18:50:58 +01:00
fendrin
8a84a16bb1 Fixed a character speaking after the unit died. 2013-12-06 18:50:58 +01:00
fendrin
65d302dcc4 Store some new and old unit images. 2013-12-06 18:50:58 +01:00
fendrin
1673058386 Changed the scope of some hotkey actions.
"Change Language" belongs into main_menu scope because it only works
there.
The Null hotkey has no scope instead of general.
2013-12-06 18:50:58 +01:00
fendrin
9b4029a5ca Update of the wose shaman unit image. 2013-12-06 18:50:58 +01:00
fendrin
b68ae75c4e Default bindings for the title screen hotkeys. 2013-12-06 18:50:57 +01:00
fendrin
7208deb61e Reenabled a check which prevented the null hotkey from being reassigned. 2013-12-06 18:50:57 +01:00
Elias Pschernig
adf7cdf0e9 [units.wesnoth.org] Adjust for new WML terrain_types 2013-12-06 17:58:48 +01:00
Alexander van Gessel
761d7d0c56 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-12-06 14:44:12 +01:00
Alexander van Gessel
e571ffe7c4 Merge pull request #89 from Gallaecio/gl
Updated the Galician (gl) translation
2013-12-06 05:38:01 -08:00
Alexander van Gessel
e01fa5e73c Don't skip tags because there's a comment containing an equals sign
There used to be an issue with this fix, but I can no longer reproduce it.
2013-12-06 14:29:41 +01:00
Adrián Chaves Fernández (Gallaecio)
4582da51dc Updated the Galician (gl) translation 2013-12-06 14:27:34 +01:00
Ignacio R. Morelle
cc7afb5d67 Fix a typo in a translatable string
("handle" -> "handled")
2013-12-06 06:03:11 -03:00
Emilien Rotival
d0af7d7bde Merge branch 'master' of https://github.com/wesnoth/wesnoth-old 2013-12-06 00:27:02 +01:00
Emilien Rotival
4fcf6d0d95 Updated and nudged the orb and crowns so that they fit within the hex
Elements overlapping the neighboring hex were causing refresh glitches.
2013-12-06 00:26:48 +01:00
gfgtdf
88d214a934 fix an oos error.
added new attibute "dependent" for none alonestanding commands in replay like user choices or checksum checks.
this should fix a oos bug that happend on undoing recruits in debug mode because in that case replay::undo only removes the checksum check after and not the recruit command.

unlike "async" command which are alonestanding commands that might depend on other commands, "dependent" commands have a 'parent' which is the first command before them, and shall always be deleted when the 'parent' is deleted.
2013-12-06 00:26:16 +01:00
fendrin
f6e19fa364 Changed a wrong keyword spotted by mattsc's brave compiler. 2013-12-05 22:46:46 +01:00
fendrin
bd2f9271e5 Put title screen hotkeys in there own scope. 2013-12-05 21:47:27 +01:00
fendrin
c31a065340 Lifted the reach map data structure from game_display to display.
The reach map is useful in the editor as well.
For now the map is used to show the highlighted reach in the minimap if
a unit is selected.
2013-12-05 21:47:27 +01:00