63542 Commits

Author SHA1 Message Date
Charles Dang
fb0285c27f ttext_box: added support for defining a maximum input length 2016-03-01 02:05:15 +11:00
Charles Dang
3baba9235e Add missing copyright notices 2016-02-29 22:43:06 +11:00
Charles Dang
2febafd7f9 Added dedicated fallback message if a replay is loaded from mp create 2016-02-29 22:33:43 +11:00
Charles Dang
fb904c6b31 Pass savegame summary config to loadgame class 2016-02-29 22:30:30 +11:00
Charles Dang
032ab4557e tunit_create: made alignment tooltip use translated text again 2016-02-29 19:08:43 +11:00
Charles Dang
01168d50c8 tunit_create: fixed alignment icon paths being language-sensitive 2016-02-29 18:58:17 +11:00
Andreas Löf
dff0957088 Merge branch 'master' of github.com:wesnoth/wesnoth 2016-02-29 19:59:28 +13:00
Andreas Löf
2a0631c6da Fix bug #24477: Segfault when launching credits screen
Guifixes introduced a regression where the code would try to iterate
over a pointer to a vector without checking if it was non-null. This
adds the check to ensure that it is non-null before attempting to
iterate.
2016-02-29 19:57:36 +13:00
Charles Dang
c17e1448f5 Removed warning for loading mp save from titlescreen 2016-02-29 11:30:31 +11:00
Charles Dang
5349552515 Add more comprehensive check for invalid button image loading (improves 0babe82b5b0f)
Also extends to button overlays
2016-02-29 11:24:44 +11:00
Charles Dang
0babe82b5b Don't load button images if none were provided 2016-02-29 10:53:08 +11:00
Charles Dang
800d2d8ab0 Fixed dialogs using unit_preview_pane having their Profile button invisible 2016-02-29 09:03:41 +11:00
Andreas
504ed49e01 Merge pull request #595 from wesnoth/guifixes
SDL2 related guifixes
2016-02-29 08:39:45 +13:00
gfgtdf
efcfe3b38a reset 'ignore oos messages' when starting a new game 2016-02-28 20:23:56 +01:00
gfgtdf
f60ee0b48f fix upkeep= parsing in unit constructor 2016-02-28 20:23:54 +01:00
gfgtdf
4a1b330279 rewrite team::change_controller_by_wml to use nonthrowing functions
we use enum.parse() instead of lexical_cast so that we don't have to
catch bad_enum_cast anymore.
2016-02-28 20:23:53 +01:00
Celtic Minstrel
9965f9e644 Fix missing prototype errors caused by typos 2016-02-28 14:14:34 -05:00
Charles Dang
0d2fe9b322 Made [effect] apply_to=status modifications take comma separated lists 2016-02-29 02:18:49 +11:00
gfgtdf
39b61a081b attempt to fix replay 'play turn' and 'play side turn'
http://gna.org/bugs/?24447

This also replaces  broken 'new replay_stop_condition();' instruction
with 'stop_replay();'
2016-02-28 15:37:46 +01:00
Charles Dang
944f68b136 Renamed the replay variable since it's no longer mp-exclusive 2016-02-29 00:57:13 +11:00
Charles Dang
85430507de Remove the correct superfluous const (fixup 540df80ff5cb) 2016-02-29 00:08:12 +11:00
Charles Dang
540df80ff5 Remove superfluous const (fixup ddb873d492db) 2016-02-29 00:00:39 +11:00
Charles Dang
ddb873d492 Fixed assertion in replays with all AI sides (bug #24439) 2016-02-28 23:28:48 +11:00
Andreas Löf
2ad8939de7 Merge branch 'guifixes' of github.com:wesnoth/wesnoth into guifixes 2016-02-28 23:17:32 +13:00
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