upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-20 13:38:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,353 Commits 52 Branches 374 Tags
Commit Graph

75353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
josteph
129e53b660 unit_recruit: Pass the error strings as t_string 2019-10-16 03:52:17 +00:00
josteph
69f7ba660c unit_recruit: Edit comments 2019-10-16 03:52:17 +00:00
josteph
9fdeebfa0e unit_recruit: Rename variable 2019-10-16 03:52:17 +00:00
josteph
c7adc3ad9f unit_recruit: Move the planning mode gold computation out of the dialog 2019-10-16 03:52:17 +00:00
josteph
1fbf9d9356 unit_recruit: Gray out units that would not be able to be recruited 
Fixes #4443
 2019-10-16 03:52:17 +00:00
josteph
b3e04ba54d unit_recruit: Minor refactoring 2019-10-16 03:52:17 +00:00
josteph
eaf6724740 recruit: Add menu_handler::can_recruit that returns a reason 
For #4443
 2019-10-16 03:52:17 +00:00
josteph
534549daa3 recruit: Show a transient message if repeating a recruit failed 
Reproducible in WoV S3 by recruiting a unit and trying to repeat the recruit.
Previously it failed silently, now it shows a message.
 2019-10-16 03:52:17 +00:00
Wedge009
6b77280c28 Re-use existing translation for Villages. 
* Also makes sense to make label capitalised.
 2019-10-16 14:05:01 +11:00
josteph
8c06b3318b Add #3915 to changelog 2019-10-16 02:57:40 +00:00
newfrenchy83
a87be48307 WML: Add separate special_id and special_type checks to weapon filtering 
PR #4424, fixes #3915.
 2019-10-16 02:55:13 +00:00
Wedge009
0f09fce0e1 Mark villages label category as a translation string. 
Resolves #2949.
 2019-10-16 13:41:55 +11:00
nemaara
7fca6a77e4 Marauder: fix typo 2019-10-15 19:57:26 -04:00
Steve Cotton
f51cf05549 Update credits: add EarthCake, update octalot, newfrenchy83 
* add EarthCake
* add my nickname (octalot)
* correct the number in newfrenchy83's name
 2019-10-15 16:43:03 +02:00
loonycyborg
d2ee0f4b73 Move appdata script to a more appropriate place 2019-10-15 16:14:32 +03:00
Charles Dang
0d60a884c3 Simplify a few wesnoth.*_unit calls 
[ci skip]
 2019-10-15 20:22:09 +11:00
josteph
d757255216 Add #4442 #4449 #4432 to changelog 2019-10-15 01:30:20 +00:00
josteph
8e1024100d --user-data-dir: Deprecate use of relative paths 
They're interpreted relative to $HOME. In 1.16 we'll make that
deprecated. In 1.17 we'll interpret them relative to cwd, like the
rest of the world.

Issue #2000
 2019-10-15 01:12:30 +00:00
josteph
1098c3dc81 deprecation: Log DEP_LEVEL::FOR_REMOVAL and DEP_LEVEL::REMOVED by default 2019-10-15 01:12:30 +00:00
josteph
af18da97e8 options: Parse --log-*=* first 
Needed if parsing any other command line flags logs any warnings, as the commit after next does
 2019-10-15 01:12:30 +00:00
josteph
f9fc82d9b9 Display: Don't move the center of the viewport when zooming in when the map is narrower/shorter than the viewport 
In the test scenario, toggling between 50%/100% zoom on 1920x1080 will
now correctly switch between "Show the entire map" (50%) and "Show just
the center of the map" (100%).

Fixes #1951
 2019-10-15 01:10:17 +00:00
josteph
c0427b504e Preprocessor: Make variables const 2019-10-15 01:08:46 +00:00
josteph
a38ce2a710 Preprocessor: Add {LEFT_BRACE} and {RIGHT_BRACE} escape sequences 
See #4414
 2019-10-15 01:08:46 +00:00
josteph
fc4862a1a4 Add last commit to changelog 2019-10-15 00:10:06 +00:00
josteph
7c6fbf343c [print]: Center the message within the map area 
In master, this just moves the message down by the height of the top bar.

In themes where the left end of the map isn't at x=0, this makes [print]
centered within the main map, rather than centered within the rectangle
with corners (0,0) and (bottom right corner of the main map), regardless
of where the top and left ends of the map are with respect to the screen.

Currently, the [print] messages are vertically centered, whereas the
"Planning mode activated" message is vertically at one-third of the
height. We should perhaps make these consistent, but this commit
doesn't change that.
 2019-10-14 23:59:27 +00:00
Steve Cotton
b408a155b3 Tutorial S01: Correct dialogue about damage for strong / dextrous elves 
Thanks to EarthCake for the implementation.
 2019-10-15 01:16:26 +02:00
loonycyborg
3ed601bb91 Added tool to automatically add <release> tags to appdata 2019-10-14 21:00:38 +03:00
josteph
0d9730d14a Add #4396 to changelog. 2019-10-14 03:03:50 +00:00
josteph
96a8d7d282 display: Remove a use of 0-index team numbers from the API 2019-10-14 02:18:28 +00:00
josteph
51c6559d3a Lua: Make side.flag writable, add missing -1 to the side.color setter. 
Fixes #4396.
 2019-10-14 02:18:28 +00:00
Elvish_Hunter
7c4e0373ac Removed dependency from obsolete psyco library 2019-10-13 21:54:38 +02:00
loonycyborg
4aba57b369 scons: fix build with forum_user_handler=true + py3 2019-10-13 19:54:25 +03:00
loonycyborg
2e4312f5de Add oars entry to appdata file 2019-10-13 19:54:25 +03:00
Nils Kneuper
f9c07d5254 updated Portuguese (Brazil) translation 2019-10-13 12:34:41 +02:00
Nils Kneuper
61feb2b212 updated French translation 2019-10-13 12:33:23 +02:00
Jyrki Vesterinen
d1391fee8e Move ms_after= to the right place in music macros (#4459) 
I originally added it in #719. At that point ms_after= affected the *previous*
track due to a bug; however, I had assumed the behavior to be intentional and
compensated for it by adding ms_after= to the first track of a scenario instead
of the story screen music.

In April, I saw the documentation for ms_after= which said that it's supposed
to affect the track itself, not the previous one. Hence, I fixed the bug in
commit b023b818c742cee0bc75460235c9d1088c0b495d. However, I had forgotten that the changes I had made
in #719 depended on the old broken behavior of ms_after=.

This commit moves ms_after= to the right place, restoring the fade-out on
scenario start and removing the pointless pause after the first track.
 2019-10-13 12:15:21 +03:00
Charles Dang
3a9ce8606e Moved code to its own Engine subsection 
[ci skip]
 2019-10-13 10:07:36 +11:00