upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-03 17:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,366 Commits 60 Branches 374 Tags
Commit Graph

69366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Charles Dang
3d8dbde03b GUI2: strip trailing spaces from utility macros 
[ci skip]
 2017-07-26 22:13:13 +11:00
Charles Dang
0b5ef105c9 GUI2: allowed window maximum_width/height keys to be validated as formulas 
[ci skip]
 2017-07-26 22:13:13 +11:00
Charles Dang
88ebb72b98 Addon Info: escape formatting when generating addon display title 
This resolves the issue with having markup enabled for addon titles in the addon_list widget
as mentioned in cd357f28 and it stil allows the addons manager to apply formatting of its own.
 2017-07-26 22:13:12 +11:00
Charles Dang
e550c1f67c GUI2/Styled Widget: enabled the virtual init function 
I need this for some upcoming changes to the minimap widget that require an initialization
step on after canvas creation.
 2017-07-26 22:13:11 +11:00
Charles Dang
cc3c9be5b0 Mouse Handler Base: formatting cleanup 
# Conflicts:
#	src/mouse_handler_base.cpp
 2017-07-26 22:13:11 +11:00
Charles Dang
79ba6ea55f Controller Base: shortened a few calls 2017-07-26 22:09:07 +11:00
Charles Dang
5b3da6157f Controller Base: formatting cleanup 
Header additions are one-line setters being moved there.

# Conflicts:
#	src/controller_base.cpp
 2017-07-26 22:09:07 +11:00
Charles Dang
ac723367c7 Removed unused CVideo argument from controller_base ctor 
# Conflicts:
#	src/controller_base.cpp
 2017-07-26 22:06:04 +11:00
Charles Dang
e11cc5f522 Format forum URLs correctly 
[ci skip]

* Use https:// over http://
* Use 'forums' over 'forum'
 2017-07-26 22:03:02 +11:00
Charles Dang
1408da68ce Unit Map: added has_unit_at helper function 
Just a small wrapper function to check whether a unit is present a certain location.
 2017-07-26 22:03:01 +11:00
Charles Dang
fc8e9cf07e NR S5a: fixed backdoor lever opening the wrong location 
[ci skip]
 2017-07-26 22:02:50 +11:00
Charles Dang
66cec73576 Font/Pango Text: fixed some weird color precision levels 
cairo_set_source_rgba takes color and alpha parameters as 0..1.0 doubles. A fully opaque channel value (255)
was being set as 0.99609375 instead of 1.0, which it should be.
 2017-07-26 22:02:49 +11:00
Charles Dang
2eefdd8948 Use Boost hash_fwd.hpp include instead of hash.hpp directly 
Boost recommends this as the latter includes a whole bunch of other headers.
 2017-07-26 22:02:49 +11:00
