66504 Commits

Author SHA1 Message Date
Charles Dang
0d4e0b0366 Merge pull request #813 from doofus-01/icons
some edits to images/attacks and images/icons images
2016-10-08 16:14:02 +11:00
doofus-01
fd5e269350 some edits to images/attacks and images/icons images 2016-10-07 21:06:44 -07:00
Charles Dang
e8e022b592 Why do I keep forgetting files (fixup 53a60f1858cd) 2016-10-08 12:57:10 +11:00
Charles Dang
53a60f1858 MP Staging: colorize color choice text 2016-10-08 12:56:02 +11:00
Charles Dang
a2b79720d9 GUI2: removed function_wrapper helper
This is better served by lambdas now
2016-10-08 11:32:28 +11:00
Charles Dang
0862815e2b MP Lobby: minor cleanup of prefs hotkey callback handling 2016-10-08 11:31:21 +11:00
Chris Beck
4dea265113 add code comments and minor fixups in lua_kernel_base
adds code comments for a number of method declarations in header,
and in the implementation file, prefixes many method calls with
`this->`. This convention disambiguates whether the call is a method
of the class or a function at global scope. On some projects like
gcc, it is part of the coding standard to do this to avoid subtle
bugs -- I have come to believe that it makes your code more easily
readable, even if it is a little more typing.
2016-10-07 19:35:02 -04:00
Chris Beck
d82d8c9137 fixup previous commit: don't compare std::function with nullptr 2016-10-07 19:15:03 -04:00
Chris Beck
0d2635c20a fix an issue with text not properly formatted in lua console
gfgtdf noticed that sometimes, if lua generates text or error messages
which looks like pango formatting, it breaks the markup in the lua
console. the problem was that each unit of text generated by lua
needs to be run individually throw font::escape_text. We identified
the problem but for whatever reason didn't fix it back then, and
put a fixme note instead. This is a proper patch that fixes the issue.
2016-10-07 19:03:22 -04:00
mattsc
6222f18ed2 [filter_vision]: fix bug of filter not matching own/allied hidden units
The vision filter should reflect whatever a player playing the
respective side would see. Previously, any unit with the hides ability
active was excluded from matching irrespective of what side it was on,
even though hidden units of both own and allied sides are always seen
(as long as they are not under shroud or fog when vision is not shared,
but that's covered separately).
2016-10-07 12:02:19 -07:00
Charles Dang
628c0ac784 Unit Preview Pane: display race name next to icon instead of in tooltip 2016-10-07 22:24:21 +11:00
Wedge009
4600614f6d Avoid rare cases of mini-map producing a divide-by-zero error (bug #25155) 2016-10-07 19:59:39 +11:00
Wedge009
807f8d2144 Avoid dereference of iterator end. 2016-10-07 19:59:14 +11:00
Charles Dang
fa2340413f MP Staging: update label and button states at start
Especially fixes the 'Waiting for players' label appearing in local games
2016-10-07 18:55:00 +11:00
Charles Dang
da72c43c3b MP Connect: tweak Host Networked Game tooltip
There's no need to confuse new players with the 'wesnothd' terminology
2016-10-07 18:37:00 +11:00
Charles Dang
77ea3b274d Tooltips: enable markup 2016-10-07 18:30:02 +11:00
Charles Dang
6a28eff9db Tooltips: subtle blue tint 2016-10-07 16:49:35 +11:00
Charles Dang
6c22e41914 Quit Confirmation: delete copy and move constructors 2016-10-07 14:13:25 +11:00
Charles Dang
726100e9c2 Few further tweaks and cleanup for e76db219ac36 2016-10-07 10:49:18 +11:00
Charles Dang
e76db219ac Tooltips: improved design yet again 2016-10-07 10:11:02 +11:00
Charles Dang
dfd9bf12df Update changelog 2016-10-07 07:21:06 +11:00
doofus-01
955b5b4bec New aquatic castles terrain 2016-10-07 07:18:28 +11:00
Jyrki Vesterinen
ea5728c19a Merge pull request #812 from Wedge009/refactor_msvc_warnings
Avoid hidden variable warnings produced in MSVC compilation
2016-10-06 20:03:44 +03:00
soliton-
8d1e14980f Merge pull request #809 from ln-zookeeper/clarify_ban_duration
Clarify the display of the remaining ban duration to banned users
2016-10-06 17:38:21 +02:00
Charles Dang
87f1f05677 MP Staging, MP Join Game: made side numbers really big 2016-10-06 21:22:19 +11:00
Charles Dang
f42b9f2099 Slightly bumped text line spacing
In my opinion, this reduces eye strain slightly when looking at large blocks of text
2016-10-06 20:08:57 +11:00
Wedge009
2e9a9fc2c9 Avoid hidden variable warnings produced in MSVC compilation.
An extension of af73336, hopefully this will remove some more of the warnings which pop up in MSVC compilation. Also try to use more explanatory variable names as code should generally be self-documenting and easy to read.
2016-10-06 19:56:29 +11:00
Charles Dang
4821b97949 Fixed terrain bitmap count setting not being preserved through editor sessions 2016-10-06 17:40:58 +11:00
Charles Dang
879b6a9efa Fixed terrain bitmap counts always showing in-game 2016-10-06 17:35:29 +11:00
Charles Dang
6deb70f961 MP Lobby: log + single include cleanup 2016-10-06 16:25:21 +11:00
Charles Dang
0ead900f8f Removed make_dialog_callback in favor of a lambda
This helper function was added to assist with dialog callbacks that took more than just a twindow argument.
However, now that we use C++11, a lambda is a cleaner solution.
2016-10-06 16:10:59 +11:00
Charles Dang
bdebafda4a Mp Staging: include cleanup 2016-10-06 15:54:22 +11:00
Charles Dang
1aa180b9e4 MP Join Game: include cleanup 2016-10-06 15:49:39 +11:00
Jyrki Vesterinen
39b0b28d8b Revert accidental semantical change in persist_file_context::clear_var 2016-10-06 07:43:05 +03:00
Jyrki Vesterinen
0fba36a9d0 Fix config_cache::read_cache()
I broke it in commit af733360a81405505673687b935a637ddedae861.
2016-10-06 07:33:57 +03:00
Wedge009
0fe3e0ab13 Define _WIN32_WINNT for MSVC compilation (resolve warnings from boost).
Also suppress Winsock deprecation warning from boot's use of certain functions.
2016-10-06 14:11:07 +11:00
mattsc
8ad055e77f ai_helper: remove double spaces after punctuation 2016-10-05 19:30:47 -07:00
mattsc
e65a460342 ai_helper: add E_FAILED_TELEPORT to list of non-fatal move errors 2016-10-05 19:28:52 -07:00
Wedge009
f10f4e8a28 Basic tidying of VC project files.
* Merged property groups added in ab636909.
* Strip out empty properties.
2016-10-06 13:21:35 +11:00
mattsc
75817d3ba4 ai_helper: new function robust_move_and_attack() 2016-10-05 19:19:25 -07:00
Jyrki Vesterinen
af733360a8 Fix a bunch of MSVC2015 compiler warnings about hiding declarations
This commit still doesn't fix all of them. I decided to leave alone
cases where variables with the same name are assigned in multiple
conditions of the same if...else if...else statement, and cases where a
scope logging macro is used multiple times in the same scope. In any
case, this commit greatly reduces the warning count on MSVC2015 and makes
new warnings much easier to spot.
2016-10-06 00:11:56 +03:00
ln-zookeeper
5d347bb61b Added a "Draw Number of Bitmaps" option to the editor
This is similar to "Draw Hex Coordinates" and "Draw Terrain Codes", and displays the number of terrain graphics surfaces draw for each hex. It is useful for spotting mistakes such as overlay images having non-transparent pixels in adjacent hexes where they shouldn't, or for comparing the efficiency of different kinds of terrain graphics rules.
2016-10-05 18:20:19 +03:00
mattsc
ac1d8c886c Update Xcode project 2016-10-05 06:32:17 -07:00
Charles Dang
147caf83cc GUI2: some formula formatting cleanups 2016-10-05 19:34:28 +11:00
Wedge009
75278bac02 Avoid performance warning in MSVC compilation.
https://msdn.microsoft.com/en-us/library/windows/desktop/bb773674.aspx says PathIsRootW() returns TRUE or FALSE.
2016-10-05 19:06:58 +11:00
Charles Dang
67d094d06f Custom ToD: use read only mode for the file browser invocations
Don't want people deleting core assets now, do we.
2016-10-05 19:05:47 +11:00
Wedge009
4d172d6e11 Update VC project files for update of file menu from GUI1 to GUI2.
* Add file_dialog and remove filechooser & file_menu
* Add Shlwapi.lib to linker
2016-10-05 19:04:00 +11:00
Ignacio R. Morelle
8b3bb18eb7 Use show_transient_error_message for displaying Save Map errors in-game 2016-10-05 04:34:46 -03:00
Ignacio R. Morelle
ec4dbfb8a4 gui2/tfile_dialog: Prompt user about overwriting files in save mode
This also drops the custom overwrite prompts that were previously used
elsewhere.
2016-10-05 04:31:25 -03:00
Ignacio R. Morelle
4096097d99 editor: Drop more redundant file dialog button label overrides 2016-10-05 04:31:25 -03:00