upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-27 04:07:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,010 Commits 56 Branches 373 Tags
Commit Graph

73010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
josteph
392d75c9a1 Fix VC14 project files 
Reported by @newfrenchy83
 2018-10-14 19:28:49 +00:00
josteph
e77bb3451d Fix "unknown pragma" warnings on gcc. 2018-10-14 19:19:57 +00:00
josteph
0f129f2d10 Units: Add is_visible_to_team() overload and use it to improve the previous commit. 2018-10-14 17:56:49 +00:00
josteph
180971da2b Unit Display: When a unit teleports, don't scroll to the source or destination hex if the unit is invisible there. 2018-10-14 17:55:33 +00:00
josteph
6cf9d04de5 Update branch name: master -> development 
Based on:
ba68d52aa135fff6d279e1486a70b6a1952fefa7
ef8fc9df939f8875d8c69ef41619c40a1287a352
ae332bf8b1a810ce255ee5207008f564371254ed
in the 1.14 branch.
 2018-10-14 16:36:26 +00:00
Iris Morelle
9c2bdf7ada wesnothd/fuh: Do not consider stale temporary bans from phpBB's banlist table 
It turns out that as of phpBB 3.2.2 these are only cleared on the next
call to user_ban()/user_unban(), so they may linger around for long
after they've expired. Fixed this by making FUH aware of the existence
of the ban_end column.
 2018-10-14 12:11:20 +03:00
Charles Dang
9e4210c6ce Sync changelog with 1.14 
[ci skip]
 2018-10-14 12:11:20 +03:00
