61796 Commits

Author SHA1 Message Date
gfgtdf
db54a8dce5 Fix capture event fired when undoing
http://gna.org/bugs/?23695
2015-07-17 17:03:15 +02:00
gfgtdf
428421c341 Fix beeing able to use sync debug command during events
Previously it was possible to issue synced debug commands like :unit
:n.. while another user actions was executed. This casued assertion
failures and OOS.
2015-07-17 17:03:14 +02:00
loonycyborg
a6ae18a9b5 scons: ensure that windres finds config.h 2015-07-17 04:02:07 +03:00
Ignacio R. Morelle
7465f04e0a Add correct version numbers to the Windows resource file
For the numeric fields, this means we get to treat all X.Y.Z versions as
X.Y.Z.0, and there's no string suffix for those for obvious reasons. Not
that anyone cares, really.

Now we get a pretty name for our client process in the Task Manager too,
hooray!

(Also cleaned-up some of the placeholder code that was left here by
loonycyborg.)
2015-07-16 20:06:13 -04:00
Ignacio R. Morelle
e2aa9d4239 Add preprocessor symbols for the Win32 version info resource numbers
Since Windows absolutely needs the numeric components and there's no way
to extract them from a string literal, and I don't really want to turn
this file into an eyesore.
2015-07-16 20:02:33 -04:00
Ignacio R. Morelle
ce5f9dfa38 Merge branch 'master' of github.com:wesnoth/wesnoth 2015-07-15 20:15:14 -04:00
Ignacio R. Morelle
ff7e909c8b gui2/tgame_version: Omit entries for missing library dependencies
Otherwise we get empty list rows.
2015-07-15 19:17:43 -03:00
Ignacio R. Morelle
055ce30ac8 Include windows.h instead of winuser.h directly
Otherwise we get additional definitions and includes which the Microsoft
Resource Compiler can't handle (resulting in RC4011 warnings, for
example).
2015-07-15 19:11:29 -03:00
Elvish_Hunter
017c75f6e3 UtBS: put Teaching ability events in Garak's [unit] tag 2015-07-15 21:15:54 +02:00
Elvish_Hunter
4360679c2a Upstream merged 2015-07-15 20:48:48 +02:00
gfgtdf
ebbdb086c0 fix menu items 2015-07-15 17:33:27 +02:00
gfgtdf
3781d1358c remember connected user when entering mp_connect
Otherwise we might assign sides to users that arent in the game annymore
2015-07-15 17:33:26 +02:00
gfgtdf
c405766578 Fix observer list
http://gna.org/bugs/?23694
2015-07-15 17:33:24 +02:00
gfgtdf
6ae5ea220f Automatically show mp_connect if needed between scenarios
Instead of showing mp_connect when the scenario has allow_new_game=no
the game now shows mp connect automatically iff there are are sides to
which the game cannot automatically assign a controller.

http://gna.org/bugs/?23643
2015-07-15 17:33:22 +02:00
aquileia
ca8ea2158f vcproj: Add build_info, desktop/version, dialogs/game_version 2015-07-15 15:17:53 +02:00
loonycyborg
50d248c1db Windows: preliminary addition of VERSIONINFO resource
Need to figure out how to get actual version yet.
2015-07-15 13:38:14 +03:00
Ignacio R. Morelle
084e01f885 Merge branch 'master' of github.com:wesnoth/wesnoth 2015-07-15 04:21:40 -04:00
Ignacio R. Morelle
9fa45e0e78 desktop: Log open_object() requests
Otherwise there's pretty much no way to tell why a particular request
went wrong.
2015-07-14 20:22:59 -04:00
Ignacio R. Morelle
bffcad8a87 Update changelogs 2015-07-14 21:01:49 -03:00
Ignacio R. Morelle
cf8fdc33ea Fix the players_changelog 2015-07-14 21:00:48 -03:00
Ignacio R. Morelle
ec74ea24a4 Merge branch 'feature/gui2-game-version-dialog' 2015-07-14 20:51:52 -03:00
Ignacio R. Morelle
ce1e0b2502 desktop: Assume GetVersionEx is not lying 2015-07-14 20:51:28 -03:00
Ignacio R. Morelle
e119f4071f Add manifest declaring compatibility with Windows 8.1 and 10
This is needed so GetVersionEx doesn't lie to us on these versions.

MSVC++ people: I have no idea how this will interact with your building
procedure, if at all. In particular, I believe MSVC++ is supposed to
produce its own manifest declaring our dependencies on the MSVC++
runtime libraries, and it may or may not emit the compatibility
information as well.
2015-07-14 20:51:28 -03:00
Ignacio R. Morelle
aa924e7a5f Remove DISCARDABLE icon attribute from the Win32 resources table
<https://msdn.microsoft.com/en-us/library/windows/desktop/aa380908%28v=vs.85%29.aspx>
2015-07-14 20:51:28 -03:00
Ignacio R. Morelle
d7583f8bb1 gui2/ttitle_screen: Reorganize grid slightly
This frees up some space for the central stacked widget so the game
doesn't crash to desktop due to requiring a vertical resolution of 487
or more to fit it with the version label and button.

Also, the layout of the version label and button is now simpler as they
are now on their own grid outside the central stacked widget. This also
happens to ensure that the label doesn't end up behind the tip of the
day panel. Whether this is a good thing or not depends on personal
opinion.

