63471 Commits

Author SHA1 Message Date
Charles Dang
f84fc5cb0b Fixup a0909a9d4749 (unused parameter) 2016-02-26 10:33:19 +11:00
Charles Dang
e23a476497 teditor_generate_map: refactored out reliance on display 2016-02-26 07:17:46 +11:00
Charles Dang
02995731ce taddon_connect: removed unused display argument 2016-02-26 07:11:56 +11:00
Charles Dang
6612b71b8d tunit_attack: refactored out display argument 2016-02-26 07:09:00 +11:00
Charles Dang
ec88475d23 tunit_create: refactored out display argument 2016-02-26 07:03:52 +11:00
Charles Dang
a0909a9d47 tunit_create: simplified gender toggle using a group 2016-02-26 06:56:27 +11:00
Charles Dang
8691ae247d tgroup: implement remove_member (C++11 only) 2016-02-26 04:59:32 +11:00
Charles Dang
1fd5eb63e1 Updated changelog 2016-02-25 22:24:45 +11:00
Charles Dang
2185faa403 Merge pull request #588 from Vultraz/gui2_widget_groups
gui2: implement widget groups
2016-02-25 22:20:22 +11:00
Charles Dang
6d883e10f4 tpreferences: reimplement radio toggle setup to use groups 2016-02-25 20:28:24 +11:00
Charles Dang
dfe7fcca88 gui2: implement widget groups
Groups are handled on a per-dialog basis, and are currently specialized for tselectable_
inheritors. They provide a convenient vector-of-pairs interface that ensure only one
widget is selected at one time and allows binding of values to widgets which can be
fetched at a later point.
2016-02-25 20:28:18 +11:00
Andreas
dd70544139 Merge pull request #610 from Wedge009/Fix_VC_build
Fix broken build in VC
2016-02-25 21:54:13 +13:00
Wedge009
d2be47f5dd Fix broken build in VC
#include <iterator> is needed for back_insert_iterator. This was included in config.hpp, but inclusion of that header here was removed in the previous commit.
2016-02-25 18:54:51 +11:00
Charles Dang
9358af7ad1 Merge pull request #609 from sigurdfdragon/Tutorial_Fixes_2016_02_24
Tutorial fixes 2016 02 24
2016-02-25 08:01:36 +11:00
sigurdfdragon
d99806cbbf T: Make Delfador have same traits as HttT.
Except loyal, because he's not on your side here.
2016-02-24 15:42:12 -05:00
sigurdfdragon
c970efa6bf T: Make Konrad & Li'sar unnameable. 2016-02-24 15:34:41 -05:00
gfgtdf
ac6439efdc fix lua console showing twice 2016-02-24 19:57:06 +01:00
gfgtdf
bcf2710cc6 add a comment 2016-02-24 19:56:51 +01:00
gfgtdf
bcb06e4a7a fix lua string and tstring comparision
lua string now use a locale indpenedent comparision, this prevents OOS.

This commit also implements comparision operators for lua tstring which
use a language dependend collate facet from boost locale. (which usually
uses an icu or a winapi backend)
2016-02-24 18:07:00 +01:00
gfgtdf
b282ef7236 use game_data* instead of boost::optional<game_data&> in tod_manager
after updating to boost 1.60 boost have me erros related to
boost::optional<game_data&> in stage_sf_with_rca.cpp where game_data is
not defined (only declared).

Using game_data* solved this problems and also simplies the code by
using simpler datatypes.
2016-02-24 18:06:59 +01:00
ln-zookeeper
a33e37a2fc Added unrenamable=yes to some more units 2016-02-24 15:01:57 +02:00
ln-zookeeper
b338a894b7 Added some missing unrenamable=yes keys and removed unnecessary ones 2016-02-24 14:31:37 +02:00
Charles Dang
b76813c8ac Merge pull request #608 from wesnoth/revert-607-AOI_Named_Loyals
Revert "AOI: Make the named loyal units unnameable."
2016-02-24 22:18:07 +11:00
Charles Dang
aba935060a Revert "AOI: Make the named loyal units unnameable." 2016-02-24 22:17:34 +11:00
Charles Dang
a33a669858 Mark quit_confirmation constructor as explicit 2016-02-24 16:54:34 +11:00
Charles Dang
096d257624 Redo 5418ddfc2495 properly 2016-02-24 16:54:16 +11:00
Charles Dang
5418ddfc24 tsynced_choice_wait: removed now-unused CVideo parameter from pre_show 2016-02-24 16:46:54 +11:00
Charles Dang
1ff15d3ff1 Ran wmlindent on campaigns 2016-02-24 16:31:01 +11:00
Charles Dang
a87939acb0 Run wmlindent 2016-02-24 16:27:08 +11:00
Charles Dang
c9e2dd19db Merge pull request #607 from sigurdfdragon/AOI_Named_Loyals
AOI: Make the named loyal units unnameable.
2016-02-24 16:21:26 +11:00
sigurdfdragon
7d2eaef38d AOI: Make the named loyal units unnameable. 2016-02-23 23:52:02 -05:00
Charles Dang
031628dac5 Small Editor quit confirmation message wording change 2016-02-24 12:37:31 +11:00
Charles Dang
03ed7ffdff Applied some formatting to Editor quit confirmation-with-maps-open message 2016-02-24 12:33:59 +11:00
Charles Dang
7d0a02ec7d Bunch of refactoring of editor quit handling 2016-02-24 12:28:38 +11:00
Charles Dang
27d4091ec5 Reapplied a fix from f067332d0ff5 that got lost in ed9ead2ac9e4 2016-02-24 10:35:26 +11:00
Charles Dang
ed9ead2ac9 Add flag to quit_confirmation::quit() to only quit out of game 2016-02-24 10:30:48 +11:00
Celtic Minstrel
f067332d0f fix spelling 2016-02-23 17:48:45 -05:00
Charles Dang
b73cc5eb08 Small formatting cleanup 2016-02-24 09:44:33 +11:00
Charles Dang
2346b3508f Simplify handling of HOTKEY_QUIT_TO_DESKTOP 2016-02-24 09:43:21 +11:00
Charles Dang
c40c2cd9af ANL: strip unnecessary wmltools guards and ran wmlindent 2016-02-24 09:06:32 +11:00
Charles Dang
56f0c9a99a Redid c0df87a47049 correctly 2016-02-24 09:05:07 +11:00
Charles Dang
c0df87a470 Restore a config.hpp include
This fixes compilation
2016-02-24 09:00:10 +11:00
Celtic Minstrel
c08ea95c72 config: make static string constants private 2016-02-23 15:41:35 -05:00
Celtic Minstrel
baed863df0 Don't include config.hpp when possible
Instead, try to forward-declare it only.
2016-02-23 15:41:34 -05:00
gfgtdf
0484fdd414 fix quit confirmation promt in editor
previously it showed the default "do you want to quit the game" message
when leaving the editor. using the red cross in the corner.

This also changes some dublication of the "Do you really want to quit?"
translatable string in the c++ code.
2016-02-23 20:35:54 +01:00
Robert Wallace
df45dd9aab Update about.cfg 2016-02-23 14:17:57 -05:00
Robert Wallace
afd53cf6a1 Fixed deprecated code in ANL 2016-02-23 14:17:56 -05:00
Celtic Minstrel
708af56409 Fix function name typo 2016-02-23 13:47:49 -05:00
Celtic Minstrel
18bcd519e0 XCode: Suppress warnings about unknown warnings 2016-02-23 10:18:00 -05:00
Celtic Minstrel
fd939cee76 Unit filters: move name warning to constructor and suggest alternatives 2016-02-23 10:05:08 -05:00