upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-15 17:08:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,565 Commits 51 Branches 374 Tags
Commit Graph

52565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fendrin
d7f3b5426e Correct indentation. 2013-06-04 22:42:41 +02:00
fendrin
e8ad6b9748 Fix spelling in a comment. 2013-06-04 22:42:41 +02:00
fendrin
16dd13cab4 Put the new custom tod dialog into use. 2013-06-04 22:42:41 +02:00
fendrin
73d9465783 Extended the unit tool's tooltip. 2013-06-04 22:37:26 +02:00
Boldizsár Lipka
553ab064a8 Revert commit eb1f002e81723ea66c37f2e0e1438f91f1afa6cc. 
This re-introduces an older problem, but fixes bug #20861.
 2013-06-04 22:15:10 +02:00
Charles Dang
6daa64099b Updated menu button image paths 2013-06-04 23:17:32 +11:00
Charles Dang
44ec96ad88 Renamed images/buttons/menu_buttons to images/buttons/button_menu for consistency 2013-06-04 23:17:07 +11:00
Charles Dang
ca06fe62d5 Made dfool them use correct images (non menu image for End Turn button and H20 menu buttons for menu buttons) 2013-06-04 22:05:41 +11:00
Charles Dang
f8761a7064 Fixed path to low-res tools editor theme image 2013-06-04 21:23:24 +11:00
Charles Dang
fe5df57bb2 Made unit preview pane use non-copper regular image as opposed to menu-button image 2013-06-04 20:49:11 +11:00
Charles Dang
e551ca24af Made next/prev storyscreen buttons use non-copper images 2013-06-04 20:46:21 +11:00
Charles Dang
226578a31e Made default imagepath for GUI1 button non-copper 2013-06-04 20:45:56 +11:00
Charles Dang
ea56778b8f Use opacity IPF for transparent button images. Value set to 65% 2013-06-04 20:28:43 +11:00
Charles Dang
5211a99b1b Used regular as opposed to copper button variation images for default button 2013-06-04 20:18:04 +11:00
Charles Dang
28afae41ad Moved spare button images to attic 2013-06-04 20:14:06 +11:00
JaMiT
59c597ea04 Merge branch 'master' of github.com:wesnoth/wesnoth-old 2013-06-03 21:49:52 -05:00
JaMiT
bd6a859719 Make the x1,y1,x2,y2 variables within Lua match those in WML events. 
Reported in the forums:
http://forums.wesnoth.org/viewtopic.php?f=58&t=38930
 2013-06-03 21:44:24 -05:00
Mark de Wever
dfef23aebc Decreases the pango cairo dependency. 
The dependency's version is decreased to version 1.21.3. This is the
version currently used in XCode (on the Mac). Upgrading there is
troublesome.

This partly reverts 2b939cebc7a4eea6ec6adae40c8396f836122940.
 2013-06-03 21:32:07 +02:00
Mark de Wever
83293baa69 Move Miscellaneous to end of changelog. 2013-06-03 21:24:34 +02:00
JaMiT
b47d14258c Clean up a variable declaration. 
Making this a const variable gets rid of a compiler warning, and
making it a reference eliminates an unnecessary copy.
 2013-06-03 01:18:09 -05:00
Andrius Silinskas
d49b183fb1 Fix "Shuffle sides" incorrect behaviour. 2013-06-02 20:00:32 +01:00
Charles Dang
b32ca5c390 Updated path for transparent version of default buttons 2013-06-03 05:33:21 +11:00
ayne
fddc336495 Moved gold initialisation to earlier point, fixing bugs #20853 and #20734 2013-06-02 18:57:03 +02:00
Charles Dang
8e741368f6 Removed old/duplicate editor images 2013-06-03 03:36:16 +11:00
Charles Dang
f8b6725d67 Updated version string to 1.11.4 2013-06-02 16:52:03 +11:00
Charles Dang
35f39dc4ee Updated XCode proj file (added unit_advancements_aspect.*pp) 2013-06-02 14:30:57 +11:00
Charles Dang
55dd2330cc Prevented Editor Settings dialog from redrawing everything on exit 2013-06-02 13:04:38 +11:00
Charles Dang
ada39d23e8 Removed usused "editor_settings_dialog_redraw_callback" function 2013-06-02 13:02:22 +11:00
anonymissimus
62161aeedb cb project update 
(MSVC is okay)
 2013-06-01 22:59:50 +02:00
