61966 Commits

Author SHA1 Message Date
Andreas Löf
56eb59df5e Replace keycode with scancode and fix broken keybindings.
Broken keybindings are fixed byreplacing " " with "space".

Scancodes are tied to physical buttons on the keyboard and are
language independant.
2015-08-25 18:56:28 +12:00
Andreas Löf
2459e7db10 This reworks the hotkey system to rely on keycodes.
There is a new class introduced, hokey_base, that is the public
interface to the hotkey bindings. It is an abstract class that relies
on concrete classes hokey_keyboard and hotkey_mouse to do the device
specific hotkey work via the template method pattern.

There are two factory methods introduced, load_hotkey and
create_hotkey that should only be used to instantiate new objects.

This commit also changes the hotkey ":" and "+" to ";" respective "="
becausse ":" and "+" are not valid keycodes.
2015-08-25 18:56:28 +12:00
Ignacio R. Morelle
a55bc98630 Make hanging, chasm stone, and plank bridges conform to naming conventions
Namely, make the long descriptive name be displayed only in the editor,
and use the "Bridge" shorthand in-game instead.
2015-08-25 02:31:21 -03:00
Ignacio R. Morelle
1e32ae69f5 Fix hanging, chasm stone, and plank bridge elevations
The N-S hanging bridge variant does not need an elevation shift, and
all diagonal variants of the other two were missing their own.
2015-08-25 02:31:17 -03:00
Charles Dang
58b0697b00 DiD S7: apply TC to dummy images 2015-08-25 08:54:53 +11:00
Ignacio R. Morelle
d9d57cf801 Merge pull request #473 from aginor/sdl2graphics
Fix cmake on OSX and fix alpha blending issue with SDL2 while scrolling
2015-08-24 18:51:21 -03:00
Andreas Löf
75035a04f2 Fix alpha blending issue when scrolling under SDL2
SDL2 has a workaround for a broken blitting operation, and on some
hardware accelerated systems this led to an alpha blending issue where
map regions that were frequently redrawn would grow progressively
darker until the alpha blended aspects are black. This disables
alpha-blending on the copy of the scrolled map area as no further
alpha composition should be done without a complete redraw of the
affected area.
2015-08-24 22:33:24 +12:00
Andreas Löf
c42ba83b82 Fix cmake scripts for use on OSX with homebrew.
It seems that cmake won't pick up on the FindPackageHandleStandardArgs
macro on its on from homebrew so I've updated the script to include it.
2015-08-24 19:05:28 +12:00
Charles Dang
bd6f488931 Two more new item icons by doofus-01 2015-08-24 15:30:53 +11:00
Charles Dang
e5d496694e Added several new item icons by doofus-01 2015-08-24 13:53:12 +11:00
Ignacio R. Morelle
870987886c wmllint: Add plain-text substitution rule for [/advance] -> [/advancement]
I forgot these are plain-text substitutions, so of course we need a
matching rule for closing tags.
2015-08-23 21:54:34 -03:00
Ignacio R. Morelle
863fb3fd2d wmllint: Add plain-text substitution rule for [advance] -> [advancement] 2015-08-23 21:52:57 -03:00
Ignacio R. Morelle
df9908932d Merge branch 'amla' of https://github.com/CelticMinstrel/wesnoth into staging/pr-468 2015-08-23 21:40:31 -03:00
Ignacio R. Morelle
80ec273c99 Merge pull request #471 from CelticMinstrel/labels
Fix hidden/empty sides showing in Label Settings
2015-08-23 21:37:06 -03:00
Celtic Minstrel
bd1b1e45a9 Add final fallback case for side label display names 2015-08-23 18:17:47 -04:00
Celtic Minstrel
e3c38d8e53 Fix hidden sides showing in Label Settings, and some sides showing up as empty 2015-08-23 17:10:08 -04:00
Ignacio R. Morelle
92dd610d4c fs: Remove Windows-only bits of the legacy filesystem API implementation
These aren't used by anything else.
2015-08-23 17:28:40 -03:00
Nils Kneuper
c51c913156 converted some old C style casts to new c++ style casts
Those casts created warnings that broke building with cmake and gcc 4.9.3.
2015-08-23 11:05:06 +02:00
Ignacio R. Morelle
e43a4a3ebd desktop: Handle versions of lsb_release that wrap -s output in quotes 2015-08-23 04:59:57 -03:00
Charles Dang
612d0b232f teditor_generate_map: removed erroneous extra border 2015-08-23 18:18:59 +11:00
Charles Dang
b5e8530433 tlabel_settings: cleaned up code and dialog layout 2015-08-23 18:09:33 +11:00
Charles Dang
fc6d6b7e7d teditor_edit_label: removed erroneous extra border 2015-08-23 17:15:56 +11:00
Charles Dang
4464a05bb5 Merge pull request #472 from CelticMinstrel/effect_apply_to
Let [effect]apply_to=new_advancement add multiple AMLAs
2015-08-23 16:56:15 +11:00
Celtic Minstrel
1870cf35cd Enhance [effect]apply_to=new_advancement with respect to AMLAs 2015-08-23 00:21:08 -04:00
Celtic Minstrel
ad62e1d4fd Add deprecated warnings for [advance] 2015-08-22 23:43:50 -04:00
Ignacio R. Morelle
b4de73f83b Add wesnoth.set_dialog_visible function
Sets a given widget's visibility property.
2015-08-22 23:07:03 -03:00
Ignacio R. Morelle
ba6257129a Add wesnoth.set_dialog_focus function
Gives keyboard focus to the given widget.
2015-08-22 22:12:02 -03:00
Ignacio R. Morelle
fa5e0f7be2 Merge pull request #463 from CelticMinstrel/effect_apply_to
New possibilities for [effect]
2015-08-22 21:57:44 -03:00
Charles Dang
9c2c079a3a Dropped HAVE_PYTHON and USE_GZIP defines
As far as I can tell, these do nothing
2015-08-23 10:37:28 +11:00
Celtic Minstrel
ace0b53b31 Change *_movement keys in [effect]apply_to=attack to *_movement_used 2015-08-22 18:39:39 -04:00
Celtic Minstrel
db9aae730a Remove [effect]apply_to=attacks_left due to not being very useful 2015-08-22 18:39:10 -04:00
Celtic Minstrel
8fc2c7cc1f Style tweak 2015-08-22 18:38:45 -04:00
Celtic Minstrel
b91fe7fc91 Update changelog 2015-08-22 18:38:32 -04:00
Celtic Minstrel
3223df3453 Split [effect]apply_to=advances_to into separate "new" and "remove" effects
It now also supports adding and removing AMLAs.
2015-08-22 18:37:29 -04:00
Celtic Minstrel
a62eeaa65d Handle case of default (-1) in [effect]apply_to=recall_cost 2015-08-22 18:37:20 -04:00
Celtic Minstrel
1e74387d3d Handle case of default (-1) in [effect]apply_to=vision 2015-08-22 18:36:59 -04:00
Celtic Minstrel
69006cbf14 Add set_*= versions of increase_*= keys in [effect]apply_to=attack 2015-08-22 18:36:52 -04:00
Celtic Minstrel
aa60b9451a Add [effect]apply_to=jamming 2015-08-22 18:36:46 -04:00
Celtic Minstrel
d685bea4aa Add [effect]apply_to=vision 2015-08-22 18:36:36 -04:00
Celtic Minstrel
e64c46ca23 Add [effect]apply_to=recall_cost 2015-08-22 18:36:22 -04:00
Celtic Minstrel
9785774c9a Add [effect]apply_to=max_attacks and [effect]apply_to=attacks_left 2015-08-22 18:36:15 -04:00
Celtic Minstrel
0a13fac063 Add increase_movement= to [effect]apply_to=attack 2015-08-22 18:35:56 -04:00
Celtic Minstrel
37bb9a021a Add [effect]apply_to=alignment 2015-08-22 18:35:43 -04:00
Celtic Minstrel
2012323758 Add [effect]apply_to=advances_to 2015-08-22 18:35:34 -04:00
Ignacio R. Morelle
0d94262d9e Merge pull request #455 from Wedge009/Windows_updates
Minor Windows Updates
2015-08-22 19:09:33 -03:00
Ignacio R. Morelle
f862f6964d Merge pull request #454 from Wedge009/SDL2_windows_tray
SDL2 Update for Windows Tray Notification
2015-08-22 19:05:01 -03:00
Charles Dang
e80952edbc HttT: removed very old story images that now look incredibly out of place 2015-08-23 02:15:09 +11:00
Wedge009
ce9104fbe1 Resolve compiler warning about conversion from unsigned int to bool. 2015-08-22 23:08:10 +10:00
Wedge009
bec01d798a Use static inline in Visual C++. 2015-08-22 23:00:42 +10:00
Wedge009
a88e777e05 Check for _MSC_VER definition first
Forgot the need to check for the presence of _MSC_VER definition before it can be compared against the value for VC 2015.
2015-08-22 23:00:36 +10:00