64433 Commits

Author SHA1 Message Date
Charles Dang
0e7f855be3 Improved scrollbar graphics 2016-04-07 19:45:28 +11:00
Ryan Roden-Corrent
5aecbdbe83 Add self (rcorre) to contributors 2016-04-06 22:45:30 -04:00
Ryan Roden-Corrent
fd8dfd5853 Changelog: hotkey release and scroll key binding. 2016-04-06 22:41:48 -04:00
Charles Dang
7aa0f77837 Proper full alignment icon set by LordBob 2016-04-07 12:51:13 +11:00
Celtic Minstrel
3b4b858a40 DW S10: Fix invalid [object] IDs 2016-04-06 19:48:17 -04:00
gfgtdf
c9ecd5a15d disable c++14 build
Travis fails to build with c++14 because the default installed compiler (or rather the default libstdc++ from gcc 4.8) doesn't support it, i tried to fix it by changing the the install script to install gcc5 but somhow that failed too.

Since noone in our active dev team can fix this, we disable this for now. But i'd be useful if this was reenabled and fixed at some point.
2016-04-07 01:00:56 +02:00
Celtic Minstrel
7521fad2a1 Merge pull request #639 from ancestral-lato
New default game typeface: Lato
2016-04-06 13:43:15 -04:00
Celtic Minstrel
21965b40e5 Font scaling minimum to 80% and adjust vertical centering formula
[ci skip]
2016-04-06 13:31:38 -04:00
Celtic Minstrel
396af2d0d8 Fix MSVC 2013 compile error 2016-04-06 13:00:14 -04:00
Charles Dang
7525646cd0 tunit_preview_pane: redesigned Minimal style
This restores the title and image and replaces the icons with labels.
2016-04-06 23:12:08 +11:00
Celtic Minstrel
1e5e071734 BOOST_STATIC_ASSERT -> static_assert 2016-04-05 22:57:47 -04:00
Celtic Minstrel
1afa45a53e Fix crash if Lua initialization routines put up a dialog during the loading screen 2016-04-05 22:56:58 -04:00
Celtic Minstrel
8cbd358baf tloadscreen: Minor rearrangement of elements 2016-04-05 22:27:20 -04:00
Celtic Minstrel
4af12203d8 [on_undo] and [on_redo] now get a snapshot of the event context
This means they can access auto-stored variables.
However, using [unstore_unit] for $unit or $second_unit is not recommended.
Also, $unit.x and $unit.y may not be the same as they were during the original event.
(The same with $second_unit)
2016-04-05 21:21:48 -04:00
Ryan Roden-Corrent
e066075a04 Cleanup: Replace spaces with tabs 2016-04-05 20:51:33 -04:00
Ryan Roden-Corrent
94e390c067 Gracefully handle multiple scrolling hotkeys.
Track whether each scroll direction is enabled separately.
This avoids odd behavior when holding multiple hotkeys for the same
scroll direction.
For example, holding two hotkeys for right and releasing both will no
longer cause the map to begin scrolling left.
2016-04-05 20:51:33 -04:00
Ryan Roden-Corrent
355b8ce1b8 Restore cycle_units/cycle_back_units hotkeys.
These were accidentally removed while implementing scroll hotkeys.
2016-04-05 20:51:33 -04:00
Ryan Roden-Corrent
4e3d616336 Rename controller_base::keyboard_scroll.
Rename to controller_base::apply_keyboard_scroll to avoid confusion
with hotkey_handler::keyboard_scroll.

keyboard_scroll handles the hotkey press and invokes
apply_keyboard_scroll on the controller.
2016-04-05 20:51:33 -04:00
Ryan Roden-Corrent
a58e595705 Add default hotkeys for map scrolling 2016-04-05 20:51:33 -04:00
Ryan Roden-Corrent
419bf799ac Handle scrolling hotkeys in editor. 2016-04-05 20:51:33 -04:00
Ryan Roden-Corrent
ae37341ab3 Remove specialized hotkey repeat handling.
Don't handle repeat events specially when triggering hotkeys.
Replace the HOTKEY_EVENT_TYPE enum with a bool indicating whether the
event was a press or a release.

Scrolling handles repeats by clamping the scroll between -1 and 1 so
repeat events don't accelerate the scroll speed.
2016-04-05 20:51:33 -04:00
Ryan Roden-Corrent
f4d2b24a3f Add braces to single-line ifs.
Code review feedback.
2016-04-05 20:51:33 -04:00
Ryan Roden-Corrent
0a05828da3 Implement map scrolling with hotkeys.
This leverages the new hotkey release support to implement scrolling
with hotkeys rather than keyboard polling.
This allows users to rebind the scroll keys in the hotkey menu.
Previously they were fixed to the arrow keys.
2016-04-05 20:51:33 -04:00
Ryan Roden-Corrent
fa75608873 Implement hotkey release handling.
Hotkeys are now triggered by a key/button release as well as a press.
This information is passed along as HOTKEY_EVENT_TYPE, which may be
HOTKEY_EVENT_PRESS, HOTKEY_EVENT_RELEASE, or HOTKEY_EVENT_REPEAT (for a
held key repeat).

