upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 10:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,946 Commits 60 Branches 374 Tags
Commit Graph

72946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gfgtdf
920b34a208 fix oos when undoing after ally chat 2 
for extra safety we add code to ensure undo=no for [speak] commands to the client aswell, this is not really needed as i just added a code that sets undo=yes to the server code, but it's an advantage to be able to safely connect to older servers aswell.

(cherry-picked from commit c685031d1c41d89897bbd380b50ef3e02984bcde)
 2018-10-07 03:24:11 +00:00
gfgtdf
96eb02aecc fix oos when undoing after ally chat 
previously the server would send [speak] commands that had no undo=no attributes so that the game would remove the speak command from the replay instead of the actual undoable action when undoing an action.

(cherry-picked from commit 02bed5c0335893542f5f3732ea013ab1ca705c55)
 2018-10-07 03:24:10 +00:00
gfgtdf
4c1f00e386 fix game crashing on 'reset replay' 
fixes #3439

(cherry-picked from commit 7bf37a1e64388304d583cdaa1fbba97fd61f9658)
 2018-10-07 03:24:10 +00:00
Elvish_Hunter
338d190563 wmllint: added [lua] to the allowed children of [if] 
(cherry-picked from commit b1ec52cab84a5a18bd1518449fec374f4be3492b)
 2018-10-07 03:24:10 +00:00
Elvish_Hunter
236ca25832 wmllint: don't even try to convert _info.cfg 
(cherry-picked from commit 6e696661fdc8710a4310d3a2fd7228e3f135e5ed)
 2018-10-07 03:24:10 +00:00
Elvish_Hunter
46f9d93c4c wmllint: do not warn about unknown IDs in [tunnel], except inside of [filter] 
(cherry-picked from commit 2d045f2a6a47c58b5bb1d77d3c836119e5978708)
 2018-10-07 03:24:09 +00:00
Elvish_Hunter
2b0bbd8280 wmllint: do not warn about unknown IDs in [remove_event] 
(cherry-picked from commit 2dda3280c1b3098aba146e2775e58577930d3e60)
 2018-10-07 03:24:09 +00:00
Elvish_Hunter
87999f68b4 wmllint: do not warn about unknown IDs in [aspect] 
(cherry-picked from commit 9b5c0dda5c819e5ac6a40a78241a36e022a84f75)
 2018-10-07 03:24:09 +00:00
Martin Hrubý (hrubymar10)
01d5998866 We no longer support OS X Lion - remove legacy code 
(cherry-picked from commit b6507cbbf2d01ae84130e5db2a08796f98f1235c)
 2018-10-07 03:24:09 +00:00
Martin Hrubý (hrubymar10)
377c9dd15e Update changelog 
(cherry-picked from commit 29c5d25e27253a19e236e6b8a0ba324e014a6cd8)
 2018-10-07 03:24:08 +00:00
