upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 20:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,123 Commits 60 Branches 374 Tags
Commit Graph

69123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Proud
5dce3a3a53 Fixed issue where libcrypto was not copied over to Frameworks during build 
Removed unused libcrypto compiler flag (not needed)
 2017-06-04 11:23:53 -05:00
Celtic Minstrel
933ff02800 Fix for notifications in macOS showing as not built when looking at build info in the game. 
Updated the macOS project file to include a new dependency on libcrypto.
 2017-06-04 10:36:01 -05:00
Nils Kneuper
c162b864e3 updated Italian translation 2017-06-04 09:48:18 +02:00
gfgtdf
4fe20fd125 add a comment 2017-06-03 21:51:12 +02:00
gfgtdf
c0bd6253c1 Atttempt to fix repeated fireing of first_time_only=yes events 
fixup be665e29f111ad6c8ef1e8410a08608a405554cc

This isn't the best fix, ideally the code wouldn't use weak_ptr::expired to check whether an event was already handled.
 2017-06-03 21:45:48 +02:00
Jyrki Vesterinen
bcc0992daa Attempt to fix build in Travis CI 2017-06-03 18:57:09 +03:00
Charles Dang
e188379cd2 Fixup ed9c4dff3567 
The current resolution values are the effective screen resolution, not the physical ones. So, we want
to exclude resolutions greater than the effective res * the DPI scale factor (ie, the physical resolution),
not the res option * the DPI scale factor. That appears to be because the list of res options is of physical
resolutions so this properly excludes options that wouldn't be able to fit on the screen once scaled.
 2017-06-03 01:08:47 +11:00
Charles Dang
09c77256fa Fixup 3a301db7d46f 
A pair of ints mean non-whole scale factors won't be properly considered.
 2017-06-03 00:49:37 +11:00
Charles Dang
ed9c4dff35 CVideo: exclude resolution options outside current DPI from list 2017-06-03 00:35:47 +11:00
Charles Dang
3a301db7d4 CVideo: added getter for current DPI scale factor 2017-06-03 00:35:09 +11:00
Charles Dang
3230c42cbb CVideo: use display index when fetching display modes 
Was already used to get the number of modes but not for individual modes. Doesn't matter much since
we only have one display, though.
 2017-06-03 00:11:18 +11:00
Charles Dang
15cfd986e2 CVideo: get current resolution from display mode instead of framebuffer size 2017-06-03 00:05:21 +11:00
Charles Dang
84929f69a6 Update CB projectfile again (forgot to remove a file) 
[ci skip]
 2017-06-02 23:47:12 +11:00
gfgtdf
fa4a17d587 Attempted build fix with Boost < 1.57 2017-06-02 13:56:49 +02:00
Charles Dang
1a2561721a Moved SDL_Rect ostream op to the correct file and improved output formatting 2017-06-02 22:53:12 +11:00
Charles Dang
648ca5cd04 Updated CB projectfile 2017-06-02 22:52:54 +11:00
Jyrki Vesterinen
eb24cf7c64 Fix build with -Werror=reorder 2017-06-02 14:42:12 +03:00
Jyrki Vesterinen
3d1747e286 Attempted build fix with Boost < 1.61 2017-06-02 14:34:53 +03:00
Jyrki Vesterinen
15fe590d0f Merge pull request #1028 from wesnoth/large-gui-canvas 
Double maximum height of text labels
 2017-06-02 14:29:05 +03:00
Jyrki Vesterinen
7507f3cc65 Copy string_view implementation from Boost 
@gfgtdf asked me for this in IRC.
 2017-06-02 14:24:29 +03:00
Jyrki Vesterinen
7ef277666a Use boost::string_view if available 2017-06-02 13:55:33 +03:00
Jyrki Vesterinen
5e86da67b6 End credits: only start scrolling when the window is actually drawn 
It turned out that "credits start halfway through" wasn't caused by my
changes. The cause was that, in debug builds, the initial draw of the
window took more than three seconds and therefore the window had already
scrolled when it appeared.

This commit fixes the issue.
 2017-06-02 13:55:32 +03:00
Jyrki Vesterinen
495c744cf1 Mark credits label as link-unaware 
This significantly speeds up opening the credits screen.
 2017-06-02 13:55:31 +03:00
Jyrki Vesterinen
d90b1d1c43 Double maximum height of text labels 
Fixes end credits not showing up if they are too long.
 2017-06-02 13:55:13 +03:00
Jyrki Vesterinen
bdc5e7eac5 pango_text::set_layout(): Receive the layout as a function parameter 
This allows the function to be used when the same canvas uses multiple
layouts.

The function also receives the text as a string view now.
 2017-06-02 13:54:45 +03:00
