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

69395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Smok94
e4552c7a75 [store_unit_defense] tag 
Stores in variable the defense of a unit on a particular terrain. If terrain is not specified, the terrain on which the units currently stands is used. (Note: it is a WML defense, so the higher it is, the weaker unit's defense is.)

* StandardUnitFilter
* loc_x, loc_y: x and y of terrain location.
* terrain: alternatively, the character of terrain.
* variable: the name of the variable into which to store the defense. default: "terrain_defense"
 2017-07-29 11:34:54 +11:00
Jyrki Vesterinen
6a4f889f39 Fix build with Visual Studio 2013 2017-07-28 22:06:16 +03:00
Gregory A Lundberg
eaba48d982 Fix unused expression result (#1869) 
clang reports a warning. This appears to be a missing return. Originally fell through resulting in null pointer reference.
 2017-07-27 22:46:03 -04:00
Celtic Minstrel
d63d1e8cb9 fix #1870 2017-07-27 22:45:17 -04:00
Celtic Minstrel
52e77fb0ed Also avoid quick_exit on MinGW and non-Apple clang/libc++ 2017-07-27 22:39:32 -04:00
Celtic Minstrel
bc3842e673 fixup ac063ce 
Seriously though, if it's broken for some trivial reason, don't just comment it out. Fix it properly.
 2017-07-27 22:32:15 -04:00
gfgtdf
120b11c0e0 don't use std::quick_exit on old compilers 2017-07-28 04:02:40 +02:00
gfgtdf
b219b018e7 include <cstdlib> for std::quick_exit 2017-07-28 02:13:45 +02:00
gfgtdf
e7488f6f73 use std::quick_exit in loading screen 
std::quick_exit doesn't call dtors and was made exactly for cases like this.
 2017-07-27 20:20:29 +02:00
Jyrki Vesterinen
5a297ed1d6 Fix build with -Werror=address 2017-07-27 21:09:12 +03:00
gfgtdf
1810b6ae2c fixup travis tests 2017-07-27 19:43:30 +02:00
gfgtdf
4dda789e8e attempt to fix boost tests 2017-07-27 19:33:33 +02:00
gfgtdf
59947ae969 fix units with high mp beeing able to step over unreachable 2017-07-27 15:53:58 +02:00
Celtic Minstrel
ac063ce8e7 Try not to allow IME to intercept hotkeys 
More work on this may be required, in particular for GUI2
 2017-07-26 22:29:10 -04:00
Celtic Minstrel
382c469949 Fix inability to bind numeric keypad keys 2017-07-26 22:17:28 -04:00
Celtic Minstrel
ce74fe4330 Attempt to fix a crash in [music] (#1861) 2017-07-26 22:17:27 -04:00
Celtic Minstrel
4ce40f5992 WFL: Allow access to gamestate functions in ability formulas 2017-07-26 22:17:26 -04:00
Gregory A Lundberg
d89558b611 Corrections for clang autodoc comments (#1862) 2017-07-26 22:16:21 -04:00
Jyrki Vesterinen
74eda449bf Merge remote-tracking branch 'donovanamitchell/bug#1800' 
This is a manual merge of pull request #1823.

Closes #1800.
 2017-07-26 19:39:44 +03:00
gfgtdf
304f480813 update mainline for #1846 2017-07-26 16:43:49 +02:00
gfgtdf
77638c7b89 Update RELEASE_NOTES 2017-07-26 16:34:32 +02:00
gfgtdf
2ca349d3ba Merge pull request #1846 from DisherProject/master 
Set village income and support to their expected default values in mp games
 2017-07-26 16:31:23 +02:00
Charles Dang
67e3c76fca GUI2/Addon List: restrict markup to name and installation status fields 
We don't want markup in any of the other fields. I still need to find a slightly better solution for the name
field, though. We don't want users to be able to use markup unnecessairly, but we do need markup to highlight
the names of ready-to-upload addons.

This fixes warnings about unescaped ampersands in the Author field.
 2017-07-27 01:08:24 +11:00
Charles Dang
11b2732123 Fixup b4990801 
The commit was incorrectly backported from accelerated_rendering, and getx was returning window height
while gety was still relying on the framebuffer surface.
 2017-07-27 00:56:33 +11:00
Charles Dang
d8e2ddc72a Changelog entry for fc8e9cf07ea0 
[ci skip]
 2017-07-26 22:31:08 +11:00
Charles Dang
bc3f72b45b Update CB projectfile for 4e4d7b527 
This is the same fix as applied to Scons in a3d884ef.
 2017-07-26 22:29:22 +11:00
Charles Dang
bbfe46755e Hotkey: removed unused basic_handler class 
Not sure what this was used for, but it's not used for anything now and is just confusing being around.
 2017-07-26 22:13:14 +11:00
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