anonymissimus
d4401e5777
vc project update
2013-12-23 18:37:56 +01:00
anonymissimus
713a183805
avoid a compile error
...
(ambiguous call of overloaded function)
2013-12-23 18:37:56 +01:00
fendrin
13446f55c9
Fix the default theme for small resolutions to some degree.
2013-12-23 07:58:22 +01:00
David Mikos
21e6369670
if mp mods conflict and scenario type changes, update text accordingly
2013-12-23 16:19:54 +10:30
David Mikos
91f3c75eda
Merge branch 'master' of github.com:wesnoth/wesnoth-old
2013-12-23 16:11:43 +10:30
David Mikos
b3fe2faea4
if mp mods conflict on game creation screenfix jump to scenario type.
2013-12-23 14:17:46 +10:30
Ignacio R. Morelle
5e2845bfea
gui2: Do not optimize intermediate surfaces on tcanvas::blit()
...
This method only uses intermediate surfaces when blurring on a
non-neutral target, but it's still a waste of time for short-lived
surfaces.
2013-12-22 23:34:11 -03:00
David Mikos
e0ca387a55
Remove duplicate try_modifications MP mod code for when scenario doesn't match
2013-12-23 12:02:23 +10:30
David Mikos
9f9a7b9460
Fix bug #21365 - make MP modification dep checks revert properly if not compatible.
2013-12-23 10:14:10 +10:30
fendrin
c639195cd2
Fix path to the smaller minimap image and correct its position.
2013-12-22 23:25:08 +01:00
Ignacio R. Morelle
eef30804a4
Refactor code shared by both preferences::set_resolution() overloads
...
There was an existing declaration for a preferences::_set_resolution()
function, probably intended for this exact same purpose.
2013-12-22 18:04:12 -03:00
Ignacio R. Morelle
4d319839d4
Don't call _set_fullscreen() twice in a row when there's a display
...
Only relevant for the 1-argument version of
preferences::set_fullscreen().
2013-12-22 17:01:25 -03:00
Ignacio R. Morelle
d8993137d7
CodeBlocks project update
2013-12-22 14:33:35 -03:00
Andrius Silinskas
87ddb7eb67
Added missing check for negative number where size_t is expected.
...
Found by AI0867.
2013-12-22 16:39:13 +00:00
Alexander van Gessel
22ecfc29f7
Merge branch 'master' of github.com:wesnoth/wesnoth-old
2013-12-22 17:32:29 +01:00
Alexander van Gessel
43d77e68e8
Initialize a pointer
...
Found by coverity
2013-12-22 17:31:05 +01:00
Alexander van Gessel
6b0acc4c34
Initialize two variables
...
Found by coverity
2013-12-22 17:10:41 +01:00
Bär Halberkamp
1c23595094
updated changelog
2013-12-22 17:09:52 +01:00
Bär Halberkamp
affd1ca9b6
Updated maps for EI S4a and S5
2013-12-22 17:09:12 +01:00
mattsc
5a3ac4ccc3
Xcode project update
2013-12-22 07:12:42 -08:00
mattsc
69f3e645f4
Revert "SotBE S8: avoid duplicating a message"
...
This reverts commit 06c3fd90b585f9be09f43879e8ad9a9d45e1d943.
2013-12-22 06:54:28 -08:00
fendrin
b4ad6c2823
Fix the editor theme layout to match the new minimap frame image.
2013-12-22 11:33:09 +01:00
fendrin
3d6734bddc
Make the new minimap button actions work in the editor.
2013-12-22 11:33:09 +01:00
Emilien Rotival
5cf5f8d6e0
Icons for the new minimal display functions
2013-12-22 10:53:00 +01:00
fendrin
0621fde098
New and better color definitions for the semantic minimap display.
2013-12-22 09:18:33 +01:00
fendrin
4fd640479e
Update the theme config files to new image paths.
2013-12-22 08:43:21 +01:00
fendrin
6857b12767
Delete theme images, should have happened in the last commit...
2013-12-22 08:42:15 +01:00
fendrin
5ae5fb1f17
Moved images used by both, default and editor theme.
2013-12-22 08:40:07 +01:00
fendrin
99a7e282fa
The test scenario no longer depends on wesnoth-utbs package installed.
2013-12-22 08:03:19 +01:00
fendrin
25a225f363
Global .gitignore rule for "Thumbs.db".
2013-12-22 08:01:29 +01:00
fendrin
2709197594
Refactored the time of day schedule related images and macros.
...
This moves the after the fall schedule into core to grant that the
debian package wesnoth-editor does not depend on wesnoth-utbs.
Also, the images now life in their own subdirectories.
Wmllint has been updated to take care about the changed paths.
2013-12-22 07:32:12 +01:00
David Mikos
54e23514f1
Use trait ids for trait help link to avoid issue with ^female strings.
2013-12-22 16:59:29 +10:30
David Mikos
814486696a
Add help link to side panel traits label
2013-12-22 16:10:52 +10:30
David Mikos
818ffad098
allow advanced preference booleans and mp modifications double click toggle.
2013-12-22 14:58:07 +10:30
Alexander van Gessel
49c06cc943
Fix a unit image reference
...
Found by wmlscope
2013-12-22 04:46:40 +01:00
Alexander van Gessel
9571e899d4
Fix unit image reference
...
Found by wmlscope
2013-12-22 04:44:44 +01:00
Alexander van Gessel
c825dd0e72
Merge branch 'master' of github.com:wesnoth/wesnoth-old
2013-12-22 04:16:09 +01:00
Alexander van Gessel
47e311ab9b
Fix some image references in ANL
...
Found by wmlscope
2013-12-22 04:15:10 +01:00
Ignacio R. Morelle
b5a996f2eb
UtBS S13: add wmllint recognize directives for recall list units
...
These units are referenced to before they are ever recalled (well, in
Nym's case, Zhul doesn't ever get recalled) and wmllint doesn't like
that. It's the intended behavior, so tell wmllint to take them for
granted.
2013-12-21 23:13:27 -03:00
Ignacio R. Morelle
060c35d82c
wmlindent pass on mainline
2013-12-21 23:06:43 -03:00
Ignacio R. Morelle
81bb3f8b0f
Theme WML cleanup inspired by a wmlindent pass
...
Comment indentation only.
2013-12-21 23:05:30 -03:00
Ignacio R. Morelle
b8ce752221
Theme WML cleanup inspired by a wmlindent pass
...
Mostly comments and indentation only.
2013-12-21 23:05:29 -03:00
Ignacio R. Morelle
4c39592471
Theme WML cleanup inspired by a wmlindent pass
...
Mostly comments and indentation only. Also removed a big mid-line
whitespace chunk.
2013-12-21 23:05:29 -03:00
Boldizsár Lipka
88dda7bedd
Khalifate era description by happygrue.
2013-12-22 03:45:12 +01:00
Alexander van Gessel
d6cd5f2649
Update changelogs
2013-12-22 02:13:55 +01:00
Alexander van Gessel
0a4c353f5b
Merge branch 'master' of github.com:wesnoth/wesnoth-old
2013-12-22 02:05:05 +01:00
Alexander van Gessel
725f9e398e
wmlindent run
2013-12-22 02:04:58 +01:00
Alexander van Gessel
7f61f8b081
Remove unneeded ellipses
2013-12-22 02:03:25 +01:00
Alexander van Gessel
55bd5e1729
Remove explicit nozoc ellipse
2013-12-22 02:01:47 +01:00
Alexander van Gessel
32fabf5489
Refactor lightfly movetype a bit
2013-12-22 02:00:18 +01:00
