upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-19 16:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,394 Commits 52 Branches 374 Tags
Commit Graph

75394 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Dang
c1774005a9 GUI2/Tree View Node: used std::make_shared when possible 
Child nodes were still managed with unique_ptrs in 1.14, so we couldn't use make_unique
there. Child nodes are now managed with shared_ptrs here on master.
 2019-10-19 17:52:11 +11:00
nemaara
36b4b24a8f DiD S5: increase player castle size 2019-10-19 02:11:17 -04:00
nemaara
86fbd9c724 DiD S5: rename scenario 2019-10-19 01:30:12 -04:00
nemaara
0eaaa1f990 DiD S4: rename scenario 2019-10-19 01:30:00 -04:00
josteph
7f96d1f288 units: Add custom [special_note]s. 2019-10-19 02:56:43 +00:00
Celtic Minstrel
f8c7455928
Fix schema rejecting top-level color range/palette tags (#4487) 2019-10-18 22:18:17 -04:00
nemaara
5800acd8ea
Merge pull request #4476 from newfrenchy83/newfrenchy83_replace_deprecated_special 
Upgrade special=* uses in master
 2019-10-18 21:46:17 -04:00
Charles Dang
0e85ea8619 Disable labeler for now since it doesn't work with PRs opened from forks 
See https://github.com/actions/labeler/issues/12#issuecomment-525762657 for more info.
 2019-10-19 11:46:24 +11:00
mattsc
ba3c26bafd Update changelog with Experimental AI changes 2019-10-18 17:42:05 -07:00
nemaara
fc45f304ea Add DiD update to changelog 2019-10-18 20:22:18 -04:00
nemaara
34ef2281b2 DiD: set colors for each faction 2019-10-18 20:20:18 -04:00
Charles Dang
49f4656c08 Don't write needs_select to menu item config unless true 2019-10-19 10:15:13 +11:00
Steve Cotton
14284e88c3 Editor help: remove whitespace from ends of strings 
Note: this does not include a fix for #4484, that a double-quote in a _<< >>
delimited string causes a broken msgid. Wondering whether to remove that from
this text, but would prefer to add the feature to wmlxgettext.

Follows the comments in #4480, about how to handle whitespace at the beginning
and end of translatable strings.

This is text that was added after the last pot-update, so updating it
again now will hopefully be before the translators start on it. Some
text that was split into paragraphs is now combined in to one block,
other parts are still split but with non-translatable whitespace; the splits
will hopefully separate the scenario editor parts which are going to change
again before 1.16.0.

The wmlindent override is because the logic for multiline strings isn't working
for << >> delimited strings.
 2019-10-18 10:22:58 +02:00
Charles Dang
baec45fc53 Fixed turn display at ridiculously tiny res 
[ci skip]
 2019-10-18 15:30:21 +11:00
Charles Dang
cb35e6885f Ensure enough space to display turn numbers in the hundreds 
[ci skip]
 2019-10-18 15:30:18 +11:00
josteph
20df39ddc3 Add #2907 to changelog 2019-10-18 02:50:24 +00:00
Iris Morelle
36d834a564 Fix missing whitespace in log message 2019-10-17 23:49:05 -03:00
josteph
9e7988aa11 Help: Show abilities and ability upgrades separately 
Fixes #2907
 2019-10-18 02:48:22 +00:00
josteph
bac76864cf Add two recent commits to changelog 2019-10-18 02:06:33 +00:00
josteph
f973919fdc sidebar: Show number of attacks left when a unit has max_attacks > 1. (#2667) 2019-10-18 02:01:10 +00:00
josteph
e285a2c530 Silver Mage: Convert special note to new syntax 
See #4480 for the leading space.
 2019-10-18 00:30:27 +00:00
josteph
c8a993f6d9 Damage Calculations: Consistently use "resistance" and "vulnerability" for >100% and <100% 
Fixes #2002
 2019-10-17 23:39:29 +00:00
mattsc
bdf5421fd5
Merge pull request #4437 from mattsc/expai_recuit_higher_levels 
Experimental AI: make AI recruit higher level units
 2019-10-17 07:09:53 -07:00
josteph
ce4901e92c saves: Add a po comment to the string "replay". 2019-10-17 03:23:51 +00:00
newfrenchy83
409b5360b1
replace deprecated special 2019-10-16 18:00:20 +02:00
newfrenchy83
d9481207d5
replace deprecated special= in master 2019-10-16 17:55:20 +02:00
Steve Cotton
384079a16a Contributing.md: Mention UTF-8 and remove the Tolken references 2019-10-16 12:44:23 +02:00
Wedge009
027404491b Display translated string for "random" in MP staging 
Resolves #2954
 2019-10-16 18:38:00 +11:00
josteph
e8fa34c2ec fixup! editor: Translate recruit list in tooltip (#3303) 2019-10-16 07:31:33 +00:00
josteph
c4c4543fe4 editor: Translate recruit list in tooltip (#3303) 2019-10-16 07:30:01 +00:00
josteph
9f08efe852 editor: Fix some strings being untranslated (#3303) 2019-10-16 07:11:13 +00:00
Steve Cotton
6f032f7c1d Make a unit respond to mouse-clicks after end_unit_turn (fixes #4466) 
This was an edge-case when the player had only one unit.
 2019-10-16 08:51:13 +02:00
Wedge009
52d117a28b Revert "Mark random leader label for translation." 
This reverts commit 942a1d3d6df529267770c13c4e882f438e2dbcf7.

Resolves #4472.
 2019-10-16 17:48:20 +11:00
nemaara
d77fc0ac13 TSG S6a: move Deoran's dialogue to event end 2019-10-16 01:49:46 -04:00
josteph
416c0f2734 Editor: Fix palette size 
Issue #2618.
 2019-10-16 05:11:13 +00:00
nemaara
1f4e185481 TSG S6a: remove Grek's ability to recruit and use loyal overlay for Hylas and Gerrick 2019-10-16 00:32:25 -04:00
nemaara
2b38b6f98b TSG S7b: use loyal overlay for Afalas 2019-10-16 00:31:51 -04:00
Wedge009
fdf1785bf5 Rename set_default_zoom to toggle_default_zoom. 
* It's not a set function in the normal sense so the old name was confusing.
 2019-10-16 15:27:49 +11:00
Wedge009
a22e4a37ba Updating comments. 
[ci skip]
 2019-10-16 15:27:49 +11:00
Wedge009
8e5df3948c Correct inconsistent comment. 
[ci skip]
 2019-10-16 15:27:49 +11:00
Wedge009
cbf3d4f866 Use zoom_index_ as the basis of zoom operations instead of zoom_. 2019-10-16 15:27:49 +11:00
Wedge009
30f360825d Make zoom validation a local function instead of private member and update comments. 2019-10-16 15:27:49 +11:00
Wedge009
8018554342 Update change log. 
[ci skip]
 2019-10-16 15:27:49 +11:00
Wedge009
798bae668c Add zoom options to context menu. 
Resolves #1213

(Alternatively could go in main menu (from the top-bar) but I feel it's crowded enough already (unless we have nested menus available).)
 2019-10-16 15:27:49 +11:00
Wedge009
b926ff5e4c Validate zoom level upon initialisation as well as in setting. 2019-10-16 15:27:49 +11:00
Wedge009
9bb7670b6e Remember tile_size/zoom factor between play sessions. 
Resolves #1518.
 2019-10-16 15:27:49 +11:00
josteph
8caf887088 lua: Make unit.__tostring report units on recall lists 2019-10-16 04:13:30 +00:00
josteph
a67b9d07ed lua: Add __tostring to units 
Makes it easier to test SUFs with wesnoth.get_units{} in the lua console.
 2019-10-16 04:13:30 +00:00
Wedge009
942a1d3d6d Mark random leader label for translation. 
Resolves #2954.
 2019-10-16 14:56:37 +11:00
josteph
70a2046f8f Add #4444 to changelog 2019-10-16 03:52:17 +00:00