upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-07 06:08:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
64,982 Commits 60 Branches 374 Tags
Commit Graph

64982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Celtic Minstrel
cd858295fe Merge pull request #718 from GregoryLundberg/lost-ellipse 
unit.cpp Fix bug: Ellipse is lost
 2016-07-31 12:19:01 -04:00
Charles Dang
b04083ab90 Removed some old GUI1 Recruit dialog code 2016-08-01 02:47:38 +11:00
Charles Dang
639548a108 Made Attack dialog use a unit_preview_pane widget 
This also adds the necessary changes to said widget to allow single-unit stats display.
It still needs to be expanded somewhat. Right now it contains the minimum required for
the attack dialog.
 2016-08-01 02:17:03 +11:00
Gregory A Lundberg
a75812d4aa unit.cpp Fix bug: Ellipse is lost 
When advancing or an object (say, the Scepter of Fire) selects a unit variation, the ellipse is lost. This causes a unit with {IS_HERO} to convert to {IS_LOYAL}, changing the hero ellipse to the default.
 2016-07-31 01:49:14 -05:00
Celtic Minstrel
4889fd7534 Execute all ConditionalWML tags in order of apperance 
This is instead of executing all [have_unit], followed by
all [have_location], followed by all [variable], follwed by
all others.

The presence of [true] or [false] tags still overrides anything else.
 2016-07-30 16:49:36 -04:00
Celtic Minstrel
4a668e0ec4 Fix crash on invalid ConditionalWML tag in some contexts 2016-07-30 16:44:17 -04:00
Celtic Minstrel
1e93e7309e Fix compiler warning and restore debug message 2016-07-30 13:51:39 -04:00
Jyrki Vesterinen
c44419d460 Restore one MSVC2008 workaround removed in commit 8fa73053 
It turned out to be still necessary even with MSVC2015.
 2016-07-30 18:53:01 +03:00
Charles Dang
2c09e6a7c0 Fixup 4f7ae24d1b6e 2016-07-31 01:18:14 +11:00
Wedge009
db248e1774 MSVC whinges about named operators and I believe it's convention to use && operator instead. 2016-07-30 23:38:13 +10:00
Charles Dang
4f7ae24d1b Cleaned up a few useless typedefs I noticed 2016-07-30 23:32:35 +11:00
Jyrki Vesterinen
ed8a9c223b Mention the 'mute music in background' preference in changelog 2016-07-30 09:19:58 +03:00
Celtic Minstrel
0b313e8dda Fix changelog for #710 2016-07-30 02:16:40 -04:00
Charles Dang
db5f497fd7 Logging: fixed placement of title 2016-07-30 17:05:54 +11:00
Celtic Minstrel
7caad3d107 XCode: Add missing header 
This also includes rearrangement changes that XCode seems to insist on applying.
These changes have no effect on anything whatsoever.
 2016-07-30 01:55:57 -04:00
Charles Dang
56e2a733e5 Merge pull request #674 from jyrkive/mute-in-background 
Mute the music when the game loses focus
 2016-07-30 16:49:21 +11:00
Charles Dang
fbef58a29a Lua console: made window fullscreen and cleaned up layout code 2016-07-30 16:46:55 +11:00
Celtic Minstrel
dc3d22a5e4 Merge pull request #710 from spixi/call_events_by_id 
Allow firing an event by id instead of name.
 2016-07-30 01:21:12 -04:00
Charles Dang
13da8dac07 Slight refactoring of default prefs value storage, and clamp font scaling 2016-07-30 16:14:40 +11:00
ancestral
17edeed029 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2016-07-29 23:58:40 -05:00
Charles Dang
24577e117d Merge pull request #716 from wesnoth/boost_trimming 
Boost-related cleanups
 2016-07-30 15:51:30 +11:00
Charles Dang
82973000a0 Convert gui2::tvisible and gui2::tredraw_action to scoped enums 2016-07-29 23:22:54 -04:00
Charles Dang
8a8316a9b8 Convert uses of boost::flat_set to std::set 
The performance difference is irrelevant with the small number of elements.
 2016-07-29 23:22:53 -04:00
Celtic Minstrel
38d7f7169f Remove a few other miscellanous Boost uses 2016-07-29 23:22:53 -04:00
Celtic Minstrel
b54ea23774 Remove uses of boost::array 2016-07-29 23:22:52 -04:00
Celtic Minstrel
ad4fe895e9 Remove use of boost::unordered_map 
This also moves the LuaAI's push_location_key into public
view as the map_location hash function.
 2016-07-29 23:22:51 -04:00