Martin Hrubý
7e9b98b275 Rewrite macOS version detection (#3448) 
This new implementation works more reliably, avoids spawning subshells, and is faster.

(cherry-picked from commit 4282ee3fdc50223e62af2ad60b386b21b6fd690f)
 2018-10-07 03:24:08 +00:00
Martin Hrubý
bfbd5e342c Fix for #3444 (#3449) 
(cherry-picked from commit 7dcc0d46967d63e52e0ada0d1613498cb15d57cd)
 2018-10-07 03:24:08 +00:00
Severin Glöckner
27f6be9a37 use & to denote team setup in MP 
code it as & to avoid a pango warning in stderr
3ec26df changed it previously to '+' to work around that warning
also change it for the untranslatable strings in the credits
[ci skip]

(cherry-picked from commit cd5b3f785e137f66f9d282c8348a6ad877e48d2f)
 2018-10-07 03:24:07 +00:00
Martin Hrubý (hrubymar10)
aca247d57a Remove xcode version definition from travis leaving it fallback to default version 
(cherry-picked from commit 2226c4cd328d1fda4b4099ff77e67d1ba7a1df17)
 2018-10-07 03:24:07 +00:00
Martin Hrubý (hrubymar10)
ac30647efb Remove xcode version definition from travis leaving it fallback to default version 
(cherry-picked from commit 03be7cc5710f6752bb7bbb6f68e83bfa93a9c607)
 2018-10-07 03:24:07 +00:00
Martin Hrubý (hrubymar10)
b230c5973e Use standart fonts.conf in macOS packages 
(cherry-picked from commit 8114ec213f583cc4b753b46a35af91827c91986e)
 2018-10-07 03:24:07 +00:00
Martin Hrubý (hrubymar10)
c9e64a08e5 Remove old macOS specific fonts.conf 
(cherry-picked from commit 9bbb1771fa81f3bc02ef4421b3b90e5574d1fe10)
 2018-10-07 03:24:06 +00:00
Martin Hrubý (hrubymar10)
41b10b7d00 Fix macOS specific warning "Class SDLApplication is implemented in both ..." 
(cherry-picked from commit 4e6ffed7a581b6c861b46d18c37ea1341dd9cd66)
 2018-10-07 03:24:06 +00:00
Martin Hrubý (hrubymar10)
751976ca37 Fix indentation 
(cherry-picked from commit 19db23437a3ca20f15041bb9facf750ae34043e4)
 2018-10-07 03:24:06 +00:00
Martin Hrubý
b6d06b1929 Better macOS version report 
(cherry-picked from commit 0711e24d8e3765093afeb7c385f6247fb02e3353)
 2018-10-07 03:24:06 +00:00
Martin Hrubý
45c1f7a852 Fix localised Multiplayer causes preferences window use scrollbar #2855 
(cherry-picked from commit be0bd05ab0852770ac16e3e1516eb92b4a8d007d)
 2018-10-07 03:24:05 +00:00
Elvish_Hunter
ef51a288d8 wmllint: avoid inserting image=wesnoth-icon.png if there's already an image 
(cherry-picked from commit 3b8a6845514f9a95365d9f80d8960e4590cbbefb)
 2018-10-07 03:24:05 +00:00
Elvish_Hunter
8fe84b9815 wmllint: fixed 'unknown id' errors in [fire_event] referred to event IDs 
(cherry-picked from commit c08963a2e736a185ee338e30a560d5949233705f)
 2018-10-07 03:24:05 +00:00
Elvish_Hunter
4b81eb5081 wmllint: fixed a regex that didn't match augmentation tags 
(cherry-picked from commit cc178ad4742472397685a39e93074139225767f1)
 2018-10-07 03:24:04 +00:00
Elvish_Hunter
8b32f89a1f wmllint: added side_name to the list of translatable keys 
(cherry-picked from commit 8bea4198992d1c794688ef1dc97cc82a958a8004)
 2018-10-07 03:24:04 +00:00
Elvish_Hunter
0ccf6ae1ea Prevent wmllint from converting Dunefolk names similar to Khalifate units 
(cherry-picked from commit de99a381723dad41153917696e5468b5e0a99894)
 2018-10-07 03:24:04 +00:00
Elvish_Hunter
f25f1316cc wmllint: added a missing conversion rule for the Qatif-al-nar unit 
(cherry-picked from commit 3caf1283784b9533f601e6c0a7f91a112d7ae69c)
 2018-10-07 03:24:04 +00:00
Jyrki Vesterinen
25e9087304 Use localized chat room names (#2709) 
Turns out that a t_string doesn't automatically obtain the correct
translated value. Thus, I'll simply get it by calling
translation::dsgettext() directly. I also changed the translated string to
be used in the tab label as well.

(cherry-picked from commit 395eaf5251d50373d23bd8f53b7b254683a3dfed)
 2018-10-07 03:24:03 +00:00
Jyrki Vesterinen
a73662c9e9 Make chat room names localizable (#2709) 
(cherry-picked from commit 1eec7ef8d989357c09a5a2057095939b042e1212)
 2018-10-07 03:24:03 +00:00
Steve Cotton
ad7227a318 SoF S9: Rephrase the intro text (fixes #3405) (#3437) 
The original text that referred to Knalga was confusing if the
player thought of Knalga as "dwarvish territory", and most of
the campaign's scenarios have been somewhere in Knalga.

(cherry-picked from commit a6bd0c87ac9ee4066ddad2700182778a0658f4e2)
 2018-10-07 03:24:03 +00:00
Jyrki Vesterinen
cdd9a902a7 Fix #3436: pot-update failing 
(cherry-picked from commit 5bbc7fedca1a7ab19cfe05e3b92fb49973e29972)
 2018-10-07 03:24:03 +00:00
Nils Kneuper
9ee025ccc3 updated Chinese (Traditional) translation 
(cherry-picked from commit a3bb7b655fc3dadb5ce1b86fe3ae0ab7e327d94f)
 2018-10-07 03:24:02 +00:00
Konrad2
34108fb31e Updated credits for @Konrad22 (#3430) 
(cherry-picked from commit 37ddf43d3aaa1863eef5c1a33d41af2f6972c888)
 2018-10-07 03:24:02 +00:00
josteph
49bad2c725 Addon Manager: Unabbreviate "asc" and "desc". 
@jyrkive https://github.com/wesnoth/wesnoth/pull/3418#issuecomment-410433850

(cherry-picked from commit ef71d0efcbe0823d323627a13432b284e090821f)
 2018-10-07 03:24:01 +00:00
josteph
f12fbb853d Addon Manager: Don't use "ascending" and "descending" to describe how dates are sorted. 
(cherry-picked from commit 569e1d85a596a794096fafc65fdb7b4527ad1a5e)
 2018-10-07 03:24:01 +00:00
Jyrki Vesterinen
f6eac474c3 Help: update the "Installing Add-ons" page (addresses #2703) 
[ci skip]

(cherry-picked from commit fb5f46c52a6732997fc4e265536ab510d86b084f)
 2018-10-07 03:24:01 +00:00
Jyrki Vesterinen
81ea32e4d4 Help: document cores (#2703) 
[ci skip]

(cherry-picked from commit 40205c55fbce222701eece3168b9c5d0ba4add1c)
 2018-10-07 03:24:01 +00:00
Steve Cotton
e4f280977f SoF S4: Improved the reminder to recruit miners (#3422) (fixes #3394) 
Updated to [allow_undo], because the hint message shouldn't block undoing a
recall.  Recruiting can't be undone, even with [allow_undo], so this isn't
allowing a cheater's opportunity to recruit units with desired traits.

(cherry-picked from commit 66c56403db61acd1621d2b4d78e8f848c826540b)
 2018-10-07 03:24:00 +00:00
Celtic Minstrel
90a87b1341 Add new contributors since 1.14.0 to the credits 
Anyone who prefers to be credited some other way (or whose name I misspelled) can feel free to open another PR

@Byteron @rrigby @DisherProject @Ferk @Konrad22 @lilinitsy @UnwiseOwl @bandita137@Ordoviz

(cherry-picked from commit ff4e1b2e61ab99be12e1b36cbc954e3f66efa116)
 2018-10-07 03:24:00 +00:00
rrigby
45b9fe1e5b Add categories to appdata 
following https://standards.freedesktop.org/menu-spec/latest/apas02.html

(cherry-picked from commit 16e858263c86f579603d615db172aff732192ec0)
 2018-10-07 03:24:00 +00:00
josteph
01867f9a2c GUI: Fix check for no usable weapons. 
Fixes #3424.

(cherry-picked from commit f293c7cb3226bc7b28dbb968419ab54ff4e180da)
 2018-10-07 03:24:00 +00:00
Jyrki Vesterinen
87c87aee3e Fix: halo (if any) remains when wesnoth.put_recall_unit() is used 
Based on the suggested fix in #3425. Closes #3425.

(cherry-picked from commit 46bec21fa36c0ad0c2106ce25cccb6f28401abf1)
 2018-10-07 03:23:59 +00:00
sigurdfdragon
d37c6d693e NR: Ensure Krash doesn't overwrite other units and is properly placed. 
This could happen if a player has Krash and skipped S10a.

(cherry-picked from commit c6d2a0febc1f8ab7b9648d4319f6091c8675925a)
 2018-10-07 03:23:59 +00:00
joeylmaalouf
b82647a55d NR S7-8: avoid recreating the new companions from scratch 
(cherry-picked from commit 4befb3580d00ebc64709bd1e247571b193c9ae6b)
 2018-10-07 03:23:59 +00:00
joeylmaalouf
f49fded31d NR S7: give Stalrag traits for consistency 
(cherry-picked from commit 7c70c1d985eb5512ee32611213c326690f1ea3ec)
 2018-10-07 03:23:59 +00:00
Nils Kneuper
b1f36c6483 updated Italian translation 
(cherry-picked from commit 8fb7429ca81afe74494aa1f7c7b06d8e718a6c4c)
 2018-10-07 03:23:58 +00:00
Nils Kneuper
a9f7ac8a19 updated French translation 
(cherry-picked from commit bcce3fb4ccb7edef994e5adc30793790b727e1f4)
 2018-10-07 03:23:57 +00:00
Konrad2
780dded395 SoF S01: Added snowy mountains to right map edge (#3401) (fixes #3383) 
New map for SoF - Sc1 to fix #3383 (removing the fast way to reach the elvish leader, by replacing some regular mountains with snowy mountains).

(cherry-picked from commit 87eb901c105c1fdd405a1a7fddf7d81fdf545b94)
 2018-10-07 03:23:57 +00:00
josteph
4b4fdb391f debug: Give feedback for :droid. 
#2819

(cherry-picked from commit 55e41472130829d6b322a68c7556a126e93b70b3)
 2018-10-07 03:23:57 +00:00
josteph
eaea7d0b3b debug: Fix ":droid" always toggling droid on/off even when given two arguments (":droid <side> off"). 
(cherry-picked from commit 0f520ad8a6638a77ec6e56eb97ef001ae3adc324)
 2018-10-07 03:23:56 +00:00