68581 Commits

Author SHA1 Message Date
Charles Dang
6eab63a71d Updated CB projectfile 2017-04-30 14:41:32 +11:00
Charles Dang
c25b0097f8 GUI2/dispatcher: simplified fire_event implementation with range-for 2017-04-30 14:41:05 +11:00
Charles Dang
f095ada2f5 GUI2: refactor dispatcher to remove need for helper structs in fire() 2017-04-30 14:30:43 +11:00
gfgtdf
d405ec1c9d use boost::string_view in config class
this replaces the older heterogenous lookup optmisation in config.?pp.
The advantage  is that it no longer requires different overloads for c
strings and std::string so it can easily be aplied to all config memeber
functions witout code duplication.
2017-04-29 19:42:05 +02:00
Alekzander Bollig
ceba081542 Fix for 21634 (#999) 2017-04-29 11:42:32 -04:00
gfgtdf
12f9215da2 deployed some range for loops on gameboard::teams() (#1007)
deployed some range for loops on gameboard::teams()
2017-04-29 16:08:45 +02:00
gfgtdf
f71e64e364 bring back unit_map::replace 2017-04-29 16:06:42 +02:00
Andreas Löf
73faf496a9 Fix #25682: Ignore "shift" when the hotkey is ":"
This adds a second part, during the hotkey creation from an event,
to the hack around colons. It also ensures that the right field is
compared when checking for existing matching hotkeys for keyboard-based
hotkeys.
2017-04-29 22:41:57 +12:00
Jyrki Vesterinen
9edf49e3af Remove an unused variable
Thanks to @matthiaskrgr for noticing.
2017-04-29 10:34:58 +03:00
Celtic Minstrel
cdca6b79d8 Merge pull request #962 from wesnoth/wml_tag_porting
Porting WML tags to Lua (part 2)
2017-04-29 02:25:10 -04:00
Charles Dang
bac460baef Editor: second attempt to fix crash when closing map (bug #25680) 2017-04-29 16:34:45 +11:00
Celtic Minstrel
a694201c02 A few more improvements to the music API
- Handle all plausible cases of assigning into the playlist
- Allow changing the current track to an existing one on the playlist
- Allow getting playlist as a real array instead of an array-like proxy
  (Could be useful for storing it to a WML variable, for example)
2017-04-29 00:01:40 -04:00
Charles Dang
9742a15046 GUI2: reformat dispatcher code 2017-04-29 14:16:19 +11:00
Celtic Minstrel
b1d4be2f52 Update manual for #1003 2017-04-28 23:11:40 -04:00
Andreas
af1326d19b Merge pull request #1003 from wesnoth/composed_hotkeys
Composed hotkeys
2017-04-29 14:52:44 +12:00
Celtic Minstrel
e7cf873002 Partial fix for labels not being drawn while a dialog is open 2017-04-28 21:47:35 -04:00
Andreas Löf
46f16e1a8a Pipe raw SDL events throught the GUI2 event system for hotkeys
This adds support for passing raw SDL events throught the GUI2
event system in order to allow for hotkey creation in the GUI2 hotkey
dialog. The dialog in turn uses the raw SDL event to query the hotkey
subsystem whether it's a suitable event to create a hotkey from or not.

The first suitable event is used to create a hotkey.
2017-04-29 11:39:54 +12:00
Andreas Löf
daef8cd22c Fix 24681: Proper filtering of modifiers when handling hotkeys
This adds proper handling for composition of input and also handles
raw key up/down properly when there are modifiers applied to the
keyboard that stops composition.
2017-04-29 11:30:31 +12:00
Andreas Löf
92ca7fdb5e Fix #24681: Use composed hotkeys where appropriate and revert help to be ':'
This enables textinput events in SDL and adds handling of them. The events
are processed for hotkeys if the length of the hotkey string is 1 (which is the
case for all straightforward hotkeys).
2017-04-29 11:30:31 +12:00
Celtic Minstrel
0828c2bdf8 MSVC: Add Test_Debug and Test_Release to solution configurations 2017-04-28 18:22:55 -04:00
Celtic Minstrel
74df91877f Unit tests: Fix a few MSVC warnings 2017-04-28 18:15:10 -04:00
Celtic Minstrel
f142ed6170 Fix MSVC misconfiguration for unit tests 2017-04-28 17:53:40 -04:00
Celtic Minstrel
8cb3334ca3 Fix GUI2 test compilation on MSVC 2013
MSVC 2013 doesn't yet support inline initializer-lists or something.
Solved by making the variables static and defineing them out-of-line.
2017-04-28 17:45:54 -04:00
Celtic Minstrel
1916815e38 fixup! GUI2 Tests: directly initialize a vector 2017-04-28 17:38:12 -04:00
Charles Dang
e50d9ed417 Fixed Back To Turn menu items overriding regular ones 2017-04-29 06:48:07 +11:00
Celtic Minstrel
c77800333c Fix WML commands replacing regular menuitems 2017-04-28 15:43:52 -04:00
Celtic Minstrel
19fa4244af Fix crash when using debug_print in a GUI2 formula 2017-04-28 15:33:00 -04:00
Celtic Minstrel
819fa75330 Some improvements to tooltip placement 2017-04-28 15:32:37 -04:00
Celtic Minstrel
06450e8bb6 Split tooltip definitions into separate files 2017-04-28 14:57:19 -04:00
Celtic Minstrel
d4c75b6ad6 Game Stats: Show controller 2017-04-28 14:51:33 -04:00
Celtic Minstrel
ad9bf209a7 Fix buttons disappearing while menus are open 2017-04-28 06:50:36 -04:00
Charles Dang
d0b9f431e7 Remove some unnecessary draw calls when recruiting or recalling
I think these were probably there to deal with the GUI1 menus needed to be undrawn under the GUI1 Recruit/Recall
dialogs (dunno if the problem persisted into GUI2). Either way, they're not necessary now, since GUI2 handled the
dialog undrawing.
2017-04-28 19:18:45 +11:00
Charles Dang
17405bcdfb Fixed a bit of unintended formatting in a4e3f5466 and a typo in 7e5e83d07 2017-04-28 19:03:38 +11:00
Charles Dang
10925b8f92 Menu Handler: deploy range-for 2017-04-28 18:59:02 +11:00
Charles Dang
7e5e83d071 Rewrote the unsafe lua mode warning to be less panic-y 2017-04-28 18:51:28 +11:00
Charles Dang
a4e3f54661 Menu Handler/Chat Handler: reformat
No functionality changes.
2017-04-28 18:36:50 +11:00
Charles Dang
8970340f39 MP Change Control: utilize menu_handler member for game_board access
This also changes the stored member to a reference since A: we no longer test this dialog and B: the dialog is
useless without the game_board.
2017-04-28 18:10:28 +11:00
Charles Dang
dd5a8a6e38 Menu Handler: made state gamestate/gameboard data getters public
This is to enable the MP Change Control dialog to use them.
2017-04-28 18:08:40 +11:00
Charles Dang
a4b3f72a57 GUI2 Tests: directly initialize a vector 2017-04-28 17:16:02 +11:00
Charles Dang
2a6ca6cd9e Deployed more emplace_back (how do I keep missing these...)
Covers more cases of:

* push_back(std::pair
* push_back(std::make_pair
* push_back(std::make_tuple
* push_back(T) where T is an empty object of type T

Small thing I noticed: this does mean the numbers in font::subset_descriptor are no longer 'cast' to size_t before being
added to the vector, but that shouldn't matter (hopefully).
2017-04-28 17:15:13 +11:00
Celtic Minstrel
ac23b4579e fixup! Addon Manager: Make type lists static since they never change 2017-04-28 00:54:56 -04:00
Charles Dang
bf93c346dc Reformat INSTALL file to work correctly with Markdown
[ci skip]
2017-04-28 15:13:16 +11:00
Charles Dang
bba5454443 Made README files Markdown
[ci skip]
2017-04-28 15:07:06 +11:00
Charles Dang
ed8562a815 Made INSTALL a Markdown file
[ci skip]
2017-04-28 14:53:34 +11:00
sigurdfdragon
5ebe71be03 SotA: Fix altar lighting for sacrifice scene
Proper item lighting behavior was restored in 478c75bdb5bc914fcd71469a2ae6967cadc99e11
Use new ~NO_TOD_SHIFT() to prevent change.
Altar image file renamed & no longer needed versions deleted.
2017-04-28 14:07:28 +11:00
Charles Dang
e8776e3c79 Made const_clone::is_source_const public
Might be useful for something.
2017-04-28 13:14:16 +11:00
Charles Dang
3713930249 Simplify 0dfe846 a little further 2017-04-28 13:10:16 +11:00
Charles Dang
647f3e12be Added small wrapper function for converting a bool to string 2017-04-28 12:41:38 +11:00
Charles Dang
2ddb305844 Disabled MP Change Control test
This dialog is rather useless without a game_board object which the tests don't have. The dialog refactor
(5effd5338) did expose a few invalid cases assuming resources::gameboard was always valid (when it's not -
see the tests), but even if that were fixed the test would be rather useless since there's nothing there
without said game_board.
2017-04-28 11:00:10 +11:00
Celtic Minstrel
f5918996df Addon Manager: Make type lists static since they never change 2017-04-27 18:20:10 -04:00