upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-17 21:17:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,507 Commits 52 Branches 374 Tags
Commit Graph

5114 Commits

Author SHA1 Message Date
Charles Dang
0e5eb5067e Revert "Swapped the first watch and second watch ToD graphics" 
[ci skip]

This reverts commit 11ca2d8ad833d5258b6fa09acd9bf1e5313c4bd8.

(cherry-picked from commit 0aa60a7b4cc3492f9d84c765f6218f00aee8830e)
 2018-10-07 03:22:57 +00:00
Charles Dang
2420e61d14 Swapped the first watch and second watch ToD graphics 
[ci skip]

See #1905.

(cherry-picked from commit 11ca2d8ad833d5258b6fa09acd9bf1e5313c4bd8)
 2018-10-07 03:22:55 +00:00
Iris Morelle
4712fe1cc6 Fix several typographical style errors in recent race descriptions 
[ci skip]

(cherry-picked from commit 61e94c21a9d2a7e6b195f245361900329a624af8)
 2018-10-07 03:22:44 +00:00
Steve Cotton
1aa974a250 Prose: the Storm Trident's description uses "merfolk" (issue #2936) 
Also update Dead Water's copy of it to use race= instead of a
list of unit types (as done for the core object in 613dd431).

(cherry-picked from commit ad7bc19dd98990b443bd5037952ff612dce502af)
 2018-10-07 03:22:37 +00:00
Steve Cotton
49d53795a6 Update core/about.cfg to use "merfolk" instead of "mermen" (part of #2940) 
(cherry-picked from commit fbc74bf007258436a65926bf3e3edf9f7aa143f3)
 2018-10-07 03:22:33 +00:00
doofus-01
ff4821841a peasant attack animations 
(cherry-picked from commit 3f3e13c0b4375a7cf8df8ee6931c0a850b950863)
 2018-10-07 03:22:32 +00:00
doofus-01
037f515e41 change ruffian attack anim timings 
(cherry-picked from commit c398a8fa8651411c6d0b9742464c063cd0534a86)
 2018-10-07 03:22:32 +00:00
Charles Dang
90cc4569a7 Shuffled a few credits entries around 
[ci skip]

(cherry-picked from commit c8fc88454bddbfb03b7da9f9007dcb442cc27485)
 2018-10-07 03:22:27 +00:00
ln-zookeeper
2373407bd2 Restructured WC/Soulless bat variation defense animation (fixes #3215) 
There were two overlapping problems: 1) the branching was written incorrectly (due to combining top-level and [if] filters) and 2) the first [defend] tag getting merged with the base WC/Soulless defense animation.

(cherry-picked from commit 131868581d1bb22c2d5612e223657951489e6c1d)
 2018-10-07 03:22:22 +00:00
Severin Glöckner
2305281666 remove a duplicated space in a translatable string 
...thiugh, in this case it has no effect.

[ci skip]

(cherry-picked from commit 4b7a6a98eccc07fd762ec29bcf1cd1ea84636992)
 2018-10-07 03:22:13 +00:00
Pentarctagon
7dec6296b5 Fixup goblin description. 
Somehow missed removing the part about the failing bloodline.

(cherry-picked from commit 9242a5ffd0db9a6bdeb65c498a7e3db852d60f21)
 2018-10-07 03:22:04 +00:00
Pentarctagon
7cd78a6b12 Updated goblin spearman description. 
See: https://forums.wesnoth.org/viewtopic.php?f=32&t=48137&start=60#p628424 and related posts.

(cherry-picked from commit 0b7ca63a86157b8d6a82c1d59858bdd1713685f4)
 2018-10-07 03:22:03 +00:00
Pentarctagon
56db59e1dc Add a couple missing things from the PR that added the units. 
Added the elemental trait to the Jinn. Added the undead_variation key to the Jinn, Wyvern Rider, and Wild Wyvern.

(cherry-picked from commit d913aafc534ccaeb239cc910bd963893e313fdcf)
 2018-10-07 03:22:03 +00:00
Iris Morelle
8f0cb83d8c Fix broken TC in a north-facing standing animation frame for the Revenant 
[ci skip]

(cherry-picked from commit df782f5401f2f1fc8b6b80d30a03604ff4a1caad)
 2018-10-07 03:21:36 +00:00
Severin Glöckner
13e16b473f name generators: update translation hint 
[ci skip]

(cherry-picked from commit 69f17c775d0fc73207f24cdac8db565c71b11ef2)
 2018-10-07 03:21:32 +00:00
Iris Morelle
8c369ed799 Remove door terrains that were supposed to be removed by 1.14 
If someone was using these despite being hidden and everything they were
really asking to get shot in the foot at some point.

