23992 Commits

Author SHA1 Message Date
Jyrki Vesterinen
506ee85d2d Revert "GUI2: implemented fixed_width and fixed_height keys for all widgets"
This reverts commit 556331ac3f53f2fd58fd4e137cf86af71d5c064b.

Since the keys aren't working, the implementation shouldn't be in the
Git repository. Otherwise some poor soul will attempt to use them and
face additional work afterwards.
2017-11-15 19:04:47 +02:00
Jyrki Vesterinen
18e208e07c Revert "GUI2: removed GUI_FORCE_WIDGET_SIZE macro in favor of fixed_width/fixed_height keys"
This reverts commit 9f386ed563e84e355130a940be804d13bf5b3d9c.

fixed_width/fixed_height are broken and completely fail to block the
widget from growing.
2017-11-15 19:04:03 +02:00
sigurdfdragon
84e205382f TSG S07b: Prevent Mal M'Brin from leaving his keep
With this, the player should be unable to reach and attack him.
2017-11-15 14:46:15 +02:00
sigurdfdragon
cc38b24c42 TSG S07b: Have undead use encampments instead of castle
Fits the story better.
2017-11-15 14:46:15 +02:00
sigurdfdragon
78d3cb6391 TSG S07b: Fix erroneous dialog 2017-11-15 14:46:15 +02:00
sigurdfdragon
0119f487a8 TSG S07b: Make it explict when the defenses of Westin are strengthened 2017-11-15 14:46:15 +02:00
sigurdfdragon
08ea513130 TSG: Remove redundant title in unit names 2017-11-15 14:46:15 +02:00
sigurdfdragon
431fc60e1b TSG S03: Have elves be on their own side when appearing 2017-11-15 14:46:15 +02:00
ln-zookeeper
34c6fcd0fd Dark Forecast: Fix broken leader/faction/color selection, fixes #2147 2017-11-13 21:09:52 +02:00
sigurdfdragon
b8c90c0fad Fixup 61c33f9
The sergeant's stats are in two places.
2017-11-12 22:35:54 -05:00
josteph
408163e598 AToTB S03: Tweak hint to not assume the AI will make mistakes 2017-11-12 22:31:37 -05:00
doofus-01
70e1447366
more changes to castle to wall layering
further attempt to fix #2190
2017-11-12 17:30:27 -08:00
doofus-01
0857a5a01e
changing castle-wall layering when next to Xos
to address issue #2190
2017-11-12 16:32:27 -08:00
doofus-01
a59965c591 clipping upper tips of diagonal borders to deal with overlap 2017-11-13 10:33:18 +11:00
doofus-01
58ff9c42c8 hack to keep carpets from spilling into castles 2017-11-13 10:33:18 +11:00
doofus-01
e02c4a140d adjust outer edges to avoid borders overlapping interior 2017-11-13 10:33:18 +11:00
Charles Dang
417134a942 EI: further improvements to throne room map
[ci skip]