Jyrki Vesterinen
cdf675586e Add utils::vertical_split() 2017-06-02 13:54:40 +03:00
Jyrki Vesterinen
9c1b9af525 Use std::unique_ptr to manage the layout and context in pango_text 
This makes it easier for one canvas to manage multiple layouts.
 2017-06-02 13:54:37 +03:00
ln-zookeeper
28e27238e0 UtBS S08: Proper facings for the human patrol 2017-06-02 13:08:46 +03:00
ln-zookeeper
8975628b9b UtBS S09: Proper facings for the ships in the ending cutscene 2017-06-02 13:05:28 +03:00
ln-zookeeper
1895adcd5c UtBS S08: Fixed crash/error when the human patrol appears 
The armor shift IPF should have been in quotes, but wasn't, causing the + signs to break the formula.
 2017-06-02 11:26:07 +03:00
ln-zookeeper
24eb4bcd4f HttT S19b: Fixed void armor breakage introduced in ef641d6e 
Because of the added $unit references, the unit variable got stored before the object's effects were applied, leading to the unstoring of the unit to subsequently overwrite them.
 2017-06-02 01:07:41 +03:00
Nils Kneuper
96263bf540 updated British English translation 2017-06-01 21:28:11 +02:00
ln-zookeeper
c618bf10f5 HttT S06: Defined starting facings for the thieves 2017-06-01 16:17:02 +03:00
ln-zookeeper
1e870bcb87 HttT S06: Fixed 0594ebd1 to use a moveto event instead 
Should have been part of previous commit 2d13860b.
 2017-06-01 11:11:34 +03:00
ln-zookeeper
2d13860baa HttT S06: Reverted d6f7de91 and 9b364d25 due to major bugs they caused 
The thieves were duplicated first when they spawned and re-triggered the capture event several times, and again after Agadla was killed.
 2017-06-01 11:03:48 +03:00
sigurdfdragon
d5d297818c SotA: Clear variables when no longer needed 
[ci skip]
 2017-05-31 21:10:58 -04:00
Charles Dang
14c6d534ea Fixup 9faf17747 
It seems while my math in the original commit was correct (both usecases - overflow and amount-to-advance - would
yield in the correct positive amount) I failed to consider the fact that some of the code relied on non-positive
numbers for greater-than comparisons.

To compensate, I've split the differential function in two and made each return 0 instead of negative amounts.
This makes the code clearer while not actually breaking anything.
 2017-06-01 11:30:44 +11:00
Charles Dang
1e28a54cf2 Update CodeBlocks projectfiles for Boost 1.64 
Also added a missing include to the wesnothd projfile.
 2017-06-01 10:53:04 +11:00
sigurdfdragon
62eb9c0829 Update changelog for #1705 & #1706 2017-05-31 19:01:20 -04:00
sigurdfdragon
e1f98a8782 SotA S1: Grammer fix 
[ci skip]
 2017-05-31 18:40:02 -04:00
Jyrki Vesterinen
bc44b55cc7 Fix crash when a unit is guaranteed to level up after a battle 2017-05-31 21:30:44 +03:00
Nils Kneuper
bccb5674dc updated Slovak translation 2017-05-30 19:59:27 +02:00
Severin Glöckner
114c428d05 update dates in the manpages 
- for the copyright
 - for last updated

[ci skip]
 2017-05-30 12:11:51 +02:00
Celtic Minstrel
88a74faa71 Remove an incorrect static. 
The CKey constructor fetches the current keyboard state, so
declaring it static will never give the correct result.
 2017-05-29 23:55:42 -04:00
Celtic Minstrel
f26fbe9aba Prevent gettext from checking format strings, since we don't use the printf family of functions 2017-05-29 22:50:35 -04:00
Charles Dang
51ed9fbce2 Fixup tests (thanks @celticminstrel) 
Seems there were a few problems post-e46dfcc
- There was no need to use std::remove on a set, since the values are already unique (and std::remove
  doesn't work with a set anyway). We can just specify the value to remove directly.
- std::sort isn't supported and is redundant on a set - the values are already sorted.
 2017-05-30 12:56:58 +11:00
Nils Kneuper
99a2da2e06 updated Scottish Gaelic translation 2017-05-29 21:59:16 +02:00
Nils Kneuper
17db147993 pot-update 
work around the symptom of issue #1741 https://github.com/wesnoth/wesnoth/issues/1741
This is only a workaround and needs to be handled by the one doing the
next pot-update somehow. Maybe something needs to be changed in the
scons recipe if this was used for the last pot-update?
 2017-05-29 21:57:05 +02:00
Charles Dang
257ad9e9c9 Fixup 3ee79ff 2017-05-30 05:15:27 +11:00
ln-zookeeper
427cd5d0e5 TSG: Removed obsolete geography-related comment 
The comment dates back to when the campaign had no proper bigmap, and with the current bigmap it's clear where everything is situated.
 2017-05-29 20:44:49 +03:00