22873 Commits

Author SHA1 Message Date
Ignacio R. Morelle
6e5633929b gui2/ttext_: Disable blinking cursor
There's an issue with textboxes across separate window instances (e.g.
when firing up the New Folder dialog in the file dialog) each getting a
blinking cursor simultaneously displayed on the screen due to timer
events persisting even when a GUI2 window isn't running. This may cause
repaint issues since the whole textbox may need to be redrawn each time
the timer fires, so it's best to disable it until I figure out a better
way to implement a unique global blinking cursor.
2016-10-14 03:33:45 -03:00
ln-zookeeper
6eb6220360 Reverted the addition of submerge for Aquatic Encampment Keep 2016-10-13 12:02:43 +03:00
ln-zookeeper
b24477b233 Tweaked submerge and unit_height_adjust values for aquatic castle/camp 2016-10-13 11:55:23 +03:00
Charles Dang
b19443483c Aethermaw: removed some excessive newlines in starting message 2016-10-13 19:32:32 +11:00
Ignacio R. Morelle
66915f4b93 Update about_cfg_to_wiki to handle U+2022 BULLET correctly 2016-10-13 05:29:36 -03:00
Ignacio R. Morelle
4c5b7d1f87 Fix credits 2016-10-13 05:26:13 -03:00
mattsc
2c2f79545e Assassin Micro AI: remove unused parameters from function calls 2016-10-12 15:17:11 -07:00
mattsc
5770fa74f0 ai_helper: check variable type when viewing_side is required parameter
This is done because the code will not complain but silently produce
non-sensical results if, for example, the filter is passed as the first
argument to get_visible_units().
2016-10-12 07:42:33 -07:00
Charles Dang
524b4aaeea Point preferences::new_lobby at a new key that defaults to true
This makes the new MP UI opt-out for users from this point
2016-10-13 00:14:06 +11:00
Charles Dang
918e8e4102 Preferences: small tooltip grammar correction 2016-10-13 00:06:01 +11:00
Ignacio R. Morelle
007a76d72f gui2/tfile_dialog: Add support for user-defined bookmarks
Users can add and remove bookmarks from the end of the bookmarks list.
These correspond to the currently viewed directory and have its name as
their label. It's not possible to remove hardcoded bookmarks. A bookmark
may only be removed after selecting it.

In order to ensure that users will be able to remove their own bookmarks
if they match predefined paths, the bookmarks bar now matches items from
bottom to top instead of the other way around.
2016-10-12 03:11:01 -03:00
Ignacio R. Morelle
eb3bc1f0ce gui2/tfile_dialog: Rearrange some elements
The path label above the fileview now stands on its own without the
"Location:" label since it's self-explanatory for anyone who's managed
to get this far and install Wesnoth. The Delete and New Folder buttons
have had their order reversed so that destructive actions are on the
side opposite to the dialog's control buttons (OK/Cancel), the "Places"
heading no longer has a colon.
2016-10-12 03:11:01 -03:00
Ignacio R. Morelle
d1951b40b9 gui2/tfile_dialog: Add a bookmarks bar
The bookmarks bar holds predefined bookmarks (as in the stuff
src/desktop/paths.hpp exposes) and allows users to easily browse to them
in a single click. It will eventually be possible for the user to add or
remove custom bookmarks as well.

I might add a method to disable specific irrelevant bookmarks later, not
sure (e.g. nobody cares about the preferences dir when trying to find
wesnothd).
2016-10-12 03:11:01 -03:00
Ignacio R. Morelle
7630651ea0 gui2/ttext_box: Improved color scheme for the text box borders
Like in commit 7531e7ef2e4b7dc539df114024668d8696e60c8f, text boxes now
use the same border color scheme as buttons and sliders.
2016-10-12 02:00:42 -03:00
Ignacio R. Morelle
f1d89ba4a3 gui2/ttext_: Add a blinking cursor to textbox widgets
This is used by all widgets that inherit from the textbox abstract
class, ttext_. The cursor is updated every 750 ms by toggling the
cursor alpha every time. When the cursor position is set by a method
(e.g. in reaction to a keyboard event), the cursor is reset to full
alpha, and the blink timer restarted.
2016-10-12 02:00:42 -03:00
Ignacio R. Morelle
b3cf75196c gui2/canvas: Allow overriding color alpha in [line] with a formula
The color attribute specifically doesn't support formulas. Adding
support for formulas to it would present us with the issue that commas
are already part of the formula language, so we'd need to update all
existing instances accordingly. So, instead, there's this short hack
used for a very particular piece of functionality coming in the next
commit.
2016-10-12 02:00:42 -03:00
Charles Dang
0ac4c0fcfa Removed some unnecessary minimum size forcing
Using grow factors properly removes the need for these as long as the chatboxes are set to a minimum size
2016-10-12 15:41:38 +11:00
Charles Dang
cea34e70bd MP Lobby: made gamelist expand to max available height
For some reason, I swapped these grow factors in the past since the chatbox was growing... not sure why.
It works fine like this, and plus, the chatbox is now equal in height those in Staging and Join.
2016-10-12 15:38:13 +11:00
Charles Dang
5c6fe6aadc SoF S9: removed [endlevel] block in victory event (bug #25164) 2016-10-12 14:25:57 +11:00
Ignacio R. Morelle
7531e7ef2e gui2/tslider: Improved color scheme for slider grooves
This makes it so the "selected" segment of the groove (towards the
slider origin) is drawn with a brighter color than the "empty" segment
(opposite from the origin). Since this obviously wouldn't work with
RGB #FFFFFF, and the color is too distracting anyway (it was pretty much
the only widget using the general *text* color), we now use the standard
UI border colors to match buttons, checkboxes and so on. This should
hopefully help with harmonizing Wesnoth's UI color scheme across the
board.