(cherry-picked from commit 6eddc6f978b0c3196bdba67b811459eaabbcaac6)
 2018-10-07 03:21:31 +00:00
Pentarctagon
954b31de86 Fixup: Vyncyn was already listed in the credits. 
(cherry-picked from commit d02e16d7120a3df26b87ec586bbb6bc5519dcf2a)
 2018-10-07 03:21:28 +00:00
Pentarctagon
96b323657f Add new units as discussed on the forums. 
See https://forums.wesnoth.org/viewtopic.php?f=32&t=47721&start=450#p625660

All images but the young roc/roc would remain under the GPL, since Kwandulin based them on images by Sleepwalker and I wasn't able to contact him about using the CC BY-SA for them.  The young roc base and attack sprites are under the CC BY-SA, and are by Vyncyn(forum username).

(cherry-picked from commit 16bfab0b0a9a0d95c3c66d2adb3ab6b535ec2799)
 2018-10-07 03:21:26 +00:00
Nils Kneuper
a6d7835228 updated Chinese (Simplified) translation 
(cherry-picked from commit 71a6488419f1e19226f49eaa83e64f7b880157da)
 2018-10-07 03:21:23 +00:00
Nils Kneuper
c4531723f0 updated Italian translation 
(cherry-picked from commit 63bac52b71ed04ffd124a940a680e82dad261b12)
 2018-10-07 03:21:21 +00:00
Wedge009
90f9fb9ea5 Revert "Revert "'moreso' isn't a word in any dialect of English."" 
This reverts commit 4d5a3de4e63ebaac4a853b0f724d1d342d451dd0.

Restoring correction at @Vultraz's request.

[ci skip]

(cherry-picked from commit e161d59536452ca78897d92cb2eaae2099228075)
 2018-10-07 03:21:17 +00:00
ln-zookeeper
ece2a6092f Fixed a remaining glitch with off-map<->water transitions 
(cherry-picked from commit 9c65035075928f7b10d24ff8534873ca4815759b)
 2018-10-07 03:21:04 +00:00
Nils Kneuper
d97b0c2e31 remove executable flag from italian translation images 
(cherry-picked from commit f9b9d5018f5b15451bd5a8761d6849a6500fed56)
 2018-10-07 03:21:00 +00:00
Nils Kneuper
cbfb9dfaba updated Italian translation (images) 
(cherry-picked from commit 4918a6234e208d60817e49571c72dcefaaabba9e)
 2018-10-07 03:20:59 +00:00
Severin Glöckner
df4ee4005e Change Death Knights axe icon to fitting axe 
[ci skip]

(cherry-picked from commit 1d288355b006dfafe13a902fb5810357fabc3a42)
 2018-10-07 03:20:55 +00:00
Iris Morelle
eb6ee82ae3 Update own credits entries 
[ci skip]

(cherry-picked from commit c92b9de1dbda38bff6a8522bfef6a42d78380462)
 2018-10-07 03:20:41 +00:00
sigurdfdragon
86fbc68bd6 Help: Add wolves race description 
From https://forums.wesnoth.org/viewtopic.php?f=32&t=43721&start=75#p597028

[ci skip]

(cherry-picked from commit a67e068178c8acd3d3c40fd2ef5f63ed04dfb87d)
 2018-10-07 03:20:35 +00:00
sigurdfdragon
179135ee40 Help: Add falcons race description 
From https://forums.wesnoth.org/viewtopic.php?f=32&t=43721&p=593757#p593757

[ci skip]

(cherry-picked from commit e9ab1ce8d1718fbaf999b1a82ce09526da70bf31)
 2018-10-07 03:20:35 +00:00