Charles Dang
76173a9c72 GUI2/Panel: remove border from small-res box_display_no_blur_no_border definition 2017-07-26 22:02:48 +11:00
ln-zookeeper
ceb4c9d679 Desert mountains improvements by doofus-01 (manual merge of PR #1851) 
Merged manually for better compression and a more clear filename naming scheme for the added multihex image variations; for example, desert_range2_1_2.png instead of desert_range2_12.png.
 2017-07-26 11:53:42 +03:00
Celtic Minstrel
cca2776343 Merge pull request #1799 from matthiaskrgr/cppcheck 
address two cppcheck findings
 2017-07-25 19:58:26 -04:00
Celtic Minstrel
f1fe86ab5f Merge pull request #1811 from GregoryLundberg/GL_CMake_clang 
Fix Lua for CMake with clang

Fixes #1669
 2017-07-25 19:57:37 -04:00
Gregory A Lundberg
5c4db6afde Fix variable hides variable (#1824) 2017-07-25 19:56:47 -04:00
Sofartin
fd77dd8115 Add revision info inside macOS releases. (#1858) 
I added 'autorevision.sh' script inside Xcode project. Now DEBUG targets will contain revision number.
This script is used in CMAKE 'project' and I just added it also to Xcode project.
 2017-07-25 19:56:22 -04:00
gfgtdf
d973dbae6c fixup ac38604f944 2017-07-25 22:04:53 +02:00
gfgtdf
6a7541b6df Update RELEASE_NOTES 2017-07-25 21:45:43 +02:00
gfgtdf
3a9344f307 Update RELEASE_NOTES 2017-07-25 21:41:08 +02:00
gfgtdf
d822210719 Update changelog 2017-07-25 21:38:51 +02:00
gfgtdf
e859c1da00 update mainline for [cancel_action] 2017-07-25 21:19:05 +02:00
gfgtdf
ac38604f94 format move.cpp code 2017-07-25 21:19:05 +02:00
gfgtdf
821e27c34f add [cancel_action] implements #1427 
this adds a new tag [cancel_action], it currently only has an effect in
move actions. It can be used in enter_hex/exit_hex events to abort the
current movement. It can also be used in moveto events where is
cancels possible following attacks (if the user issued a move+attack
action).

This also changes the behaviour of moveto and enter/exit_hex event so
that they now no longer cancel the movement automatically, also
[allow_undo] no longer has an effect on whether the move is cancelled,
it now only allows undoing of the move.
 2017-07-25 21:19:05 +02:00
gfgtdf
974f09178c rename context_mutated -> undo_disabled 2017-07-25 21:19:05 +02:00
gfgtdf
8e3dd056c8 fix #1473: cannot step on hexes with high (#1850) 2017-07-25 21:11:09 +02:00
Gregory A Lundberg
e5d678b69f Correct documentation comments for pedantic clang 
It appears clang 4.0 now checks documenation comments
 2017-07-25 12:12:09 -05:00
Gregory A Lundberg
383530383a Fix campaignd missing libcrypto for CMake/clang 2017-07-25 12:12:09 -05:00
Gregory A Lundberg
8953f2aa0f Correct float/double literal causing implicit conversion 2017-07-25 12:12:09 -05:00
Gregory A Lundberg
78764f8547 Suppress warning about possibly uninitialized by initializing 2017-07-25 12:12:09 -05:00
Gregory A Lundberg
37510d9c5f Use explicit cast to double instead of implicit conversion 2017-07-25 12:12:09 -05:00
Gregory A Lundberg
ea0053997e Remove unneeded ; at end of functions 2017-07-25 12:12:09 -05:00
Gregory A Lundberg
23e972cba8 Correct lexical_cast for long double implicit conversion 2017-07-25 12:12:09 -05:00
Gregory A Lundberg
d30b6f6438 Suppress clang pedantic warning in Lua 2017-07-25 12:12:09 -05:00
Gregory A Lundberg
4b39f14af4 Fix Lua for CMake with clang 
When using CMake with clang, the wesnoth_lua_config.h was omitted causing problems with exception handling (among other unreported issues).

This closes Issue #1669
 2017-07-25 12:12:09 -05:00
gfgtdf
c6fa56ecdb make gui2 timers more robust against threading issues. 
previously wensoth crashed when for some reason a gui2 timer was still alive when wesnoth exited, this commit should make debugging easier in that case.
 2017-07-25 15:46:57 +02:00
David Mikos
b5641d8e3c Fixed whiteboard crash on delete with multiple moves (bug #1842) 2017-07-25 20:43:32 +09:30
ln-zookeeper
9ff528b6f3 UtBS: A few Quenoth unit balancing changes 2017-07-25 11:36:34 +03:00
Ignacio R. Morelle
23df35f471 wam: Not the right time of day to write Python 2017-07-25 03:02:02 -04:00
Ignacio R. Morelle
9cb25b7b0d wam: Hardcode special cases for the 1.9 and trunk add-ons server names 2017-07-25 02:59:28 -04:00
Ignacio R. Morelle
ad2de1b918 wam: Remove icons' alt-text 
Using the original paths given in WML as alt-text does not serve any
purpose other than breaking the layout when the page hasn't finished
loading and half the icons are overlong text. If anyone really needs
those they should use a data attribute instead. The alt attribute is for
accessibility, not for making programmers happy with themselves.
 2017-07-24 22:45:51 -04:00
Ignacio R. Morelle
4ec6ef1734 wam: Left-align the whole tooltip, not just the contents 2017-07-24 22:34:04 -04:00
Ignacio R. Morelle
cf0a389e6f wam: Fix indentation 2017-07-24 21:53:35 -04:00
Ignacio R. Morelle
a642233513 wam: Fix add-on description tooltip's text alignment 2017-07-24 21:52:43 -04:00
Ignacio R. Morelle
79a294471f wam: Add a hidden copy of the add-on name for sorting purposes 2017-07-24 21:35:04 -04:00
Ignacio R. Morelle
9a7ef678ff wam: More styling work 2017-07-24 21:30:26 -04:00
Ignacio R. Morelle
8f60f69eb4 wam: Move add-ons web tip below the downloads explanation text 2017-07-24 20:26:39 -04:00
Jyrki Vesterinen
ab6b2a7af1 Fix division by zero in unit tests 
Note that this doesn't fix unit tests because they have started to segfault
in the meantime.
 2017-07-24 23:41:05 +03:00