Charles Dang
bec40a3c39
Merge pull request #483 from Wedge009/Spelling_Corrections
...
Spelling and Grammar Corrections
2015-09-20 07:07:00 +11:00
Celtic Minstrel
7ca65c819e
Clarify changelog
2015-09-19 15:41:23 -04:00
Celtic Minstrel
f54d6b5d28
Rewrite leadership ability as a single macro using $other_unit
...
Note: It's no longer supported to use the macro in a unit with a non-matching level,
for example giving a 2nd-level unit 4th-level leadership.
2015-09-19 02:14:38 -04:00
Celtic Minstrel
12c96a94d2
New autostored WML variable $other_unit for [filter_adjacent]
...
Also accessible in:
- Weapon specials ([filter_self], [filter_opponent], [filter_attacker], [filter_defender])
- Abilities ([affect_adjacent][filter])
The backstab weapon special is now implemented using this.
(In a weapon special filter, units are guaranteed to be facing each other.)
2015-09-19 00:55:19 -04:00
Andreas Löf
8a86b547ce
Merge branch 'master' into sdl2
2015-09-15 20:26:37 +12:00
Charles Dang
1c8bf80634
Added new generic portrait for Ancient Wose by LordBob
...
The previous Wose portrait has now been repossessed for the Wose specifically,
and also used for the Elder Wose. This new portrait is used for the Ancient Wose
exclusively.
2015-09-12 02:40:36 +11:00
Charles Dang
203411d042
New generic portrait for Yeti by LordBob
2015-09-12 02:30:43 +11:00
Andreas Löf
22cff55dc8
Merge pull request #475 into sdl2 from CelticMinstrel:quit-confirm2
2015-09-11 18:55:11 +12:00
Andreas Löf
0bb02fb548
Merge branch 'master' into sdl2
2015-09-11 18:24:10 +12:00
Charles Dang
19e7adfe52
Use overgrown base for Ruined Human Castle (Chr)
2015-09-10 23:15:05 +11:00
Andreas Löf
fedf2478d3
Merge branch 'master' into sdl2
2015-09-09 21:53:32 +12:00
Celtic Minstrel
24a54e1108
Show the non-rebindable shortcuts in preferences.
...
They can't be changed, but it will at least let people know that the key works for that command.
Currently they're just hard-coded. A more general solution would be possible, if there's
any chance that more non-rebindable hotkeys are needed.
This also removes Cmd+Shift+Q as a shortcut for Quit to Desktop on OSX.
2015-09-08 10:45:42 -04:00
ln-zookeeper
e4ed29c0ce
Removed all uses of the now unnecessary SOUND:SLOW and SOUND:POISON
2015-09-08 12:11:12 +03:00
Celtic Minstrel
c35387982c
Generalize Quit to Desktop hotkey so it works in-game and at titlescreen
2015-09-07 14:52:00 -04:00
Andreas Löf
91cd168ec8
Merge pull request #466 from aginor/hotkeyrewrite
...
This reworks the hotkey system to rely on scancodes.
2015-09-06 20:49:32 +12:00
Wedge009
a6fc91090e
Turns out it wasn't a then/than mix-up. Still needed correcting, though.
2015-09-05 17:46:58 +10:00
Charles Dang
ed67f99f69
Cleaned up a few stray semi-transparent pixels on the edge
2015-09-03 18:59:54 +11:00
Charles Dang
282cfe38be
Added new default amla icon
...
The old icon (misc/icon-amla-default.png) remains for compatibility purposes,
but I added a wmllint rule to update the path.
The new image was created with https://openclipart.org/detail/29043/heart , which is
released under the public domain (CC-0).
2015-09-03 18:53:11 +11:00
Wedge009
531c1d9dbd
Surely 'capital' is referring to Weldyn, not some government building within it, especially given the reference to palace grounds.
2015-08-31 21:03:21 +10:00
Wedge009
73b10f315a
Separated 'can not' is more common where 'not' forms part of a construction with subsequent words.
2015-08-31 19:11:05 +10:00
Nils Kneuper
358ffb7277
updated Japanese translation
2015-08-29 10:41:25 +02:00
Wedge009
9bcfb8dff5
Correct then/than mix-up.
2015-08-27 02:01:05 +10:00
Wedge009
f05557a7d9
Spelling corrections
...
recieve -> receive
intepolate -> interpolate
2015-08-26 17:30:44 +10:00
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
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
Wedge009
438e28df85
Adding self to contributors as requested
2015-08-22 22:23:58 +10:00
Ignacio R. Morelle
f852044d4c
Merge branch 'staging/pr-449-4'
2015-08-22 02:32:38 -03:00
Ignacio R. Morelle
2278219348
Merge branch 'master' of https://github.com/JohnAnthony/wesnoth into staging/pr-449-4
2015-08-22 01:17:05 -03:00
Charles Dang
6df77620de
Replaced story image with larger updated one by LordBob
2015-08-22 10:29:01 +11:00
Charles Dang
0103c40c84
Removed orphaned (as of 9f6935da3f
) logo translations from core
...
Logo internalization is now kept in root/images/misc
2015-08-20 15:16:14 +11:00
Charles Dang
f7f497566f
Update API to work with the new two layer logo
2015-08-20 13:58:43 +11:00
Charles Dang
9f6935da3f
Removed unused copy of logo from core
...
I thought the help browser might use this, but it uses the logo in root/images/
2015-08-20 13:52:41 +11:00
Charles Dang
eecbf6efc4
Add 12 new generic storyscreen art pieces by LordBob
...
http://forums.wesnoth.org/viewtopic.php?p=551341#p551341
2015-08-20 10:44:53 +11:00
John Anthony
e50ee3db41
Added password hashing to campaignd
...
This will also update existing campaigns stored with a plaintext password to use
the new, more secure system.
2015-08-19 09:10:07 +01:00
Charles Dang
0dfe2a21d9
Deprecate ANIMATED_CAMPFIRE and ANIMATED_BRAZIER
...
Both of these have been replaced with embellishment overlay terrains
2015-08-17 10:41:46 +11:00
Nils Kneuper
f7982497f0
updated Latvian credits
2015-08-13 22:48:47 +02:00
Charles Dang
17d1212a0e
General wmlindent run
2015-08-12 17:10:09 +11:00
Charles Dang
768a418137
Deprecate ON_SIGHTING
...
Since sighted events now work, this macro is no longer necessary
2015-08-12 06:12:13 +11:00
Charles Dang
ad881b5d0b
Formatting fixup for 08d5d9c8e8
2015-08-12 03:21:23 +11:00
aquileia
08d5d9c8e8
Add nightblade unit description
2015-08-11 18:16:46 +02:00
Ignacio R. Morelle
b9c6ab59d6
Fix WML variable leak in RECRUIT_UNIT_VARIATIONS
2015-08-09 01:52:27 -03:00
Celtic Minstrel
e130a960cb
Update credits and changelog
2015-08-07 22:50:24 -04:00
Andreas Löf
aae2ad77e6
Make the game compile with SDL2.
...
This does the bare minimum to get the game compiling and running again with SDL 2. It fixes all of the compile errors, adds a missing seek operation to the SDL_RWops. The missing seek operation caused a NULL pointer dereference during game start.
2015-08-02 22:09:02 +12:00
ln-zookeeper
ae2abf65e9
Tweaked the new water images as per LordBob's suggestion.
2015-08-01 00:14:37 +03:00
Ignacio R. Morelle
c4e7b15ebc
Update and reorganize Packagers section in the credits
...
Now the list is split between active and inactive packagers, and we also
list SDK maintainers (aquileia, loonycyborg).
Also restored alphabetical order, fixed comments and names, and added
aquileia, ancestral, mattsc, and vincent_c.
2015-07-30 03:10:15 -03:00
Ignacio R. Morelle
cdd03d50cb
Restore alphabetical order to the Campaign Design credits section
2015-07-29 21:48:03 -03:00