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

73908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nemaara
58987918f1 DiD S2: modified gold values and tweaked dialogue 2019-02-26 23:48:53 -05:00
nemaara
d9bf494a7c DiD S2: updated dialogue 2019-01-30 21:47:49 -05:00
nemaara
b4689640b5 DiD S2: updated gameplay 2019-01-30 13:35:27 -05:00
nemaara
30b86607bd DiD S2: updated map 2019-01-30 13:35:27 -05:00
loonycyborg
e3b6d0c3cb Fix unused variable warning on mac 2019-01-30 13:58:27 +03:00
loonycyborg
061c2f0f6f Fix build on macos 2019-01-30 13:22:14 +03:00
loonycyborg
89856d6dcf Set keepalive timeout to 30s as per #3898 
Hopefully this will prevent NAT from forgetting idling clients
For now this is POSIX only and not configurable.
 2019-01-30 12:26:02 +03:00
nemaara
2fe3845da5
Merge pull request #3894 from nemaara/trow 
[TRoW] S22: cuttlefish animations use different facing filters
 2019-01-27 16:03:06 -05:00
Charles Dang
503230db20 Campaign Dialog: make filter box fill available horizontal space 
[ci skip]
 2019-01-27 23:44:24 +11:00
Charles Dang
59493fc523 NR S7a: wmllint run 
[ci skip]
 2019-01-27 23:44:23 +11:00
Vlad Drozdov
2303416fa5 Added the mutex for the ci_search function 2019-01-27 23:44:22 +11:00
Vlad Drozdov
9b0d036846 Campaign selection filter : сhanges for calling campaign_selected() function. 2019-01-27 23:44:22 +11:00
Vlad Drozdov
b5c48b1270 Campaign selection filter : сhanges for review. 2019-01-27 23:44:21 +11:00
Vlad Drozdov
a25a43e1ac Replace a search in filters by translation::ci_search 2019-01-27 23:44:20 +11:00
Vlad Drozdov
0f00da0995 Campaign selection filter : search by separate words and filter focuse by default 2019-01-27 23:44:19 +11:00
Vlad Drozdov
397b8e1f3b Campaign selection: Add search functionality 2019-01-27 23:44:19 +11:00
nemaara
a52e207ca1 Merge branch 'master' of https://github.com/wesnoth/wesnoth 2019-01-27 02:17:23 -05:00
nemaara
62d85c1ab5 TSG storytext: fixed typos 2019-01-27 02:16:37 -05:00
nemaara
108d9bb585 TSG S9a: fixed typos 2019-01-27 02:16:37 -05:00
nemaara
fa085665dc TSG S8b: punctuation fixes 2019-01-27 02:16:36 -05:00
nemaara
7b187653ae TSG S8a: typo fix 2019-01-27 02:16:35 -05:00
nemaara
17f335e2ab TSG S7a: punctuation fixes 2019-01-27 02:16:35 -05:00
nemaara
226f15f1b7 TSG S6b: dialogue fixes 2019-01-27 02:16:34 -05:00
nemaara
1c8e5c0a0c TSG S5: small dialogue fixes 2019-01-27 02:16:33 -05:00
nemaara
f55b93a8cf TSG S4: small dialogue fixes 2019-01-27 02:16:33 -05:00
nemaara
657d7cf447 TSG S3: typo fixes 2019-01-27 02:16:32 -05:00
nemaara
bc75ee97d5 TSG S2: typo fix 2019-01-27 02:16:31 -05:00
nemaara
b892decbfe TSG S1: typo fixes 2019-01-27 02:16:31 -05:00
Wedge009
0a877ec2fe Son of the Black-Eye: northlands -> Northlands 
See note for 1b2f468e. Everywhere else in the campaign appears to use the proper noun.

[ci skip]
 2019-01-27 17:14:26 +11:00
Wedge009
81e3fd95a0 Sceptre of Fire: northlands -> Northlands 
See note for 1b2f468e