groggydice
c10959f8d5 remove files on Windows so --revert and second conversions can proceed 
Windows won't allow a rename to overwrite an existing file (Error 183, file already exists).
 2013-06-01 22:59:50 +02:00
flix
2965da1731 Add comments to data/ai/formula/new_recruitment.fai 2013-06-01 23:41:27 +03:00
Mark de Wever
03e9440fd3 Remove a variable which is only assigned. 
Issue found by cppcheck.
 2013-06-01 20:00:31 +02:00
Mark de Wever
b28003f673 Merge branch 'gui_polishing' 2013-06-01 18:13:10 +02:00
flix/Felix Bauer
29e8584738 Add new aspect 'advancements' 
As part of a GSoC proposal I added a new aspect so a scenario editor can control advancements in two ways:
1. Define a aspect with a string-value like "Swordsman, Knight", so the units of interesst will always advance to this
2. Use the LUA-Engine and return a function of the form advance(x, y) which will itself return a string-value
    like "Swordsman, Knight". Everytime a ai-unit advances advance(x, y) will be called.
The corresponding wikipage (http://wiki.wesnoth.org/AiWML) is going to be updated soon.
 2013-06-01 17:21:12 +03:00
Mark de Wever
a3b27a9893 Remove the default argument of set_is_dirty. 2013-06-01 15:53:04 +02:00
Mark de Wever
17fc64bc45 Rename gui2::tcanvas::dirty to is_dirty. 
Also updates the setter and getter members of gui2::canvas.
 2013-06-01 15:29:39 +02:00
Mark de Wever
060ff60c00 Rename gui2::twidget::dirty to is_dirty. 
Also updates the setter and getter members of gui2::twidget.
 2013-06-01 15:21:36 +02:00
Mark de Wever
89c2a251f1 Use a reference instead of a pointer. 
The argument is mandatory, so use a reference.

This updates get_parent.
 2013-06-01 15:03:54 +02:00
Mark de Wever
8e9d602e88 Use a reference instead of a pointer. 
The argument is mandatory, so use a reference.

This changes the callbacks of the GUI, thus causing several changes in
all users of the callbacks.
 2013-06-01 14:58:15 +02:00
flix/Felix Bauer
f9a231f09d AI/lua: Command 'lua wesnoth.debug_ai(2).ai' gives now access to ai-table 2013-06-01 15:35:15 +03:00
Mark de Wever
7ee96ebf7e Use a const reference instead of a const pointer. 
The argument is mandatory, so use a reference.
 2013-06-01 13:48:44 +02:00
Mark de Wever
5301eedbe6 Disable null conversion warning in CMake. 
It gives problems when using Clang and boost::shared_ptr when compiling
for C++11. The issue can't be fixed since Wesnoth uses C++98. (So we use
NULL instead of nullptr.)
 2013-06-01 11:22:10 +02:00
Mark de Wever
4b059500c9 Remove a useless cast. 2013-06-01 10:46:41 +02:00
Mark de Wever
9cfbc3e71d Remove a useless cast. 2013-06-01 10:43:44 +02:00
Mark de Wever
4f73ccc320 Remove a useless cast. 2013-06-01 10:42:03 +02:00
Mark de Wever
6100306f30 Remove unused private members. 
Also removes the now unused SPACE_CONSUMPTION enum.
 2013-06-01 10:38:11 +02:00
Mark de Wever
cfb50b2bc9 Remove unused private members. 2013-06-01 10:34:14 +02:00
Mark de Wever
d9c354a9d2 Remove unused private members. 2013-06-01 10:29:59 +02:00
Mark de Wever
6b4e82899b Fix usage of the explicit keyword. 2013-06-01 10:16:18 +02:00
Andrius Silinskas
f458b26a06 Fix "End Turn/Scenario" button's state at the end of scenario. 2013-05-31 19:59:11 +01:00