Wedge009
8516e1f1e7 Update text to match game-play changes (fixes #2950). 
[ci skip]

(cherry-picked from commit d85e2a2886e1652749376e37c94e404d4b5ace98)
 2018-10-07 03:20:34 +00:00
Wedge009
0b98ddd96b Update text to match changes in dialogues (fixes #2882). 
[ci skip]

(cherry-picked from commit f1bcdc7f1b6e9c762edd075642954f4850d151f3)
 2018-10-07 03:20:34 +00:00
Celtic Minstrel
e7bb558479 Update credits 
* Add @neoedmund, @fujimo-t, and Zoomo
* Add @singalen's alias
* Correct @GregoryLundberg's alias

(cherry-picked from commit ebf38661322ea759acf47360b5dce006c105fa68)
 2018-10-07 03:20:27 +00:00
Charles Dang
129218b03a Added trailers credits section 
[ci skip]

(cherry-picked from commit 7d3d9daf0ce484a15d732e103d211b96bb98e28e)
 2018-10-07 03:20:06 +00:00
Charles Dang
71a4e2b06f Skeletal Dragon: discarded colored background full-alpha pixels I noticed 
[ci skip]

(cherry-picked from commit 09f72376318f258fc6169edc94552d0531e581fb)
 2018-10-07 03:20:03 +00:00
Iris Morelle
85bf47990a Revert "'moreso' isn't a word in any dialect of English." 
This reverts commit fb866c6d1310d8398f0f481a8ab16b1606286cdd.

This fix is specific to master and translators aren't supposed to be
touching master at this time. There is no point to its existence.

(cherry-picked from commit 4d5a3de4e63ebaac4a853b0f724d1d342d451dd0)
 2018-10-07 03:19:47 +00:00
Nils Kneuper
bc641501a9 updated Japanese translation 
(cherry-picked from commit b0f76a7d4dd40f074198b6a1a9153dab5a62993c)
 2018-10-07 03:19:42 +00:00
Iris Morelle
2d7f6cd4c7 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]

(cherry-picked from commit 14ec9954f1c322d47d172e2e2572f2ece308d047)
 2018-10-07 03:19:39 +00:00
Iris Morelle
60c356112c Change the plural race name for merfolk to Merfolk 
See issue #2940.

[ci skip]

(cherry-picked from commit 296894c5155ca6c2e77bfa92dee65a98e6797318)
 2018-10-07 03:19:38 +00:00
Celtic Minstrel
60d9bc27ae Fix #2894 
(cherry-picked from commit 0f267d0ede3e8479e1e68a171e74b0cc420da51d)
 2018-10-07 03:19:17 +00:00
Nils Kneuper
ff283e85d0 updated Chinese (Simplified) translation 
(cherry-picked from commit fd4f36e3c93ea91fb020cff998f6bf7df97eee9d)
 2018-10-07 03:18:58 +00:00
Sofartin
46dea87342 Add new packager 
(cherry-picked from commit 769f102f2ec0438eec714cc2d541b5d46ac3113e)
 2018-10-07 03:18:58 +00:00
Wedge009
e1506f86bd 'moreso' isn't a word in any dialect of English. 
[ci skip]

(cherry-picked from commit fb866c6d1310d8398f0f481a8ab16b1606286cdd)
 2018-10-07 03:18:35 +00:00
Victor Sergienko
fd480bbd17 Credits for Chinese translation of iOS announcements 
(cherry-picked from commit 004d7b541b19cdb29c9be3b8dae80c65be7f4d48)
 2018-10-07 03:18:34 +00:00
Nils Kneuper
4e653eba66 updated Chinese (Simplified) translation 
(cherry-picked from commit 40d63a4a25f30bf5544348a57642d8939e780964)
 2018-10-07 03:18:32 +00:00
Iris Morelle
b132db1602 Update credits 
[ci skip]

(cherry-picked from commit 3c6bb665c6bd6686eeee2711534ee52fcd65ce5a)
 2018-10-07 03:18:14 +00:00
pentarctagon
55ec77b7c4 Add the updated Dunefolk race description. 
See: https://forums.wesnoth.org/viewtopic.php?f=32&t=47721&start=375#p624668
[ci skip]

(cherry-picked from commit 3b5cbc3e3c5e7529412ba38e64145b9303474da3)
 2018-10-07 03:18:07 +00:00
pentarctagon
0c69e40d52 Remove deprecated Khalifate references. 
(cherry-picked from commit 994e6efa796681e0952d4aeb623adcf3cf75d1ef)
 2018-10-07 03:18:07 +00:00
Celtic Minstrel
7fcc813438 One more dunefolk tweak 
Revert the change to Marauder blade resistance and instead raise Raider blade resistance
 2018-03-17 18:52:31 -04:00
Celtic Minstrel
4b08a40181 Deprecate wesnoth.set_music 2018-03-17 16:48:02 -04:00
Celtic Minstrel
23aac4f72f Cleanup of fef953a48e258e5b07ff4559eeff5571103d58c1 
- Fix the rabbit AI
- Enable invoke_synced_command to also call (some) built-in commands
  and give an error message in the case of an unknown command
- Remove some unnecessary implementation details
 2018-03-17 16:48:00 -04:00
Celtic Minstrel
5c3f04518d Attempt to address RIPLIB violations in Raider -> Marauder advancement 
- Grant Marauder the mountain movement+defense of the Raider
- Reduce Raider hills defense to match the Marauder
  (avoiding reduction on level-up)
- Adjust Marauder resistances
 2018-03-17 14:27:29 -04:00