upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,018 Commits 60 Branches 374 Tags
Commit Graph

65018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jyrki Vesterinen
c4d51b1bbb Add @PoignardAzur to credits 2016-08-02 15:43:09 +03:00
Jyrki Vesterinen
3a77d8db53 Merge pull request #723 from PoignardAzur/add_override 
Add override specifier to derived virtual methods
 2016-08-02 15:18:09 +03:00
Olivier FAURE
374a315f94 Add override specifier to derived virtual methods 2016-08-02 15:26:09 +02:00
Jyrki Vesterinen
3355e5bd7a Fixes in players_changelog 2016-08-02 10:05:25 +03:00
Jyrki Vesterinen
d76a799523 Update Visual Studio project 2016-08-02 10:02:27 +03:00
Celtic Minstrel
53828a01b9 New [remove_object] WML tag 2016-08-02 00:52:52 -04:00
Celtic Minstrel
6dab777f66 Accept [effect] in [modify_unit] 2016-08-02 00:01:48 -04:00
Celtic Minstrel
7e6a1892bb Fix OSX compile errors 2016-08-01 23:41:54 -04:00
Celtic Minstrel
6c01f69914 Update XCode project 2016-08-01 22:35:23 -04:00
Charles Dang
853cbb7347 Forgot to add Recall dialog WML... 2016-08-02 12:23:54 +11:00
Charles Dang
7332dafd75 Add visibility checks to up/left arrow handling 
For some reason, these checks were only present in down/right handling, meaning the up
arrow (confirm) and left arrow (presumed) would allow selecting of non-visible items.
 2016-08-02 12:06:38 +11:00
Charles Dang
69bb5a155b Attempt to appease travis 2016-08-02 11:50:23 +11:00
Charles Dang
7c45df4b6d tunit_create, tunit_recall: give simultaneous keyboard focus to filter textbox and list 2016-08-02 11:09:24 +11:00
Charles Dang
7cdffec999 Exclude recall dialog from tests 2016-08-02 10:36:40 +11:00
Charles Dang
fe1f17a55f Use an array for sort function storage, since it's always fixed-size 2016-08-02 09:32:49 +11:00
Charles Dang
105fbe6bc6 Converted Recall dialog to GUI2 
This also includes  the appropriate expansions and design updates to the unit_preview_pane widget.
 2016-08-02 09:13:07 +11:00
Celtic Minstrel
a515dd403a XCode: Rearrange build sequence 
This makes the most important steps (compiling and linking) run first,
before all the copy file steps.

Also, all copy file stages now have descriptive names.
 2016-08-01 14:24:08 -04:00
Bär Halberkamp
a2639431bf fix unit builds 2016-08-01 12:19:14 -04:00
gfgtdf
864d84c2b5 fix recall list lost in LoW scenario13 
fixes http://gna.org/bugs/?24896
 2016-08-01 14:46:03 +02:00
Andreas Löf
094250c27c Merge branch 'jyrkive-monte-carlo-damage-calculation' 2016-08-01 22:06:00 +12:00
Andreas Löf
2360fb6260 Merge branch 'monte-carlo-damage-calculation' of https://github.com/jyrkive/wesnoth into jyrkive-monte-carlo-damage-calculation 2016-08-01 22:04:06 +12:00
Charles Dang
6080cfb969 Switch unit_preview_pane image_facing key to image_mods 2016-08-01 08:14:19 +11:00
Bär Halberkamp
7dbf17f3fe Fix traits in help 2016-07-31 15:46:55 -04:00
Bär Halberkamp
51ebabae4d fix last commit 2016-07-31 13:23:04 -04:00
Bär Halberkamp
fd1a776997 Change attack sounds for short swords 2016-07-31 13:10:00 -04:00
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