Currently this should preserve the previous functionality. Existing
hotkeys respond to a press or repeat as they did before and ignore a
release.
2016-04-05 20:51:33 -04:00
Ryan Roden-Corrent
a33414a79f Correct doc reference to nonexistent function
is_keyboard_scroll_active no longer exists, scrolling_ seems to be the
equivalent.
2016-04-05 20:51:33 -04:00
Charles Dang
b7b8b1e213 tcustom_tod: cleaned up code and unused related preference keys 2016-04-06 01:24:00 +11:00
Celtic Minstrel
73739a1989 Attempt to fix Travis build... again 2016-04-05 10:08:14 -04:00
Celtic Minstrel
e1534f0686 Update XCode project 2016-04-05 03:21:51 -04:00
Celtic Minstrel
7ee37b6f84 Attempt to fix Travis build 2016-04-05 03:19:26 -04:00
Charles Dang
71b154b6e3 Refactored out savegame::savegame_config class
This was basically an unnecessary stub class. It also allows us to
remove the unused soundsource::manager::to_config() function (write_sourcespecs()
did the actual job).
2016-04-05 18:10:44 +11:00
Celtic Minstrel
ce7cd0191a Attempt to fix Travis build 2016-04-05 02:42:09 -04:00
Celtic Minstrel
5cf12798ce Port "trivial" WML tags to Lua
This is more about adding Lua API for things that should have it than porting WML tags to Lua.
The following new Lua API functions have been added to the wesnoth table:
- add_fog, remove_fog
- add_sound_source, remove_sound_source, get_sound_source
- log
2016-04-05 02:24:42 -04:00
Celtic Minstrel
ff618e7eb3 Eliminate resources.hpp usage in game_lua_kernel 2016-04-04 22:20:40 -04:00
Celtic Minstrel
a275f22ebe Fix potential "image is nil" error in [message] 2016-04-04 20:55:45 -04:00
Celtic Minstrel
d3374d3670 WML tags fixup 2016-04-04 20:10:52 -04:00
Celtic Minstrel
19fe2aa817 using -> typedef in some cases
This is because MSVC 2013's using-alias support is buggy
2016-04-04 18:29:39 -04:00
Celtic Minstrel
a791909544 Split the more complicated WML tags into separate Lua files 2016-04-04 17:03:38 -04:00
Celtic Minstrel
2d72d1512b Attempt to fix Travis build 2016-04-04 17:00:41 -04:00
Celtic Minstrel
74fd5395a9 Fix "set wesnothd path" preference 2016-04-04 15:55:05 -04:00
Celtic Minstrel
1bdce5b937 Fix build
This fixes my build and should also fix the Travis builds.
2016-04-04 15:55:04 -04:00
Celtic Minstrel
4f2367648e Update XCode project 2016-04-04 15:55:01 -04:00
Celtic Minstrel
ca6ec3b900 NULL -> nullptr 2016-04-04 15:55:00 -04:00
Celtic Minstrel
ff3e1bf83a Variadic config methods to combine remove_attribute or clear_children calls 2016-04-04 15:54:59 -04:00
Celtic Minstrel
38010fd991 Revert "remove unused queued_event parameter from WML_HANDLER_FUNCTION"
This reverts commit 310ba26704873a89268d7dfef10f384a12ab2559.
2016-04-04 15:54:57 -04:00
Charles Dang
0a7190c605 Updated cb projfile 2016-04-04 13:11:05 +11:00
Charles Dang
5d28a2caa5 Updated min_allowed_height to 600 2016-04-04 13:10:11 +11:00
gfgtdf
f96b4ad11f mix msvc build
msvc doesn't accept NULL/0 in the std::function constructor
2016-04-04 00:10:01 +02:00
Charles Dang
1492a237a1 Revert "Attempt to fix travis"
This reverts commit 182732a04ce77a96ee1d2f81e6dde9b7de926a41.
2016-04-04 02:40:28 +11:00
Charles Dang
e97b4f60e3 tloadscreen: use blank spaces for animation size label
This reserved space for the label while removing the slight glimpse
of the full string when the loadscreen first shows.
2016-04-04 02:37:46 +11:00
Charles Dang
182732a04c Attempt to fix travis 2016-04-04 02:28:09 +11:00