52706 Commits

Author SHA1 Message Date
mattsc
66913d3aa8 Return Guardian MAI: bug fix for situation when return hex is occupied 2013-06-10 19:50:13 -07:00
Alexander van Gessel
00165dd5c0 Merge branch 'hover-hex'. Part of feature #16350. 2013-06-11 04:09:20 +02:00
Alexander van Gessel
38403216c8 Add 'yours' hover-hex version 2013-06-11 04:08:48 +02:00
Alexander van Gessel
823abf8e14 Use split enemy hover-hex image 2013-06-11 03:47:31 +02:00
Alexander van Gessel
8d97a1b442 Cut enemy/yours hover hex images into top and bottom 2013-06-11 03:47:12 +02:00
Alexander van Gessel
6b02a922dc Merge pull request #20 from groggydice/lint-win
convert a couple of Windows-isms (backslashes, 'userdata/') to be more x-platform friendly
2013-06-10 14:09:53 -07:00
Alexander van Gessel
6675dee702 Merge pull request #24 from spixi/master
fixed bug #20870 Typo in NAMED_LOYAL_UNIT macro documentation
2013-06-10 14:03:33 -07:00
Alexander van Gessel
828fb35678 Allow [modification] to add [ai]s 2013-06-10 17:27:38 +02:00
Alexander van Gessel
997d7d5921 Disable broken test 2013-06-10 17:27:38 +02:00
Charles Dang
bbb51bc557 ToTB: updated campaign icon and difficulty images paths since jetrel moved them into specific folders 2013-06-10 23:38:00 +11:00
Charles Dang
06c757fc35 Corrected behavior of GUI1 button in regards to disabled states 2013-06-10 22:35:19 +11:00
Richard Kettering
e458f40658 New base frames for the elven cavalry units. 2013-06-10 01:03:34 -05:00
Richard Kettering
85b15a2c52 New base frames for the cavalryman line. 2013-06-10 00:22:59 -05:00
Richard Kettering
b11612cce9 Moved all the horseman images to their own folder. 2013-06-09 23:43:33 -05:00
Richard Kettering
444549dc34 New base frames for the knight, lancer, and grand-knight. 2013-06-09 22:08:22 -05:00
Charles Dang
a801915784 Corrected default path for TURBO GUI1 button (lite -> menu_button_copper_H20) 2013-06-10 13:54:31 +11:00
Richard Kettering
dbd2adf66a New base image for the paladin. 2013-06-09 21:34:35 -05:00
JaMiT
0952dfb180 Fix to unit abilities sometimes matching too often.
Abilities are sometimes checked at locations other than a unit's
current location. If the checked location is adjacent to the unit's
location, then (before this fix) the unit could affect itself as an
adjacent unit.
2013-06-09 17:28:57 -05:00
JaMiT
3cbdf64a27 Convert a static function to an anonymous namespace.
The namespace block was there anyway (containing only this
function), just with a name.
2013-06-09 17:28:57 -05:00
Richard Kettering
c1065bcbca New image for the skeletal dragon. 2013-06-09 17:10:01 -05:00
flix
9d1dfe0638 Add possibility to kill unit under cursor
...with context menu in debug mode.
Also assign the hotkey "shift+k" for this action.
Patch by pl_kolek. See https://gna.org/patch/?3905
2013-06-09 21:50:48 +03:00
Alexander van Gessel
02f73a62a0 Report to #wesnoth-dev 2013-06-09 20:43:22 +02:00
Alexander van Gessel
25907e0c01 Merge branch 'travis' 2013-06-09 20:39:05 +02:00
anonymissimus
e92e84f009 vc project update 2013-06-09 16:17:12 +02:00
anonymissimus
70e4b9afb4 cb project update 2013-06-09 16:12:23 +02:00
fendrin
de64afdc92 Removed now unsused orb images. 2013-06-09 12:55:37 +02:00
fendrin
1f94b40846 Wired in the item group icons. 2013-06-09 12:54:47 +02:00
fendrin
2dff1967bf New orb image wired in. 2013-06-09 08:47:10 +02:00
Charles Dang
7d67312f06 Fixed more paths to gold coins image 2013-06-09 17:14:17 +11:00
Charles Dang
a6699595f2 Fixed path to gold coins image for statistics dialog 2013-06-09 17:03:22 +11:00
Charles Dang
7ac8aec106 Updated XCode projfile (removed editor_settings.*pp) 2013-06-09 16:31:10 +11:00
Charles Dang
0faf4c003d Fixed typo 2013-06-09 16:19:41 +11:00
Charles Dang
e63d7a6e33 Release notes entry about ui overhaul 2013-06-09 16:19:28 +11:00
Ignacio R. Morelle
a9270b2cea UI changelog entries for vultraz 2013-06-09 01:15:30 -04:00
Charles Dang
f9e5a4ef95 Updated wiki comment about editor settings dialog and fixed a typo 2013-06-09 15:08:04 +11:00
Ignacio R. Morelle
613e6f1d32 Remove references to gui2::teditor_settings 2013-06-08 23:34:02 -04:00
flix
4f2984b5b1 Update CMakeLists.txt and SConscript.
Remove editor_settings.cpp. See http://git.io/smY_sg
2013-06-09 06:15:33 +03:00
Ignacio R. Morelle
7c8ee32a1b Prevent unchecked memory access in cut_surface()
The result of create_compatible_surface() may be encapsulating a null
pointer whenever the underlying call to SDL_CreateRGBSurface() fails --
in particular, if the width or height specified are negative and not
equal to -1, which is handled specially.

Without this check, using the ~CROP(x,y,w,h) image function with
negative width or height not equal to -1 resulted in a SIGSEGV as soon
as the create_compatible_surface() result was used.
2013-06-08 22:14:12 -04:00
Charles Dang
0ca3f3f268 Removed editor settings dialog. Custom TOD dialog has replaced it 2013-06-09 12:42:32 +11:00
Charles Dang
3d59e29be6 Removed old theme image previously used in now-removed expirimental theme 2013-06-09 12:41:37 +11:00
Alexander van Gessel
7e31d6b632 Use hover-hex-enemy.png over attack targets 2013-06-09 03:21:41 +02:00
Charles Dang
54cc119999 Moved a bunch of unused images to attic 2013-06-09 11:19:43 +11:00
Espreon
7bfe81e824 'End scenario' -> 'End Scenario'. 2013-06-08 20:11:26 -04:00
Espreon
612f71eac9 Updated the Old English translation. 2013-06-08 19:36:33 -04:00
Ignacio R. Morelle
0e92c59803 Fix incorrect image path function name in ~CROP() diagnostics
The error messages generated by using ~CROP() with negative coordinates
referred to the function's original name, ~SECTION().
2013-06-08 19:29:50 -04:00
Derek Hoagland
88e2040204 Move images/flags/ to data/core/images/flags where WML is 'allowed' to access it. 2013-06-08 17:10:17 -04:00
JaMiT
4da4104965 Use the correct index for filter_textbox::delete_item().
This fixes the issues when dismissing recallable units as reported:
http://forum.wesnoth.org/viewtopic.php?f=4&t=38479
2013-06-08 15:28:23 -05:00
JaMiT
86089f2ba4 Remove some do-nothing code. 2013-06-08 15:28:23 -05:00
Emilien Rotival
c3c2f5c3b7 Updated artwork for a team-colored status orb
The jewel file was created to account for possible TC glitches due to transparency. We'll find a use for it, eventually
2013-06-08 21:22:01 +02:00
Emilien Rotival
2d1e7940ac New artwork for a team-colored status orb 2013-06-08 20:32:25 +02:00