[ci skip]
 2019-01-27 17:14:25 +11:00
Wedge009
0dbddeaa41 Northern Rebirth: northlands -> Northlands 
See note for 1b2f468e. Also, everywhere else in the campaign uses the proper noun.

[ci skip]
 2019-01-27 17:14:24 +11:00
Wedge009
f41f0f16fe Descent into Darkness: northlands -> Northlands 
See note for 1b2f468e

[ci skip]
 2019-01-27 17:14:24 +11:00
Wedge009
a56a02f835 Secrets of the Ancient: Right click -> Right-click 
Hyphenation consistency: everywhere else in the campaign it is hyphenated.

[ci skip]
 2019-01-27 17:14:23 +11:00
Wedge009
41fc583f8f Sceptre of Fire: northlands -> Northlands 
As I understand it, there's a specific region of Wesnoth lore called Northlands: https://wiki.wesnoth.org/Geography_of_wesnoth#Northlands
As such, this dialogue should be capitalised to avoid confusion with a generic 'north lands'.

Also corrected a typo in a comment.

[ci skip]
 2019-01-27 17:14:22 +11:00
Wedge009
9bf0e921dd Elvish Archer: pasttime -> pastime 
[ci skip]
 2019-01-27 17:14:21 +11:00
Wedge009
824cd2961c The South Guard: panolpy -> panoply 
[ci skip]
 2019-01-27 17:14:21 +11:00
Wedge009
d1bfa0a9b3 The South Guard: practicioners -> practitioners 
[ci skip]
 2019-01-27 17:14:20 +11:00
nemaara
b30a394689 TRoW S22: cuttlefish animations use different facing filters 2019-01-26 20:29:23 -05:00
nemaara
ef69f20e68
Merge pull request #3887 from nemaara/DW_S12 
[DW] S12 rebalance
 2019-01-26 18:58:59 -05:00
nemaara
c1608312d2 Updated changelog with DW rebalance 2019-01-26 18:12:54 -05:00
nemaara
50ce0f1543 DW S12: rebalanced ai gold 2019-01-26 18:10:18 -05:00
nemaara
6b1dff6d91 DW S12: fixed difficulty setting for spawns 2019-01-26 18:10:18 -05:00
nemaara
3909fb350b DW S12: rebalance ai gold values 2019-01-26 18:10:17 -05:00
nemaara
85a8616412 DW S12: rebalanced gameplay 2019-01-26 18:10:17 -05:00
nemaara
b5e5cbf082
Merge pull request #3886 from nemaara/trow 
[TRoW] Small bugfixes
 2019-01-26 16:53:45 -05:00
nemaara
f97c431ee7 Updated changelog with TRoW fixes 2019-01-26 15:36:34 -05:00
Iris Morelle
a6207f1642 Fix item names in the scenario editor not being localized 
data/core/editor/items.cfg defines the names for the items. The file is
included by data/core/editor/_main.cfg, which has a #textdomain binding
to wesnoth-editor at the top. The strings end up bound to that
textdomain by the game, but wmlxgettext doesn’t have any way to see this
so it binds them to the default textdomain instead, which is wesnoth,
not wesnoth-editor. The game ends up looking for the strings in
wesnoth-editor instead.

The easiest solution right now is to explicitly bind items.cfg to the
wesnoth textdomain so as to not require moving catalogue entries in the
po files around to wesnoth-editor. It really should've been
wesnoth-editor in the first place but it's too late to fix that now
without giving translators a migraine. It's a pity either way given how
useless the scenario editor is in practice.

[ci skip]
 2019-01-26 14:11:01 -03:00
Nils Kneuper
9623737672 updated Slovak translation 2019-01-26 11:43:41 +01:00
Nils Kneuper
2980c5a8ea updated British English translation 2019-01-26 11:42:12 +01:00
Wedge009
8c7b3a583b Move compiled serialisation objects into the dedicated directory for consistency. 
(Also tidy the filters.)

[ci skip]
 2019-01-24 12:22:09 +11:00