gfgtdf
a9f141c58e
fixup SCATTER_UNITS
...
was broken in 9d656ad755
2015-12-07 22:40:26 +01:00
gfgtdf
dc786dc181
add tag [random_placement]
...
and use it to implement SCATTER_IMAGE,SCATTER_EMBELLISHMENTS and
SCATTER_UNITS
2015-12-07 21:49:09 +01:00
aquileia
5adfa80eed
Unify khalifate unit plural forms
...
Noted by Chewan
2015-12-02 00:36:53 +01:00
Andreas Löf
3036b4ee49
Merge branch 'master' into sdl2
2015-11-17 17:44:09 +13:00
Wedge009
63788d5f4a
Properly correct the broken Desert Sands / Oasis help entry (bug #23023 )
...
Reverts the previous change to the terrain.cfg and allows the terrain code to fall back to name if editor name is unavailable.
2015-10-30 00:10:14 +11:00
Andreas Löf
1890e948e4
Merge branch 'master' into sdl2
2015-10-26 18:57:32 +13:00
Wedge009
61b3a9037b
Correct Desert Sands / Oasis Help Entry
...
Reported in Bug #23023 .
2015-10-25 21:23:24 +11:00
ln-zookeeper
4deeef797d
New attack sounds for mudcrawlers
2015-10-18 19:05:34 +03:00
ln-zookeeper
3a5f25b999
New ink sounds
2015-10-18 15:00:25 +03:00
neverEnough
58c78e2c5e
updated data/core/about.cfg; /changelog; /players_changelog
2015-10-17 23:59:39 +02:00
Andreas Löf
ae1d364318
Merge branch 'master' into sdl2
2015-10-15 09:57:15 +13:00
ln-zookeeper
a437c538d5
New staff and club sounds, from material by leorock116
2015-10-12 01:03:47 +03:00
Charles Dang
dfabf72030
Revert "Remove multiplayer/ inclusion from editor"
...
This reverts commit 872444a28c1e6e3d98543e180bed235edb09bd3f.
2015-10-10 03:47:01 +11:00
Charles Dang
872444a28c
Remove multiplayer/ inclusion from editor
2015-10-09 15:22:14 +11:00
ln-zookeeper
0fd627178d
New mace sounds, from material by leorock116
2015-10-06 17:49:36 +03:00
Charles Dang
2775d3df4d
Minor simplification of FORCE_CHANCE_TO_HIT
2015-10-04 13:52:23 +11:00
Charles Dang
fd098e4b62
Simplify HIGHLIGHT_IMAGE using the new [repeat] tag
2015-10-04 04:30:38 +11:00
Celtic Minstrel
9fb175c9d6
Use new looping tags to implement loop macros
2015-10-01 13:37:55 -04:00
Charles Dang
dd0b2104a5
Deprecated MENU_IMG_TXT and MENU_IMG_TXT2
2015-10-01 21:10:27 +11:00
Charles Dang
bd6467d166
Converted mainline campaigns to use new difficulty syntax
2015-09-29 15:35:40 +11:00
Andreas Löf
9ae3b29f4a
Merge with master
2015-09-21 23:07:49 +12:00
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
