0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
73397 commits 51 branches 369 tags 4.7 GiB
Commit graph

95 commits

Author SHA1 Message Date
Iris Morelle
14ec9954f1 Replace a few instances of "mermen" with "merfolk" in core descriptions 
These are only the ones were it's sufficiently unambiguous that the
description is referring to the merfolk race at whole. There are a few
instances I didn't touch were it's possible that the text refers
exclusively to mermen fighters (e.g. "the mermen armies").

See issue #2940.

[ci skip]
 2018-04-22 17:42:44 -03:00
Matthias Krüger
b11d3fdcbe fix a bunch of typos found by codespell in data directory. 
https://github.com/lucasdemarchi/codespell
 2018-02-06 23:03:06 +11:00
jostephd
95b4d89eda Fix grammar in Merman Netcaster description (#1913) 
Similar to #908.
 2017-08-21 08:31:36 -04:00
Lari Nieminen
929093b4e7 Gyra_Solune's unit description updates (#743) 
* Updated unit descriptions for the Orcish Grunt line

* Updated unit descriptions for the Merman Fighter line

* Updated unit descriptions for the Sergeant, Lieutenant and General

* Updated unit description for the Peasant

* Updated unit description for the Royal Warrior

* Updated unit description for Ancient Lich

* Updated unit description for Dwarvish Steelclad
 2016-11-15 19:34:04 +02:00
Celtic Minstrel
b295aab4ba Deprecate {MAGENTA_IS_THE_TEAM_COLOR} 
The magenta colour is now the default flag_rgb colour if one is not specified.
 2016-08-05 00:49:39 -04:00
Celtic Minstrel
c2e216be5a Tweak some small_profiles 2016-03-21 12:50:04 -04:00
Celtic Minstrel
60a819f17e Remove all non-transparent portrait images 
The small_profile key has been used in several cases to approximately preserve the cropping and orientation from the non-transparent portraits. Some of these could be up for review.
 2016-03-21 12:50:04 -04:00
ln-zookeeper
f15c7643b9 Unified sword sound timing to -100/-75 (cases of -75 left unchanged) 2016-01-11 16:48:18 +02:00
ln-zookeeper
eb1da88f67 Unified staff sound timing to -125 2015-12-22 17:44:51 +02:00
ln-zookeeper
d8e5410086 Wired in the new staff sounds 2015-12-22 17:34:01 +02:00
ln-zookeeper
e4ed29c0ce Removed all uses of the now unnecessary SOUND:SLOW and SOUND:POISON 2015-09-08 12:11:12 +03:00
Charles Dang
dc566e46b6 Strip unused [portrait] blocks from unit files 2015-04-19 21:06:22 +11:00
ln-zookeeper
c4ad38a251 Revert failed attempt to fix slow/poison sounds 
The fix failed because attacker/defender hits events are fired after the
attack animation has finished, not in the middle of it when the hit
occurs.
 2015-04-17 08:47:07 +03:00
ln-zookeeper
6943bc0d6a Removed uses of SOUND:SLOW and SOUND:POISON 2014-12-07 14:28:46 +02:00
David Mikos
971dde985a Animation WML: fix unit/macro WML for sound start time in additional frames without duration 1 work around. 2013-10-08 19:31:31 +10:30
Alexander van Gessel
38b224c1ff Revert "Revert "Merge branch 'master' of github.com:wesnoth/wesnoth-old"" 
This reverts commit 23b72d6956.
 2013-08-09 00:13:46 +02:00
Thibault Févry
23b72d6956 Revert "Merge branch 'master' of github.com:wesnoth/wesnoth-old" 
This reverts commit 5fa5c03411, reversing
changes made to 06374c64ba.
 2013-08-08 18:50:46 +02:00
Elvish_Hunter
695850efed Removed no longer useful ellipse= key from mainline units (merfolk) 2013-07-21 14:26:31 +02:00
David Mikos
1c1022e07a Minor changes to unit attack sound timings in collaboration with Bumbadadabum. 
Units sound timings changed: Assassin, Orcish Assassin, Orcish Slayer,
Merman Warrior, Fencer, and Spearman ranged.
 2013-03-22 21:29:38 +00:00
David Mikos
d60d4d7c61 Unit animation WML to use SOUND:HIT_AND_MISS macro throughout. 
Large simplification and reduction in cache.
 2013-03-20 20:01:25 +00:00
Jérémy Rosen
e1590a4254 apply patch #3682 by Coffee: 
make image a progressive parameter+big WML simplification
 2013-02-16 18:13:39 +00:00
Jérémy Rosen
dc02698fa8 change syntax of square bracket animations, ~ is not used for range 2013-01-30 21:37:44 +00:00
Jérémy Rosen
5662cbcc38 new syntax for animation lines, simplifies mainline WML quite a bit. 
patch by Coffee
 2013-01-26 22:33:51 +00:00
Alexander van Gessel
ffeca20f87 Remove [unit_type] undead_variation keys that are now unnecessary 2011-11-05 17:16:46 +01:00
Simon Forsyth
cb11c1df69 Long delayed commit of merman fighter se attack 2011-09-20 21:57:35 +00:00
Gunter Labes
4fd1e6fefb [[Balancing changes]] 
* Decreased the XP requirement of the Mage from 60 to 54.
* Decreased the XP requirement of the White Mage from 150 to 136.
* Decreased the XP requirement of the Mermaid Priestess from 150 to 132.
 2010-09-25 18:02:29 +00:00
Eric S. Raymond
e7d337a676 Reindent mainline. 2010-09-23 13:04:56 +00:00
Steven Panek
d784c34fd2 Applied file #10184 from patch #1926 with modifications. 2010-09-12 04:20:34 +00:00
Phil Barber
072e7e60c8 Add and wire new defence anim and se attack anim for Merman Warrior. 
Update changelogs.
 2010-08-20 08:50:49 +00:00
Phil Barber
85fc61f16f Add and wire new merman Hunter ranged animation and defence. 
Update changelogs, credits.
 2010-08-19 18:08:53 +00:00
Guillaume Melquiond
e027953a97 Fixed broken attack animation. (Patch #1779 by Anonymissimus.) 2010-07-29 02:30:00 +00:00
Guillaume Melquiond
2bd1bc6b6c Fixed club sounds. 2010-07-28 20:37:24 +00:00
Guillaume Melquiond
991155ca4a Fixed broken attack animations. 2010-07-28 20:21:55 +00:00
Steven Panek
5d2b5fdd2b Converted more makeshift dashes (hopefully, I got all of them). 2010-05-11 23:30:32 +00:00
Nils Kneuper
96ee59dfa3 fixed indention problems... 
...as reported at http://wiki.wesnoth.org/SpellingMistakes
 2010-03-26 14:36:16 +00:00
Eric S. Raymond
0aa99781cf Reindent mainline. 2009-11-23 14:39:03 +00:00
Eric S. Raymond
c4ccf93591 Address bug #14766: Wrong portrait for merman entangler. 2009-11-15 02:43:31 +00:00
Eric S. Raymond
c5a70496a2 A final pre-1.8 prose polish on the units subtree. 2009-09-26 22:41:57 +00:00
Phil Barber
99b80961ef Add and wire new Merman Netcaster portrait, 
...update changelogs, portrait credits.
 2009-09-09 19:26:46 +00:00
Phil Barber
8b8973a03d Add and wire new Merman Spearman portrait, update changelogs, portrait credits. 2009-09-03 21:10:31 +00:00
Eric S. Raymond
4ec85cfd8d wmllint fixes (including some enhancements to wmllint itself... 
...to coope with new AI-related tags). Minor prose polish in some
Drake unit descriptions.
 2009-09-01 23:34:21 +00:00
Phil Barber
18c054dd42 Add and wire new Merman Hunter portrait, 
...update changelogs, portrait credits.
 2009-08-27 18:14:22 +00:00
Richard Kettering
c2346936a7 Changed text references on netcaster line to reflect new usage of clubs, 
...changed descriptions to account for this.
 2009-08-26 02:11:24 +00:00
Phil Barber
5ff1d54740 Add and wire new Merman Triton portrait, update changelogs, portrait credits. 2009-07-30 10:26:44 +00:00
Phil Barber
2b212f4727 Add and wire new Merman Hoplite portrait, update changelogs, portrait credits. 2009-07-28 19:52:56 +00:00
Phil Barber
eac818f0fe Add and wire new Merman Fighter/Warrior portrait, 
...update changelogs, portrait credits.
 2009-07-25 11:31:45 +00:00
Phil Barber
828b3d0412 Add and wire new Mermaid Priestess/Diviner portrait, 
...update changelogs, portrait credits.
 2009-07-23 16:54:35 +00:00
Phil Barber
a0008634b1 Add and wire new Mermaid Enchantress/Siren portrait, 
...update changelogs, portrait credits.
 2009-07-23 16:51:03 +00:00
Justin DiSabatino
28ec4c0852 Changed weapon descriptions and images... 
...to reflect actual weapon used by the units.
 2009-07-14 13:18:41 +00:00
Ali El Gariani
c0b0b9ba8d Remove the now useless 'in_hex' key from mainline units 2009-03-26 01:10:08 +00:00