Carpet, sconces, etc.
2017-11-12 16:00:13 +11:00
sigurdfdragon
61c33f9c4c HttT S19c: Give player a head start on leveling the sergeant 2017-11-12 14:36:40 +11:00
sigurdfdragon
1f77738ef3 HttT S20b: Adjust Saurian gold & income now that there is underground time 2017-11-12 14:36:40 +11:00
sigurdfdragon
28dad5b425 HttT S20b: Fix team name 2017-11-12 14:36:40 +11:00
sigurdfdragon
2fe0ebe48c HttT S20b: Fix punctuation 2017-11-12 14:36:40 +11:00
sigurdfdragon
9629b59d4a HttT S20b: Set time areas for inside and outside of caves
From Alarantalara in the forums:
https://forums.wesnoth.org/viewtopic.php?f=38&t=32861&hilit=underground+channels&start=15#p475971
2017-11-12 14:36:40 +11:00
doofus-01
75a52bd9c6
Three carpet terrains (#2114)
Squash and merge for three carpets terrain PR.

* Initial commit for carpets.  WML, alignment, and demo only, images are unshaded place-holders.

* adding basic shading and better corner images

* completed shading for existing images

* refined large corner carpet rules

* got rid of some commented out leftovers

* initial commit for cave rug, Iwd

* regular carpet files, incomplete for now

* completed regular rug

* changed cave-rug underlayer to cave path instead of dark flagstones, and changed all rug terrain codes

* fixing some transition WML filtering for Urc (cave carpet)
2017-11-11 18:15:22 -08:00
gfgtdf
fcf8272abf
fix bug in feeding code
wesnoth.current.event_context might not contain all information if the die event was triggered by wml ([fire_event]), this made wesnoth.get_unit error (invalid argument)
2017-11-11 13:50:35 +01:00
Charles Dang
9f386ed563 GUI2: removed GUI_FORCE_WIDGET_SIZE macro in favor of fixed_width/fixed_height keys
[ci skip]
2017-11-11 23:12:14 +11:00
Charles Dang
556331ac3f GUI2: implemented fixed_width and fixed_height keys for all widgets
This is meant to be a cleaner replacement to the [size_lock] widget. Both keys are optional,
in which case the layout engine will assume dynamic sizing for that dimension. Dynamic sizing
will also occur if either the fixed with or height evaluates to 0 or less.
2017-11-11 23:11:24 +11:00
ln-zookeeper
ec388ebe55 UtBS S06a: Remove mention of use of poison not usually being tolerated 2017-11-10 13:23:56 +02:00
Charles Dang
457d42f200 Removed unused sort_list and iconize_list MP preferences
These have no effect in the GUI2 lobby, nor do I intend to make use of them (plus the lobby has
its own sort controls anyway). I'm assuming they were for the GUI1 lobby.
2017-11-10 14:31:55 +11:00
Charles Dang
71b32cec16 Lobby Main: tweak player list entry borders
[ci skip]

No wonder this list looked messy. The labels didn't have full borders!
2017-11-10 13:05:29 +11:00
mattsc
3b2077fdc3 Fast Micro AI ai_helper functions: fix rarely occurring bug
When the AI moves a unit out of the way for another unit’s move, it is
occasionally possible for the former unit to use up all its movement
points (e.g. if it has few MP or on narrow crowded maps). If that unit
is on the list to be moved later during the same sequence, this caused
ai_helper.robust_move_and_attack() to return nil, which then made the
Fast Micro AI produce an error message.
2017-11-08 22:33:24 -08:00
Alexander van Gessel
dc873f4627 Add larger blur testcase 2017-11-06 15:58:22 +11:00
Charles Dang
961c8c05d3 MP Lobby: cleaned up WML layout
[ci skip]

This mostly focused on formatting and reducing the number of sub-grids in the player tree area.
2017-11-05 22:22:15 +11:00
Elvish_Hunter
df4e424db0 moved a have_icon flag that caused wmlscope to not find attack icons any more 2017-11-01 13:46:31 +01:00
Elvish_Hunter
fca4795f30 wmlscope: fixed a bug that caused UMC map paths to not be found
Due to the new regex used, the tilde before UMC paths was now collected but never removed from the paths.
2017-11-01 13:46:31 +01:00
Severin Glöckner
725815afa2 add an "optional objective" caption
In case of tsg7a neither alternative nor bonus objective fits

[ci skip]
2017-11-01 12:45:21 +11:00
Charles Dang
fa14cf65e1 MP Lobby: right-align status text
[ci skip]

This prevents status text from sometimes floating off to the left if the status label shrinks but
a relayout hasn't occurred. In that case, the label widget's area would be larger than needed for
the text, and since left-align is the default setting, the next text gets stuck weirdly aligned.
2017-11-01 11:18:40 +11:00
Charles Dang
37b52b2fea AToTB: tweak positioning of campaign icon
[ci skip]

Centers it more with respect to the others.
2017-10-31 09:56:47 +11:00
Charles Dang
5f0bdb4c28 Made Hornshark Island Lua file an actual Lua file
[ci skip]

Also simplified the Lua contained within. No need to create a local function just to immediately invoke it.
2017-10-31 09:35:27 +11:00
jostephd
e0efa082d7 HttT S14: Tweak dialog to be more archaic
Also add myself to contributors at @Vultraz's invitation.
2017-10-30 04:41:36 +11:00
sigurdfdragon
38be1b600d T S02: Add a message about the status table 2017-10-30 04:40:59 +11:00
Gregory A Lundberg
761f323f43 Fix editor help incomplete sentence.
Replace the sentence to make it clear the Starting Tool marks both the team leader, and named special, locations.

Closes #2085.

[ci skip]
2017-10-29 11:43:05 -05:00
Charles Dang
b1ad293ccd GUI2: removed unused MP Command Wrapper dialog
This was the equivalent of the Player Info dialog for the old GUI1 MP Lobby, and is now unused.
The new GUI2 lobby uses the aforementioned Player Info dialog. The functionality is basically
the same, though, except the send-private-message interface is more streamlined in the new lobby.
2017-10-29 16:56:16 +11:00
Charles Dang
0737736d3c MP Lobby: completely redesigned game entry layout
I did one of these about a year ago, but in the time since I realize it was honestly really crowded
and had some fundamental problems (for example, the listbox would get a horizontal scrollbar if a game
with a lot of mods was started).

This time around, I've focused on simplicity. The main changes:
* The minimap has been made 10 px larger. This was to accommodate the 5 px borders, so now the actual
  map image is 72x72.
* Game name and scenario name have swapped places, and the latter is now larger.
* Game names are no longer colorized based on the number of vacant slots or whether you can observe
  the game or not.
* The Turns/Slots label coloring has been toned down and been made larger. It is now either white
  (game has started), green (vacant slots available), or yellow (vacant slots available for reloaded game).
* The Turns limit  no longer displays "/-" for games with unlimited turns. Now you just get "Turn n".
* Due to 1bfa170856ed, proper names of all missing content is displayed. I also got rid of those
  "Unknown Scenario"/"Unknown Campaign" labels in favor of a simple red-color game type token (S or C),
  respectively.
* All game setting icons have been moved to a tooltip attached to an info icon, except those for
  Password Required and Observes Allowed.
* The info icon will also change color (and its tooltip display a message) if the player need to download
  additional content to join that game.
2017-10-29 16:55:42 +11:00
sigurdfdragon
e2b7b77adf AToTB: Add a hint on easy difficulty for each objective in the campaign
Also replaces previous hint for S01 with a more direct hint
2017-10-28 19:50:39 -04:00
sigurdfdragon
45ae47e5ca AToTB: Add hint macro
An expanded version of the one in AOI
2017-10-28 19:50:39 -04:00
gfgtdf
e3e2747009 use step_size for exp modifer slider 2017-10-29 01:35:50 +02:00
sigurdfdragon
7474c7f599 AToTB: Facing improvements 2017-10-28 15:12:59 -04:00
jostephd
0f5f8dccaf HttT S22: Grammar fix in Li'sar's dialog 2017-10-29 05:19:32 +11:00
jostephd
e4412d2646 HttT: fix grammar in Moremirmu's farewell 2017-10-28 11:24:34 +11:00
sigurdfdragon
ca853a0607 Campaigns: Deploy Cutscene_Minimal theme for dialog only scenarios
Used for scenarios that are dialog only and use [endlevel] linger=no.
Two scenarios in NR had linger=no added for Cutscene_Minimal use.
2017-10-28 08:52:15 +11:00