(And incidentally, the button no longer has a margin around it. This is
intentional.)
2015-07-14 20:51:28 -03:00
Ignacio R. Morelle
b548d6946b preferences: Remove Paths button, superseded by titlescreen version button 2015-07-14 20:51:28 -03:00
Ignacio R. Morelle
6a5adc30b7 gui2/ttitle_screen: Add button to display the About dialog
It's on the bottom left corner, just like the version number. It's not
possible to have both the version number label and the button on the
same layer because only widgets on the topmost stacked_widget layer
receive events, and the label can't be on there because it messes up the
layout of the button panels row.

This currently causes the game to abort on 800x480 because the layout
algorithm runs out of space (needs 800x487) due to to the top row on the
dialog's main grid taking up a fixed amount of vertical space. This will
be corrected in a separate commit.
2015-07-14 20:51:28 -03:00
Ignacio R. Morelle
f2b86823b5 gui2/tgame_version: Add option to open stderr.txt on Windows
This is only displayed on Windows and it is disabled there if Wesnoth
was started with the --wconsole option.
2015-07-14 20:51:28 -03:00
Ignacio R. Morelle
3d140c8727 desktop: Add function to get the Win32 console manager status 2015-07-14 20:51:28 -03:00
Ignacio R. Morelle
948a3ae19a gui2/tgame_version: Add plain text report and a button to save it to clipboard
Most of it is not translatable. This is intentional as it is intended to
serve as a Technical Support/bug tracker post aid.
2015-07-14 20:51:27 -03:00
Ignacio R. Morelle
f608d4f46a desktop: Add an actual os_version() implementation for Windows 2015-07-14 20:51:27 -03:00
Ignacio R. Morelle
43dd063425 gui2/tgame_version: Turned into a tabbed dialog, added plenty more info
The dialog now includes the game and OS version, and has three tabs with
extra information: the Game Paths tab with the existing contents
inherited from the tgame_paths dialog, the Libraries tab with a table
listing the build/runtime library versions, and the Features tab listing
the status of optional build-time features.

Had to move a lot of code around for this, obviously. Now I have to
decide again where to move the button from Preferences -> General.
2015-07-14 20:51:27 -03:00
gfgtdf
55662b9960 add parameter to wesnoth.allow_undo
now it can also disallow undoing.
https://gna.org/bugs/?23506
2015-07-14 18:21:38 +02:00
gfgtdf
2ff22bae36 fix [fire_event] from wesnoth.events.on_event not preventing undo 2015-07-14 18:21:37 +02:00
loonycyborg
980434ce96 Windows installer: added a start menu shortcut to run wesnoth with console 2015-07-14 19:03:40 +03:00
gfgtdf
31796c0b46 add wesnoth,.current.event_context.unit_x/y
http://gna.org/bugs/?23507
2015-07-14 15:32:29 +02:00
Ignacio R. Morelle
0ed6815296 bi: Fix some inconsistent spelling 2015-07-14 01:10:02 -03:00
Ignacio R. Morelle
93a544e584 bi: D-Bus isn't supposed to be an option on non-X11 platforms 2015-07-14 01:09:00 -03:00
Charles Dang
00ad4fd9e5 Tweaked duplicate terrain error formatting 2015-07-14 14:54:26 +11:00
Ignacio R. Morelle
51c026dc91 desktop: Add function to obtain OS version string
Highly unreliable and generally useless, see the Doxygen documentation.
Also missing the actual Windows implementation for the moment. Also,
since uname() is highly useless on most platforms, I'll need to think up
a better OS X implementation later down the road.
2015-07-13 20:52:38 -03:00
gfgtdf
c6685bbb6d Fix [allow_undo] in enter_hex and exit_hex events.
http://gna.org/bugs/?23558
event_mutated_ is set to true by those events by default, but previously it was overwritten later. In that line.
2015-07-13 17:11:52 +02:00
Ignacio R. Morelle
941e983d61 gui2/tgame_paths: Rename to tgame_version
This is in preparation for repurposing it into a more full-fledged game
version/build info dialog.
2015-07-13 05:41:37 -03:00
Ignacio R. Morelle
10baf45766 bi: Keep track of optional build features and add a report function
Also added this information to --version's output.
2015-07-13 05:12:26 -03:00
Ignacio R. Morelle
3a4c11a2e7 scons: Propagate HAVE_FRIBIDI to all files
How does doing otherwise even help reduce compile times unless you are
changing your build environment every time? It's just a liability that
makes it harder to do feature detection from other files. It's also
asymmetrical with regards to the CMake recipe.
2015-07-13 05:12:26 -03:00
Ignacio R. Morelle
29d4da6ec4 bi: Add getter for user-visible library names 2015-07-13 05:12:26 -03:00
Charles Dang
8ac2239ca1 test: some minor cleanup, esp post-459ce3adc29b 2015-07-13 13:15:34 +11:00
gfgtdf
a94228934a fix test_wml_menu_items_1
by not checking can_use_synced_wml_menu() when using
wesnoth.fire_wml_menu_item()
2015-07-13 01:30:48 +02:00
gfgtdf
dbd9436c72 Fix wml menu items
This was broken in 37293b2576
2015-07-13 00:22:20 +02:00
Charles Dang
459ce3adc2 test: add include needed as of b30e01422b59700b4292 2015-07-13 08:39:04 +11:00
gfgtdf
e4962c47f8 refactor set_scontext_(un)synced classes
renamed set_scontext_local_choice to leave_synced_context and
set_scontext_leave_for_draw to set_scontext_unsynced.
The old names do not fit anymore because set_scontext_leave_for_draw is
also used for wml menu items.

Also simplified the implementation of set_scontext_leave_for_draw.
2015-07-12 21:56:05 +02:00