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

24569 Commits

Author SHA1 Message Date
Severin Glöckner
b1c8ef6f6a NR S2: flavor event: fix coordinates 
[ci skip]

(cherry-picked from commit 0ad223ab85b3e974dc8df39124052039d1224acc)
 2018-10-07 03:20:54 +00:00
Severin Glöckner
f2f46aeb51 Nr S2: edited map: 
* make north gate obvious to players
* mitigate bridges transition
* use less human castles
* don't break northern train line
* move the bridges in the Trolls keep farther behind, to be less
  vulnerabe to the northern leader

[ci skip]

(cherry-picked from commit 255e77115d46bea0054ca233e0b9d207bf26b349)
 2018-10-07 03:20:54 +00:00
Severin Glöckner
1553f82f87 NR S2: show message for northern border too 
[ci skip]

(cherry-picked from commit 401eba49e238fd4f42c0f2fc35a00966416f2143)
 2018-10-07 03:20:54 +00:00
Severin Glöckner
abecfd70ec NR S2: remove second endlevel event for hamels death 
This level has it's own event to handle this situation.

closes #3091
[ci skip]

(cherry-picked from commit 1f75c5b14d84bed7afe2944a7a4a0e169ba2b539)
 2018-10-07 03:20:51 +00:00
Severin Glöckner
6532cd45ba NR S2: refactor objectives 
[ci skip]

(cherry-picked from commit 52d8cef080bc8045351ee472e7047df2cc516dfa)
 2018-10-07 03:20:51 +00:00