Celtic Minstrel
7212e5963d Replace boost map_list_of with C++11 initializers 2016-07-29 23:22:50 -04:00
Charles Dang
7ccbd53a7a Convert cases of boost::next to std::next 2016-07-29 23:22:49 -04:00
Charles Dang
649b65d2ae Convert remaining boost::lexical_cast cases to our own implementation (extension of 211ba2e770) 2016-07-29 23:22:48 -04:00
Charles Dang
0ecaa78513 Use initializer lists in place of remaining boost::asign::list_of cases 2016-07-29 23:22:47 -04:00
Charles Dang
d778db8af6 Convert uses of boost integer types to their stdlib equivalents 2016-07-29 23:18:10 -04:00
Celtic Minstrel
8fa73053b8 Remove a couple more MSVC 2008 workarounds 2016-07-29 23:18:10 -04:00
Celtic Minstrel
d1728ea0c5 Remove some instances of boost::ref 2016-07-29 23:18:10 -04:00
Celtic Minstrel
ad7daee4a8 Remove a few more uses of Boost type traits and enable_if 2016-07-29 23:18:10 -04:00
Celtic Minstrel
fc97838626 Use raw string literals for regex 
Also ensure some regexes cannot match null characters.
 2016-07-29 23:18:10 -04:00
Celtic Minstrel
e8d148bec4 Merge pull request #698 from GregoryLundberg/GL_role 
New features for [role]
 2016-07-29 22:53:58 -04:00
Bär Halberkamp
07d365b9b5 Separate the description and generated description with a newline 2016-07-29 20:30:17 -04:00
Gregory A Lundberg
2a3a3fdd7b Update changelog 2016-07-29 18:28:03 -05:00
Gregory A Lundberg
346d8ceac5 L S04 Update for new auto_recall sub-tag 2016-07-29 18:18:53 -05:00
Gregory A Lundberg
585412a222 AOI Update macros for new auto_recall sub-tag 2016-07-29 18:18:53 -05:00
Gregory A Lundberg
a72c68547f Add a comment to the C++ 
Might as well warn the programmer about this just in case someone adds or removes a recall-specific attribute.
 2016-07-29 18:18:53 -05:00
Gregory A Lundberg
b064328102 New features for [role] 
Add search_recall_list=only to search the recall list, but not the map
This is intended as a more clear way of doing 'x,y=recall,recall' and omitting search_recall_list. Note that search_recall_list=no with x,y=recall,recall produces a useless [role] which only runs the [else] block(s).

Add reassign attribute
Optional attribute, default 'yes'. If 'no' then do not re-assign the role if a unit already has the role. If 'no' and no unit has the role, the role is still assigned.

Refactor auto_recall as a sub-tag
Instead of a yes|no attribute, if there is an [auto_recall] sub-tag then recall the unit from the recall list. This acts as a [recall] tag without any StandardUnitFilterto which we add id=$unit.id and issue the recall.
 2016-07-29 18:18:53 -05:00
Celtic Minstrel
7ca8897ff5 Merge pull request #707 from CelticMinstrel/uanim_output_cleanup 
Clean up the debug output for unit animations
 2016-07-29 18:54:42 -04:00
Bär Halberkamp
7b61ce2400 Merge pull request #715 from bumbadadabum/master 
Generate trait help instead of hardcoding
 2016-07-29 18:45:57 -04:00
Bär Halberkamp
4e71bbe448 Generate trait help instead of hardcoding 
Introduces a new key "help_text=" in [trait]
 2016-07-29 18:44:10 -04:00
ancestral
3a428e8adf Removed bug for monospace font as this is resolved 2016-07-29 16:50:58 -05:00
Celtic Minstrel
95c4556a59 fai -> wfl in FormulaAI files 2016-07-29 12:52:10 -04:00
Celtic Minstrel
53fd31554a Update RELEASE_NOTES 
(Mainly spelling and grammar fixes, a few clarifications)
 2016-07-29 12:52:10 -04:00
loonycyborg
b55fc012df Post-release version bump 2016-07-29 19:44:22 +03:00
loonycyborg
38306057f9 Pre-release version bump 1.13.5 2016-07-29 17:38:53 +03:00