63568 Commits

Author SHA1 Message Date
Andreas Löf
6978296137 Move stray curly bracket to right place 2016-02-28 23:17:00 +13:00
Celtic Minstrel
e9fc60ff0c Add additional accessors to bad_enum_cast exception 2016-02-28 03:13:55 -05:00
Charles Dang
716ffa524b Remove unnecessary calls to CVideo::flip() (and one call to CVideo::delay()) 2016-02-28 18:08:36 +11:00
Charles Dang
d39bbc23f3 Reapply 86746aaaf094ece1540d143c8d58c8f9e551e243
This reduces flickering in the editor
2016-02-28 18:07:40 +11:00
Andreas
a3f6abfc85 Merge pull request #564 from Wedge009/bug_21969_fix
Resolve preferences file polluted with null-command hot-keys (Bug #21969)
2016-02-28 15:35:35 +13:00
Charles Dang
1e7abb4615 Don't trigger a full redraw when toggling label visibility 2016-02-28 13:02:02 +11:00
Charles Dang
b655ec8f9b AToTB S1: spruced up map 2016-02-28 12:48:20 +11:00
Andreas Löf
bdac437efc Fix compilation with SDL1
This fixes two compilation errors when compiling against SDL1. At
least one was brought over from master.
2016-02-28 13:21:36 +13:00
Andreas Löf
46a0eb0e55 Merge remote-tracking branch 'origin/master' into guifixes 2016-02-28 08:46:33 +13:00
ln-zookeeper
f4cb656921 Fixed the unit_creator crash part of bug #24439 2016-02-27 21:20:58 +02:00
Charles Dang
2732b21610 UtBS S2: slightly more consistent ID for Go'hag 2016-02-27 20:06:18 +11:00
Charles Dang
e5c5b0213e TRoW S15: added Lord Typhon's death to lose objectives (bug #24461) 2016-02-27 19:50:02 +11:00
Wedge009
807d78a0b1 Update change log. 2016-02-27 16:04:34 +11:00
Wedge009
389285e580 Add disabled flag to allow clearing of default hot-keys (Bugs #21983/#22218/#23981)
The original design of using a "null" command to indicate a disabled hot-key is ambiguous with regards to when to save a user hot-key to preferences as well as when a default hot-key should be flagged as disabled. So introduce a separate disabled flag to resolve the ambiguity.
Where the disabled flag is set to true, the hot-key should not be written to preferences unless it is a default hot-key.
2016-02-27 16:04:33 +11:00
Wedge009
798a99b27a Avoid polluting preferences file with null commands (Bug #21969)
Only save non-default hot-keys to the preferences file if the hot-key is active (ie command != 'null').

Clearing hot-keys in memory (via the hot-key functions in the game) only sets the command to 'null', which currently gets written to the preferences file if it is a custom, ie non-default, hot-key. Over time, creating and clearing hot-keys results in a lot of redundant hot-key entries. The nice thing about this update is that it will remove redundant command='null' entries for existing preferences files as well as prevent it from being included in future ones..

I am making this change against the sdl2 branch instead of master because the sdl2 branch already contains a lot of rewriting of the hot-key functionality. Testing against master was also hopeless because hot-key handling is still rather broken building against SDL 1.2.
2016-02-27 16:04:31 +11:00
Charles Dang
d5b20f9c21 Apply slight tint behind editor selection overlay 2016-02-27 13:45:58 +11:00
Charles Dang
7115b50102 editor: fixed editor having two hex overlays drawing over each other
images/editor/brush.png and images/misc/hover-hex.png were being drawn
on top of each other, resulting in an unsightly editor brush. Removed the
latter.
2016-02-27 13:38:00 +11:00
Charles Dang
0eb6d28664 Improve look of editor brush 2016-02-27 13:36:41 +11:00
Charles Dang
9afb987574 tgamestate_inspector: display as fullscreen window and adjusted layout as relevant 2016-02-27 13:10:28 +11:00
Charles Dang
6b827e68d4 GUI2: added a macro for fullscreen window layout settings 2016-02-27 13:03:12 +11:00
Charles Dang
86746aaaf0 editor: don't redraw entire screen when switching contexts 2016-02-27 11:56:45 +11:00
Charles Dang
2ee1cf3cc0 editor: don't switch contexts if attempting to switch to current context
This extends ae305e9cc7885294617a86562bf8705cbbc7181e to add context switching
2016-02-27 11:54:31 +11:00
Celtic Minstrel
2e36ed230f Use widget groups in the advanced graphics options dialog 2016-02-26 03:34:10 -05:00
Celtic Minstrel
63a3312e70 Use widget groups in orb selection dialog 2016-02-26 01:12:02 -05:00
Celtic Minstrel
5d5f89d31b tgroup: Pre-C++11 implementation of remove_member
(In case someone needs it)
2016-02-26 00:24:33 -05:00
Celtic Minstrel
9a77b81fc7 Update XCode and MSVC projects 2016-02-26 00:20:21 -05:00
Andreas Löf
cc760cb33f Unable undrawing of dialogs used in the title-screen
This sets the restore_ flag to true for the obvious dialogs I've found
that are used on the title-screen.

Also, make GUI1 dialogs mark all buttons dirty on a DRAW_ALL_EVENT to
ensure the buttons get redrawn.
2016-02-26 16:24:37 +13:00
Charles Dang
dfe6f6c935 taddon_filter_options: simplify radio buttons with groups 2016-02-26 13:24:29 +11:00
Charles Dang
82b089e478 tgroup: add a clear() function 2016-02-26 13:23:45 +11:00
Charles Dang
90ae1151c7 CB: add -Wunused compiler flag 2016-02-26 12:53:02 +11:00
Charles Dang
e5cf2e8eea Attempt to fix gui2 unit tests (post-e23a4764971b) 2016-02-26 12:45:54 +11:00
Charles Dang
e67dd6b3df teditor_edit_side: simplified radio toggles with groups 2016-02-26 12:39:25 +11:00
Charles Dang
f84fc5cb0b Fixup a0909a9d4749 (unused parameter) 2016-02-26 10:33:19 +11:00
Charles Dang
e23a476497 teditor_generate_map: refactored out reliance on display 2016-02-26 07:17:46 +11:00
Charles Dang
02995731ce taddon_connect: removed unused display argument 2016-02-26 07:11:56 +11:00
Charles Dang
6612b71b8d tunit_attack: refactored out display argument 2016-02-26 07:09:00 +11:00
Charles Dang
ec88475d23 tunit_create: refactored out display argument 2016-02-26 07:03:52 +11:00
Charles Dang
a0909a9d47 tunit_create: simplified gender toggle using a group 2016-02-26 06:56:27 +11:00
Charles Dang
8691ae247d tgroup: implement remove_member (C++11 only) 2016-02-26 04:59:32 +11:00
Charles Dang
1fd5eb63e1 Updated changelog 2016-02-25 22:24:45 +11:00
Charles Dang
2185faa403 Merge pull request #588 from Vultraz/gui2_widget_groups
gui2: implement widget groups
2016-02-25 22:20:22 +11:00
Charles Dang
6d883e10f4 tpreferences: reimplement radio toggle setup to use groups 2016-02-25 20:28:24 +11:00
Charles Dang
dfe7fcca88 gui2: implement widget groups
Groups are handled on a per-dialog basis, and are currently specialized for tselectable_
inheritors. They provide a convenient vector-of-pairs interface that ensure only one
widget is selected at one time and allows binding of values to widgets which can be
fetched at a later point.
2016-02-25 20:28:18 +11:00
Andreas Löf
b576e1ae90 Ensure that the map-editor still works
This makes the map-editor aware of the draw-layering. Since it's a
subclass of the display-class, but relies on the buttons being
re-created in the superclass I've moved that code into the subclass
instead. This way there won't be any infinite loops with a full redraw
triggering another full redraw.

I have also introduced a small workaround in the GUI1 button widget,
where it would sometimes add the postfix to overlay image names that
already contained the postfix. If the image name ends in the postfix,
the postfix is removed from the name before re-added. This ensures
that the files are successfully found.
2016-02-25 22:10:59 +13:00
Andreas
dd70544139 Merge pull request #610 from Wedge009/Fix_VC_build
Fix broken build in VC
2016-02-25 21:54:13 +13:00
Wedge009
d2be47f5dd Fix broken build in VC
#include <iterator> is needed for back_insert_iterator. This was included in config.hpp, but inclusion of that header here was removed in the previous commit.
2016-02-25 18:54:51 +11:00
Charles Dang
9358af7ad1 Merge pull request #609 from sigurdfdragon/Tutorial_Fixes_2016_02_24
Tutorial fixes 2016 02 24
2016-02-25 08:01:36 +11:00
sigurdfdragon
d99806cbbf T: Make Delfador have same traits as HttT.
Except loyal, because he's not on your side here.
2016-02-24 15:42:12 -05:00
sigurdfdragon
c970efa6bf T: Make Konrad & Li'sar unnameable. 2016-02-24 15:34:41 -05:00
gfgtdf
ac6439efdc fix lua console showing twice 2016-02-24 19:57:06 +01:00