Severin Glöckner
970f21a665 NR S2: Avoid Tallin talking to himself 
(part of #3086)
[ci skip]

(cherry-picked from commit 76134436fc05507a64a09a1fd3b91e166714f8d9)
 2018-10-07 03:20:50 +00:00
mattsc
5d8d6a94e1 Northern Rebirth S02_01: keep side 8 leader from wandering off too far 
If he ends up on the tiny keep in the south, he can only recruit one
unit per turn, which affects the intended balance of the scenario.
Fixes #3073

(cherry-picked from commit 9b9aa13a3dba40137d8d679fe42d2b679f631ef9)
 2018-10-07 03:20:49 +00:00
Severin Glöckner
ac0e940342 UtBS S1: change terrain code of the death tree hex 
Visually it has no effect since the embelishment is
covered by the tree image.
In the help it is now not only displayed as grass.

[ci skip]

(cherry-picked from commit 4873f1a41e791c021a916b6b96ef27ba605978ec)
 2018-10-07 03:20:49 +00:00
Severin Glöckner
106494fdc7 UtBS: add female variations for all ability names 
including the ones which do not require it,
to make it easier to reuse them

[ci skip]

(cherry-picked from commit 8ac1518884b9e512b3e4ea626f0f9866685344c8)
 2018-10-07 03:20:48 +00:00
Charles Dang
ebeda413c4 UtBS: wmlindent run 
[ci skip]

(cherry-picked from commit fd86d1ff8c916f00ad367eb3551402cfa955ee8b)
 2018-10-07 03:20:42 +00:00
Iris Morelle
a4f7f5c37c wam: Allow using embedded data URIs as add-on icons 
[ci skip]

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

(cherry-picked from commit c92b9de1dbda38bff6a8522bfef6a42d78380462)
 2018-10-07 03:20:41 +00:00
ln-zookeeper
4e25e4875f UtBS: Fixed a bug in the formation ability 
If a unit had for example 3 other formation units adjacent but only needed 1 to reach 70% defense, it didn't receive any benefit at all (as the corresponding [chance_to_hit] tag remained inactive).

Spotted and fix provided by beetlenaut.

(cherry-picked from commit 083066bff2ce0a875e6216cdd68519bd03aa2121)
 2018-10-07 03:20:40 +00:00
Charles Dang
e0653e7d54 Preferences Dialog: fixed inconsistent label sizes in hotkeys list 
(cherry-picked from commit 26c8860b6c122b9affeaca870d1c5a1f83ed5613)
 2018-10-07 03:20:36 +00:00
Charles Dang
7b4b14eb32 MP Lobby: bunch of small UI and text formatting tweaks 
(cherry-picked from commit 58ebc064e97382eef36aa90bf947cff8f72b6826)
 2018-10-07 03:20:36 +00:00
doofus-01
e40ffec90e [UtBS]-Graphics Update, mostly defense animations (#3035) 
* quenoth ranger defense anim

* youth leading animations

* Kaleh bolas anim

* quenoth flanker defense anim

* quenoth druid defense anim

* quenoth archer defense anim

(cherry-picked from commit 21708d8add8059b136645847a4c66c40991b718a)
 2018-10-07 03:20:36 +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
Charles Dang
650121a8de MP Lobby: removed Refresh button 
I'm not 100% sure about this change, but I think its presence was rather confusing and
it (hopefully) shouldn't ever be needed.

(cherry-picked from commit fe10bc0315472b49072a39cd577b9872617d81d3)
 2018-10-07 03:20:32 +00:00
Charles Dang
d90c6d9d34 * MP Method Selection: clarified the account requirement for the official server 
Also sets the tooltip type for this dialog back to bottom-of-the-screen ones instead
of floating ones. And some formatting cleanup to the C++.

(cherry-picked from commit 851b28e24bfefd068069aa9ac2eaada6593718b4)
 2018-10-07 03:20:28 +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
mattsc
8a7ec7a1cb AToTB Chase: add custom AI controlling Muff Toras 
(cherry-picked from commit bbb151fa713129cc9a1f4ef23c154da72c50ea6e)
 2018-10-07 03:20:27 +00:00
Charles Dang
a3a225592c UtBS: wmlindent pass 
[ci skip]

(cherry-picked from commit a8ce08fc231919e6f87277ac939beddd62eb0c9d)
 2018-10-07 03:20:27 +00:00
Celtic Minstrel
ebd2ea712a SotA: Avoid use of 'kids' to address Carcyn and Shynal 
This is intended to address concerns raised by @beetlenaut that the two are not young enough to be referred to as 'kids'.

(cherry-picked from commit acb48da5d2115b086f436279dccdef482c89401d)
 2018-10-07 03:20:22 +00:00
Charles Dang
9e2918d68e MP Lobby: base resolution selection on window width not height 
[ci skip]

Height isn't the problem. The default lobby can display fine even at 600 px h. Width is
the problem the default layout faces at low resolutions, and it was quite odd to have a
really wide window use the low resolution layout, despite there obviously being enough
horizontal space to fit the sidebar.

(cherry-picked from commit 2f565b8e90e9b49a49635034524eb79d29e5f80d)
 2018-10-07 03:20:21 +00:00
Charles Dang
5c66a97f3c MP Lobby: decreased size of scenario/era name label 
[ci skip]

Will slightly mitigate the issue of it potentially getting too long...

(cherry-picked from commit 08d0f6983fa6ac23d2335b8776d88715e5c073e2)
 2018-10-07 03:20:21 +00:00
Charles Dang
f464cd20c7 MP Lobby: shifted game info icon to the left 
[ci skip]

(cherry-picked from commit 0db17bbcf18ca3410ddfa162bb6d0ca656f97f80)
 2018-10-07 03:20:20 +00:00
Charles Dang
e9bc7c9586 MP Lobby: restored Era info to main game display 
Includes some slight spacing tweaks.

(cherry-picked from commit b17e9fa9b127110bf8b97a70d96e512ff64fdf2f)
 2018-10-07 03:20:20 +00:00
Charles Dang
74d5891ad0 MP Create Game: cap custom game names at 50 characters 
[ci skip]

(cherry-picked from commit d9e3983e976b7b3ace600a48e79342f5b80a05d5)
 2018-10-07 03:20:19 +00:00
ln-zookeeper
2dca2131b6 UtBS: Fixed some obsolete references to old elf units, weapons and hair 
In S03, also removed one extra instance of the word "champion" from the same string.

(cherry-picked from commit 195d5a93db6fbd13f7bc2d41266652fb89549ef8)
 2018-10-07 03:20:18 +00:00
ln-zookeeper
8575d8939b EI S11: Fixed units incorrectly costing upkeep after leveling up 
(cherry-picked from commit d217dfc13c7c763e5a4812a6b731cdbfca2c483d)
 2018-10-07 03:20:17 +00:00
Charles Dang
b0b150cb5a MP Lobby: improved low-resolution layout 
[ci skip]

* Removed unnecessary spacer line.
* Increased chat area height by 10% .

(cherry-picked from commit 195eb0ce73299489551e28024b6ae5f58a4d2025)
 2018-10-07 03:20:17 +00:00
Charles Dang
577fa7c0dd MP Lobby: removed individual Join/Observe buttons for each game 
(cherry-picked from commit ffe71c5157c2df1f857b3ea999efdd533a514ecc)
 2018-10-07 03:20:15 +00:00
doofus-01
3477893e49 fix TOD lighting for sleeping Kaleh, and make sure Zhul is facing the right way in opening scene 
(cherry-picked from commit f880f402543b0d2d2239f154cf2619b926cf4e1f)
 2018-10-07 03:20:11 +00:00
doofus-01
f0208e003b Bolas animations for Nym 
(cherry-picked from commit ee04db61ebacc2906d6b2def1836016e89d3a0f0)
 2018-10-07 03:20:11 +00:00
doofus-01
8b70014fc9 defense animations for shaman 
(cherry-picked from commit de25b879245860469c88a8f491862a1a26688a80)
 2018-10-07 03:20:11 +00:00
doofus-01
6965586d83 update to flanker and ranger base sprites 
(cherry-picked from commit ad8bc761442a0be43fd8547d19aa816c028a1462)
 2018-10-07 03:20:10 +00:00
doofus-01
ee8e82a402 quenoth shaman and druid sprites 
(cherry-picked from commit 6ceedb40534cf3bdbcbb5493fffc4404cdda94e5)
 2018-10-07 03:20:10 +00:00
doofus-01
ea410a39b7 edit first scenario to remove female gender specifications for units that have no such variation. 
(cherry-picked from commit 961bcb861df35d2464d546283bc08c5932b9409e)
 2018-10-07 03:20:10 +00:00
doofus-01
73839d2a1b smashed tree is no longer a terrain, just a scenario graphic 
(cherry-picked from commit faee9b7f3f939b3265cb1d99e0e12446b3b00986)
 2018-10-07 03:20:10 +00:00
doofus-01
25c37c82d1 adding smashed tree terrain for first scenario 
(cherry-picked from commit 23e6481389415f233af425d0a4b8ba94a82b82a0)
 2018-10-07 03:20:09 +00:00
doofus-01
17589d9647 dead elf image requested in issue #2962 
(cherry-picked from commit 2e62fc22ec9ff66ce5df6a9dfa4ece509e888c5f)
 2018-10-07 03:20:09 +00:00
doofus-01
1c42af658b adding minimal bow frames for quenoth youth Kaleh 
(cherry-picked from commit 966c2205c815593730bda11de26d6bebf060699b)
 2018-10-07 03:20:09 +00:00
doofus-01
671a27c793 minor orcish flag update 
(cherry-picked from commit 9fd0286a6506d1905a6a23b76831bcb9fd974364)
 2018-10-07 03:20:09 +00:00
galegosimpatico
5b5442b1af Bump program version. 
(cherry-picked from commit bbd83f17ed238616e9365a6ff5835021a63b32d2)
 2018-10-07 03:20:08 +00:00
Charles Dang
015b1891cf Ditch the "titlescreen" nomenclature for player-visible strings 
(cherry-picked from commit eacc1e0f6b1f0ef372a34f65be137c2f1f527aa6)
 2018-10-07 03:20:08 +00:00
Severin Glöckner
448353d2bd TRoW: readd leaderhip 
(as 1st ability)

[ci skip]

(cherry-picked from commit c8e3856f51fb45721e63ca4e44178526967c34a9)
 2018-10-07 03:20:07 +00:00
Severin Glöckner
2b189d331a TRoW: Remove leadership from Lvl. 1 Wesfolk leader 
as there are no Lvl. 0 units.

(cherry-picked from commit a96c9ac7aab3243846564e0ebf1f18978451ce3f)
 2018-10-07 03:20:07 +00:00