53883 Commits

Author SHA1 Message Date
mattsc
d2784eef90 SotBE::14_Back_Home: fix missing ellipse issue for Grüü
The new ellipse system automatically appends -leader to the ellipse
file name, which does not work with the hero ellipse (those files don't
exist).
2013-09-29 17:15:37 -07:00
mattsc
00f00b6afa SotBE: do not use IS_HERO macro on side leaders
This results in missing ellipse images with the new ellipse system.
Also, having the hero icon over the side leader crown does not look
good.
2013-09-29 17:05:21 -07:00
mattsc
413870e62f SotBE: use DEFEAT macro consistently in all death events 2013-09-29 16:49:57 -07:00
mattsc
3d0b957d9f SotBE: also combine death events for the two orcish generals
They differed only in the unit IDs.
2013-09-29 16:43:52 -07:00
mattsc
30a4e44f71 SotBE: combine three almost identical death events
They only differed by unit type.
2013-09-29 16:36:54 -07:00
mattsc
0df70f1726 SotBE: delete an unused death event
It used a non-existent unit type.
2013-09-29 16:29:50 -07:00
Mark de Wever
9d35b1372f Don't use an implicit cast to bool.
This fails to compile using C++11, since boost::shared_ptr there has an
explicit operator bool.
2013-09-29 20:58:13 +02:00
Mark de Wever
0edb2f43aa Allow warnings in desktop_util.cpp.
The code uses some macros that can result in old-style or useless casts.
2013-09-29 20:56:46 +02:00
Alexander van Gessel
da627ef8a3 Reverse some broken logic 2013-09-29 20:41:42 +02:00
Alexander van Gessel
780bb59c5b Make the hotkey-related WMI fields private, provide read-only accessors 2013-09-29 20:37:51 +02:00
Alexander van Gessel
1bb0e94d87 Add WMI hotkey testcases 2013-09-29 15:45:31 +02:00
Alexander van Gessel
1c5fc2dcd5 Remove useless typedef 2013-09-29 15:45:17 +02:00
Alexander van Gessel
1120146ca6 Reference WMI by the ID, not the name 2013-09-29 15:44:46 +02:00
Alexander van Gessel
05e2ccf888 Expose WMI ID and use it 2013-09-29 15:43:43 +02:00
Andrius Silinskas
1e12f9d19d Added default description for mp::create description textbox. 2013-09-29 13:02:04 +01:00
Alexander van Gessel
3bb03f094f Merge pull request #58 from gfgtdf/master 2013-09-29 09:17:51 +02:00
gfgtdf
83020d47e3 Update game_events.cpp 2013-09-28 21:13:27 +02:00
gfgtdf
1d9acbfaaa Update gamestatus.cpp
changed wml_menu_item constructor, to fit the code in wmi_container::to_config.
2013-09-28 21:10:44 +02:00
gfgtdf
8d53444490 removed ignore_filter_on_hotkey in gamestatus.hpp 2013-09-28 00:26:12 +02:00
gfgtdf
facb120054 removed ignore_filter_on_hotkey in play_controller.cpp 2013-09-28 00:25:25 +02:00
gfgtdf
705b4cd926 removed ignore_filter_on_hotkey in gamestatus.cpp 2013-09-28 00:23:51 +02:00
gfgtdf
b7f7aaa879 removed ignore_filter_on_hotkey in game_events.cpp 2013-09-28 00:22:03 +02:00
anonymissimus
bc067de37c vc project update 2013-09-27 16:49:42 +02:00
mattsc
932e9eafaf Liberty::The_Raid: Use Messenger Micro AI for wolf rider side
This also requires some rebalancing of the scenario: changing starting
positions of some units and modifying 3 hexes of the map.
2013-09-27 07:27:21 -07:00
mattsc
dbc3bffdef Liberty::The_Raid: strip trailing spaces in map file 2013-09-27 07:27:21 -07:00
Ignacio R. Morelle
adf1e3f7d5 gui2: Implement Pango markup flag for tmessage and related wrappers
This allows enabling Pango markup in gui2::show_message() and
gui2::show_error_message(), as well as the gui2::tmessage dialog they
depend upon. This was a TODO item mentioned in the implementation of
gui2::show_message(). The default continues to be to not enable markup.
2013-09-26 21:01:19 -03:00
gfgtdf
9f8d46a02b correction of a comment 2013-09-27 00:42:41 +02:00
fendrin
cd69ae8e95 Fixed wrong reference to a unit path function. 2013-09-26 23:40:01 +02:00
Elvish_Hunter
257c8aec88 wmllint: implemented new sanity check for leader and nozoc ellipses 2013-09-26 21:07:08 +02:00
Ignacio R. Morelle
671a57181c desktop_util: Use pointer to vector front() instead of data() result
Anonymissimus pointed out that std::vector::data() isn't supported
by all STL implementations (it's only required by C++11). Vectors are
supposed to be stored in contiguous memory, so we can use a pointer
to the first item instead to avoid a superfluous copy.
2013-09-26 15:47:49 -03:00
fendrin
41cb9ec3d0 Changelog updates, related to help browser and unit variants. 2013-09-26 20:41:33 +02:00
fendrin
deda49a0d7 Updates to the unit help browser.
Don't display base_units and variations twice.
Fix some linking according to the new situation (sectioned parents).
2013-09-26 20:41:33 +02:00
fendrin
a4f6249627 Support for the disable weapon special. 2013-09-26 20:41:33 +02:00
fendrin
5aa89dcd97 Basic support for base_unit sections.
Units which are base_units for variants are now displayed as sections
with their variants as topics in the help dialog.
2013-09-26 20:41:33 +02:00
fendrin
88d8547caf Insert some scopes to make the code more easy to read. 2013-09-26 20:41:32 +02:00
fendrin
669f2d58fe Show siblings and base units in the unit profile dialog. 2013-09-26 20:41:32 +02:00
fendrin
c145247ba4 Don't show active "disable" special weapons in the gui1 attack dialog. 2013-09-26 20:41:32 +02:00
fendrin
1679b4382f variation_id replaces the former variation_name.
The new [variation] attribute variation_id is now used to identify the
subtype of the variation. This was done by the variation_name until now.
variation_name is now used to display a translated string to the user.

During creation of the unit tree a new attribute base_ids is stored to
hold a list of the [base_unit]s.
2013-09-26 20:41:32 +02:00
fendrin
3c636c3163 Show the unit profile based on the variation_id.
The old implementation took the variation_name which is now used to show
the user a translated text.
2013-09-26 20:41:32 +02:00
Ignacio R. Morelle
bd2062c7d1 CodeBlocks project update 2013-09-26 15:27:41 -03:00
mattsc
6f20df53ae Update Xcode projectfile 2013-09-26 07:17:45 -07:00
flix
b08afe2f1a Change behavior of aspect recruitment_diversity. 2013-09-26 16:04:40 +02:00
mattsc
7ad252e814 The South Guard: fix missing ellipse issue for Sir Gerrick in 2 scenarios
The new ellipse system automatically appends -leader to the ellipse
file name, which does not work with the hero ellipse (those files don't
exist).
2013-09-26 06:59:39 -07:00
Ignacio R. Morelle
5d401b3b27 Update changelogs 2013-09-26 05:57:33 -03:00
Ignacio R. Morelle
1c414a30d6 gui2/tgame_paths: New dialog for displaying game paths in Preferences
The button to invoke this dialog is currently in Preferences -> General.
This will change as soon as I think of a better place/someone else
suggests a better place for the button.

The goal is to allow users to quickly inspect the various paths used by
the game to locate resources and configuration, for debugging or content
creation purposes. The dialog provides options to copy directory paths
to the system clipboard and browse them using the platform's file
manager software, when available.
2013-09-26 02:15:42 -03:00
Ignacio R. Morelle
78db17b896 Add functionality to launch the platform's file manager for a path
This supports X11 platforms, Windows, and OS X. The code was
developed and tested on Debian GNU/Linux, Windows XP, and Windows 7.

The X11 and OS X versions of the function are identical and use an
exec/fork/wait pipeline with the only platform-dependant variable
being the external launcher binary (xdg-open on X11, open on OS X). I
opted for this somewhat ugly approach instead of system() because of
the many dangers resulting from allowing the system shell to
reinterpret the command line at whim.

The Win32 version uses ShellExecute() to launch the default
application associated with the Folder object type, in case Windows
Explorer is not the default handler for whatever reason.

The OS X code path was preliminary tested by mattsc and that's really
all I know about it. More testing on that platform would be very,
*very* welcome, although it is expected to behave pretty much the
same as Linux/X11
2013-09-26 02:01:12 -03:00
Ignacio R. Morelle
ea4788e0cf gui2/tbutton: Add 25x25 variants for browse/go and copy-to-clipboard actions 2013-09-26 01:34:13 -03:00
Ignacio R. Morelle
830867f51f Add placeholder icons of my own for a generic copy-to-clipboard action
These are intended to be used with 25x25 buttons.
2013-09-26 01:34:13 -03:00
flix
d3e24eef3a Change behavior of recruitment_save_gold. 2013-09-26 03:04:15 +02:00
Andrius Silinskas
213677b710 Updated RELEASE_NOTES. 2013-09-25 21:44:03 +01:00