Nils Kneuper
d371d57561 updated French translation 2018-10-14 12:11:20 +03:00
ln-zookeeper
71c6cdaa53 Updated Kwandulin's credits 2018-10-14 12:11:20 +03:00
Jyrki Vesterinen
1fd668bb1e Add @JGelfand to credits 2018-10-14 12:11:20 +03:00
Joseph Gelfand
80f4bd839f Made Blitting more permissive (#3584) 
Made Blitting more permissive

SDL_BlitSurface's documentation (https://wiki.libsdl.org/SDL_BlitSurface) notes that "Blits with negative dstrect coordinates will be clipped properly".

Looking at the source code for SDL_UpperBlit() convinced me that dstrect coordinates that were too big would also be handled appropriately.

Fixes #2225.
 2018-10-14 12:11:20 +03:00
Nils Kneuper
b854057054 updated Chinese (Traditional) translation 2018-10-14 12:11:19 +03:00
Severin Glöckner
a1adce8ca3 manpage: add missing options 
fixes #3537

[ci skip]
 2018-10-14 12:11:19 +03:00
Elvish_Hunter
2addd69a34 wmllint: fixed a bug that caused misfires in translation mark warnings 
wmllint was checking for line instead of lines[i]
 2018-10-14 12:11:19 +03:00
Elvish_Hunter
fd26be92e0 wmllint: fixed non-empty tagstack errors due to [modify_ai] paths 2018-10-14 12:11:19 +03:00
Elvish_Hunter
fe26f513b8 wmllint: add translation mark only after the first equal sign 
Fixes #3489
 2018-10-14 12:11:19 +03:00
sigurdfdragon
196764ffe8 DM S08: Cleanup & improve ending sequence, fixing #3575 
Removes final black screen that could be mistaken for a bug.
Shows Delfador disappearing in front of the orcs more clearly.

[ci skip]

(cherry-picked from commit 75ab69d885163dd4bb40259cf91123394e2c12ee)
 2018-10-07 03:25:23 +00:00
newfrenchy83
da95fedcad Update Code::Blocks project (#3585) 
(cherry-picked from commit 248af054c70f7e924b6caf24b95d7ff0617f5a12)
 2018-10-07 03:25:23 +00:00
josteph
97d1fcd3bc manpage: Fix option name typos and update documentation of --render-image. 
(cherry-picked from commit ae4ef058ed28981eb29d79eb6f6586ef6dcc75a1)
 2018-10-07 03:25:22 +00:00
jostephd
9f45e8ed1f Commandline: Fix documentation of --render-image 
(cherry-picked from commit c55b0c6adbd770345bd2e08f8e501b1e1b2e0de6)
 2018-10-07 03:25:22 +00:00
josteph
c54f4e6f19 Help: Hide abilities with empty names. 
Fixes empty name abilities in help in Liberty S1.

(cherry-picked from commit c88a799b90f7d92ed993d7cf1eca98cef31ba583)
 2018-10-07 03:25:22 +00:00
newfrenchy83
8086df2196 Update Code::Blocks project (#3566) 
(cherry-picked from commit e3957063093ef2cd055af803fa2943c011e57dcd)
 2018-10-07 03:25:22 +00:00
josteph
50c85f4691 Unit Display: When the recruiting or recruited units is invisible, don't scroll to it. 
When the enemy leader and the unit it recruits are both invisible,
scrolling to them would leak their location to the player.

(cherry-picked from commit 4db974431dfdc2c5fc75a97536cc4edc24163404)
 2018-10-07 03:25:21 +00:00
josteph
9514298858 MP Create Game: Increase slider step size 
Requested on the forums https://forums.wesnoth.org/viewtopic.php?t=48680

(cherry-picked from commit 9abdc20841ac12db3bb8cf9338a7f7b4b205bb41)
 2018-10-07 03:25:21 +00:00
Jyrki Vesterinen
d8869b8d2b Fix: Chance to hit wasn't protected from becoming negative 
Manual merge of pull request #3550. Credit to @newfrenchy83.

(cherry-picked from commit 79206d92d5390d82a9a79cd6018b575de3aafea0)
 2018-10-07 03:25:21 +00:00
Jyrki Vesterinen
f55e11e733 Fix #3567: error when trying to send an error message to the client 
Simple_wml requires double quotes to be duplicated like this.

(cherry-picked from commit 9536f3825e867d30b7adc71d6b53bd2230c31cab)
 2018-10-07 03:25:21 +00:00
jostephd
e766cdc7cc WML: Support [filter_side] in [item]. (#3533) 
* WML: Support [filter_side] in [item].

If [filter_side] is present then "team_name" is ignored.

Fixes #1477.

* WML: Compare [item]team_name to [side]team_name using intersection.

Fixes problems with substrings and when one or the other is a
comma-separated list. See #3533

* WML: Rename [item][filter_side] to [item][filter_team]

* Add changelog entry

(cherry-picked from commit 3a3b752881f50ad34742c5962d40d96556adf1a1)
 2018-10-07 03:25:20 +00:00
josteph
d5238ac5cb Commandline: --campaign-skip-story skips [message]s during prestart and start events 
(cherry-picked from commit b64f4b42d659d90ec33fd0cfc139e0a058b52f04)
 2018-10-07 03:25:20 +00:00
josteph
a8bded63ad Commandline: Encapsulate skip_story in play_controller 
(cherry-picked from commit 1d1d26035091108e33ea8af57754ba520ec27d35)
 2018-10-07 03:25:20 +00:00
josteph
d443df9be1 Commandline: Add --campaign-skip-story option 
Fixes #3472

(cherry-picked from commit f7be872da24474a47894becd7c6d5f013c495a2f)
 2018-10-07 03:25:19 +00:00
Nils Kneuper
20539018f7 updated Spanish translation 
(cherry-picked from commit 639c5087b9cc44fd426685f4d3e5e2e6b839553a)
 2018-10-07 03:25:19 +00:00
Nils Kneuper
ea3ba4ac34 updated Italian translation 
(cherry-picked from commit 9acb15674f62e437d3f663d4fe3e6f793ea00965)
 2018-10-07 03:25:18 +00:00
V N
20177dbe5e prevent double execution of on_event.lua 
makes it safe to dofile("on_event.lua")

(cherry-picked from commit 6010ffe98ee2dd4450ec8fa42e89d6e0557c8dad)
 2018-10-07 03:25:18 +00:00
Iris Morelle
7e4d12e10d pofix: 1.14 announcement rules for 1.14.5 
[ci skip]

(cherry-picked from commit 2ea2a4da4968ffc274757271ebe006a795cae955)
 2018-10-07 03:25:18 +00:00
Iris Morelle
c3446eba22 Multiple fixes to the changelog to make it look good on Steam 
[ci skip]

(cherry-picked from commit 7bb419abbf76ca2b88fd3fee4b66a5152732133e)
 2018-10-07 03:25:17 +00:00
Iris Morelle
daf40f637c Fix changelog indentation 
[ci skip]

(cherry-picked from commit a38466d0b50326ba3d5027f7253096340580848e)
 2018-10-07 03:25:17 +00:00
Severin Glöckner
72e3e495ed THoT: replace [filter_wml] 
[ci skip]

(cherry-picked from commit b8d8be3436dc415a5f8ad924599bfa67bbd51743)
 2018-10-07 03:25:17 +00:00
Severin Glöckner
4c6de5988d fixup 
[ci skip]

(cherry-picked from commit e5b4fcdfd35804390d5e5ae760055219e5d214bd)
 2018-10-07 03:25:16 +00:00
Severin Glöckner
7b36ccc823 THoT: add potential workaround for #3547 
It's anyway a good idea to change this code.

[ci skip]

(cherry-picked from commit 56111818e972332391d520ad900cccfdb4a23ec0)
 2018-10-07 03:25:16 +00:00
Andras Szell
c4f8f759e0 Tutorial S1: display an undo message if impossible to reach next target 
Fixes #3039

Until the elves attack the quintain it is not allowed to end turns
before completing the given tasks. Display a message how to undo if
there is not enough MP remaining to reach the current destination or
an enemy by either unit.

[ci skip]

(cherry-picked from commit b16b7f032a6be74451016be3b3f3d69cd229de00)
 2018-10-07 03:25:16 +00:00
Jyrki Vesterinen
13f2adf0f3 Synchronized changelog with 1.14 
[ci skip]

(cherry-picked from commit 57709d4ae4845d43c512da292dc95de8f2fc2ea6)
 2018-10-07 03:25:16 +00:00
Nils Kneuper
3d556e0a30 updated Hungarian translation 
(cherry-picked from commit c1ffe4ce395e922f99099da99cbb1e41d602f78f)
 2018-10-07 03:25:15 +00:00
Severin Glöckner
f6f7572126 ANL: fix village gold being too low 
[ci skip]

(cherry-picked from commit 09f418bdd84838d0230e3d01779c4f567637ece2)
 2018-10-07 03:25:15 +00:00
josteph
19479d70bd Add const annotation to new function 
(cherry-picked from commit 9f58a8063561a1ce4897fa88c1982e68dece33bc)
 2018-10-07 03:25:14 +00:00
josteph
4b29bd7fa2 Reevaluate [show_if] conditions and delayed variable expansions before displaying objectives at start. 
Fixes #3544.

(cherry-picked from commit d99f5b8a7689ab939f76d47535d1ff0ce6d625cf)
 2018-10-07 03:25:14 +00:00
Nils Kneuper
a98e7af336 updated Japanese translation 
(cherry-picked from commit 389cd9a8315fbd4f1d8abbba04db23428dbd1819)
 2018-10-07 03:25:14 +00:00
Nils Kneuper
f6390ac2e5 updated Scottish Gaelic translation 
(cherry-picked from commit 7ac40296b1193d966d0135122769e5f913be7fb3)
 2018-10-07 03:25:13 +00:00
Nils Kneuper
2ccd30b7ed updated French translation 
(cherry-picked from commit 235a54a050d3d431b4c8c0896c1d474b5b2c0bca)
 2018-10-07 03:25:13 +00:00
Nils Kneuper
3f44f76e21 updated British English translation 
(cherry-picked from commit eadbb1e086ca8ffb18f02a310d4d7316c34b8e51)
 2018-10-07 03:25:12 +00:00
Nils Kneuper
ab1db38a37 updated Czech translation 
(cherry-picked from commit 918a812027f4d7e5219b71a46a795fc3bf1473fd)
 2018-10-07 03:25:12 +00:00