69426 Commits

Author SHA1 Message Date
gfgtdf
55f0ccad5c fixes to widget resolutions 2017-07-31 04:37:40 +02:00
Charles Dang
287d27c37f MP Join Game: fixed player list being incorrect (fixes #1867 and probably #1598)
Basically switched this dialog to take userlist data from the server instead of the scenario config,
since the former caused various issues as listed in #1867.

I've also removed the manual call to update_player_list in pre_show since it's not really necessary
(and I don't have any list data to pass there anyway) since the network handler will call it once it
receives data.

A similar change isn't needed in MP Staging since the connect engine handles all the user list stuff.
2017-07-31 12:23:43 +11:00
Charles Dang
c5dc04c900 Handle context menus on mouse up instead of mouse down
This is more consistent behavior with apps in general.
2017-07-31 10:27:27 +11:00
Charles Dang
8815965b29 Fixup tests for db44561d334c 2017-07-31 10:26:58 +11:00
Charles Dang
42d146979a GUI2/Loading Screen: cleaned up some unused stuff
For some reason, when I first implemented this dialog, I had it manage it own window pointer like modal_dialog
or modeless_dialog and display itself non-modal-y, despite being a modal dialog... IIRC it was probably some
ill-conceived attempt at "threading" so the game could load the config while it displayed. That's a moot point
now since the dialog was soon after refactored to use actual threading, rendering these bits useless.

# Conflicts:
#	src/gui/dialogs/loading_screen.cpp
2017-07-31 04:34:04 +11:00
Charles Dang
c29ea03212 GUI2: removed superfluous build_window methods from a few dialogs
build_window is *not* virtual in modal_dialog, not were these methods doing anything different from
modal_dialog's even if it were.
2017-07-31 04:32:49 +11:00
Charles Dang
813c0a50f9 GUI2: made use of the great unique_ptr in a few places
# Conflicts:
#	src/gui/core/event/handler.cpp
2017-07-31 04:32:48 +11:00
Charles Dang
2416f10ddd GUI2/Window: minor cleanup
Simplified a setter and added some members to the ctor initializer list.
2017-07-31 04:32:05 +11:00
Charles Dang
db44561d33 GUI2/Modeless Dialog: minor cleanup, implement a TODO
* Use a unique_ptr for the window member.
* Made use of the new remove_from_window_stack function (its impl was copied from this code)
* Only attempt ows removal if window display mode is modeless (since if mode is tooltip, no
  ptr was added to the list anyway.

# Conflicts:
#	src/gui/dialogs/modeless_dialog.cpp
2017-07-31 04:32:05 +11:00
Charles Dang
e724bdf483 GUI2/Modal Dialog: don't use pop_back to remove window ptr from open window stack
This seems to have been the cause of some crashes and weird behavior with the new command console.
Likely the problem came from the wrong pointer being removed from the ows, but exactly why a modal
dialog was even being opened I don't know.

Still, this is a safer method overall and it guarantees the correct pointer is always removed.
2017-07-31 04:30:13 +11:00
Charles Dang
fd7877c26c GUI2/Addon Manager: removed some excessive borders in the low resolution definition 2017-07-31 04:30:13 +11:00
Charles Dang
02ed22b8f2 GUI2/Toggle Button: added medium-sized icon button definition 2017-07-31 04:30:12 +11:00
Charles Dang
5a90290050 GUI2/Image: added scaled-to-size definition 2017-07-31 04:30:12 +11:00
Charles Dang
05210ae1f2 GUI2: fixed some overlay drawing issues with icon toggle buttons
Not sure why, but in some cases the overlay calculations were getting screwed up. This makes them use
the general centered image macro, with accompanying fallback safety checks.
2017-07-31 04:30:11 +11:00
Charles Dang
6f1a13c3a6 GUI2/Image: added tiled-to-size image definition 2017-07-31 04:30:11 +11:00
ln-zookeeper
f818745c72 Revisions to gate/door terrains by doofus-01 (manual merge of PR #1839)
Merged manually for slightly different compatibility code and for better image compression.
2017-07-30 20:07:43 +03:00
doofus-01
b7382e2df3 should have been in previous commit, squash 2017-07-31 02:53:35 +11:00
doofus-01
e10c334df6 a couple items images 2017-07-31 02:53:35 +11:00
doofus-01
816bd059a6 removing pine2.png image from middle of Kalian castle, where it was sitting on top of another tree - guessing it was left over from an earlier map version? 2017-07-31 02:53:35 +11:00
doofus-01
4208eda7bf editing some mainline scenarios that used images in previous commit, so there is no longer as much of a repeating pattern 2017-07-31 02:53:35 +11:00
doofus-01
96860d94e5 touch-ups to some _ancient_ scenery images, and adding a few variations 2017-07-31 02:53:35 +11:00
Jyrki Vesterinen
13fe9db755 We won't heal slow/poison if the opponent is already dead
Fixup of 93be1487fac79406c30c71e5b2a79e43ca722770. This bug frequently caused incorrect attack prediction.
2017-07-30 17:31:03 +03:00
Charles Dang
9801a92b36 GUI2/Window: added getters for dispatcher and display mode, and flag for modeless windows
Previously they were using the modal flag.
2017-07-30 00:07:49 -04:00
sigurdfdragon
d2cec5eda7 DM S21: Fix typo 2017-07-29 14:21:08 -04:00
sigurdfdragon
15d69d19e2 DM S21: Fix grammar
There are two signposts.
2017-07-29 14:21:08 -04:00
sigurdfdragon
e54bae953f DM S20: Have Eldred look beaten instead of healed 2017-07-29 14:21:08 -04:00
sigurdfdragon
2ef06716c6 DM S02: Fix dialog based on feedback
Forum feedback indicates that some players were expecting the
villages to be burnt on capture.
https://forums.wesnoth.org/viewtopic.php?f=52&t=25557
2017-07-29 14:21:08 -04:00
sigurdfdragon
f9928f84bd DM S07: Fix typo 2017-07-29 14:21:08 -04:00
sigurdfdragon
56e8b6749a DM S07: Adjust turns so time over event displays properly
Previously, when time over fired, the time schedule would loop back
to dusk, which doesn't match the dialog.
2017-07-29 14:21:08 -04:00
sigurdfdragon
ee01350acf DM: Clarify scenario objectives 2017-07-29 14:21:08 -04:00
sigurdfdragon
69b447b5e7 DM S12: Add loyal icon for the loyal units 2017-07-29 14:21:08 -04:00
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