For this purpose we also introduce a macro for a darker/shaded disabled
text color, used for the unselected segment of disabled sliders.
2016-10-11 23:43:52 -03:00
Charles Dang
860325d3df Supposed to be with f1d2488529d0 2016-10-12 13:42:23 +11:00
Charles Dang
262188c82e MP Join Game: converted dialog to team-based tree view like MP Staging 2016-10-12 12:58:10 +11:00
Gregory A Lundberg
c3006b5321 THoT S07 Name the journeymen
Make it more clear who you must have with you to be able to recruit mages.
2016-10-11 14:01:23 -05:00
Gregory A Lundberg
8dd84fb01f THoT S12 Fix bug: Masked Dwarf names
All masked dwarves should be named "Masked Dwarf"
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
31bd5fcb1f THoT S12 Note no turn limit
As always, I miss it if it's not in the objectives.
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
28adedf499 THoT S13 Fix bug: Visual artifacts
Remove items which do not fade to black properly.
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
29934ea2af THoT S11 Fix bug: Karrag does not change
The standing animation prevented the new unit type from appearing on the map. Once it showed, scrolling made it less noticable; so pre-scroll to Karrag and hold there for a while. Also, switching back failed to show immediately due to a missing redraw.
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
5379783c7b THoT S10 Where is the West Gate
The East Gate had a label. Let's do one here, as well.
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
23e712ab84 THoT S10 Be more specific
OK, so who is the West Gate commander? Ah. Dulcatulos, I see ...
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
743943c993 THoT S09 Use type_tree
No longer any need to list all the advancements.
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
3afb622136 THoT S09 Find the staff
Make a comment about the staff so it does not simply appear.
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
65405a6e00 THoT S09 Fix bug: There can be only one
Only the last [avoid] for [ai] has any effect. Roll them all together.

YUCK!
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
2b5e9933c1 THoT S08 Fix bug: No Ollin
The scene makes no sense at all if you don't capture a village. So, if you sight the Masked Dwarves before you find Ollin, have him appear and run the conversation!
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
3a31336292 THoT S08 Fix bug: Villages don't just appear
Place the burned villages before the player has a chance to see them magically appear!
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
d089940f01 THoT Fix bug: Disallow Mage immediately
When you lose the last Mage from Master Perrin’s academy, you lose the ability to recruit Mages immediately instead of at the start of the next scenario.

Also, the check was omitted from S11.
2016-10-11 13:42:15 -05:00
Gregory A Lundberg
ab890425a0 THoT S07 Ratheln leaves earlier
Have him leave immediately, rather than after more comments.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
2c390ac20b THoT S07 Fix bug: Ratheln is a defeat condition
Ratheln must remain a Hero thoughout this scenario since, if he dies, the end sequence suffers terribly. On EASY, for later scenario, he is no longer a Hero; simply Loyal.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
a373ee334b THoT S07 Mages are loyal
They're given freely, not recruited. They should be loyal.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
f274beced4 THoT S07 Fix bug: Units too late
They should appear when given, not a little while later.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
ce00a48919 THoT S07 Fix bug: Units do not appear
They're given but we don't see them because they went to the recall list. They should appear on the map.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
9db28696db THoT S06 Clean up target shroud
Use Poor Man's Radius to show just the target.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
d4e65aef81 THoT S06 Fix bug: No Ratheln
It was possible to bypass Ratheln. Use enter_hex to stop the triggering unit, and extend the tripwire to the full height of the map. No need to check Ratheln is not there since this is a one-shot which creates him.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
dff12f8ae4 THoT S06 Fix bug: Missing objective
Ratheln's death is a defeat condition. Add it to the objectives and display them so the player knows.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
0cf9ba68df THoT S05 Fix bug: Too chatty
No need to comment on every spawn. Only comment on the first time side captures a village which spawns.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
3300dd3a7a THoT S05 Fix bug: Lua error
If there is no place to put the spawn, skip spawning any more units rather than throw a Lua error.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
8c3c557791 THoT S05 Fix bug: No unit for role
The conversation works best if there is a unit for the scout role. Also, added advancements, just in case.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
90b2c79861 THoT S05 Fix bug: Variable artifacts
Separate commit because this is a logic change. Use the previous owner (owner_side) to determine if the village should spawn indigenous units. This removes a large number of variable artifacts.
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
58cf481945 THoT S05 Fix bug: Deprecated Lua function
Correct campaign Lua script for:

    warning scripting/lua: wesnoth.put_unit(x, y, unit) is deprecated. Use wesnoth.put_unit(unit, x, y) instead
2016-10-11 13:42:14 -05:00
Gregory A Lundberg
31da3d2aff THoT S04 No pile of gold
So tempting. ME WANT! But it's at the end of the scenario so no way to get it.
2016-10-11 13:42:13 -05:00
Gregory A Lundberg
8fa0ba9bf2 THoT S03 Marth-Tak cannot be dead
His death is a defeat condition. No need to check he's alive.
2016-10-11 13:42:13 -05:00