22489 Commits

Author SHA1 Message Date
Charles Dang
96453a3e9c Unit Recruit: layout tweaks to display more recruits before needing to scroll 2016-08-06 10:21:34 +11:00
Charles Dang
c0a06e3af8 Merge pull request #725 from GregoryLundberg/GL_update_images
Fix bug: libpng warning: iCCP: known incorrect sRGB profile
2016-08-05 21:01:28 +11:00
Charles Dang
7b22051c3c Merge pull request #721 from GregoryLundberg/GL_lua_objectives
objectives.lua show_turn_counter in white
2016-08-05 21:00:56 +11:00
Jyrki Vesterinen
1e2b6ba92d Revert the campaign changes of commit a74f1054
@zookeeper pointed out to me that spelling event names with spaces is the
standard in WML, especially when setting up event listeners. Thus, changing
spelling of the names of the events fired from WML made the codebase more
inconsistent, not less.
2016-08-05 12:11:11 +03:00
Jyrki Vesterinen
a74f1054ca Always use underscores in event names
Follow-up of 3cbf249b. This commit changes event names to be written with
underscores everywhere where events are fired (or every place I found in a
quick search, anyway).
2016-08-05 08:43:47 +03:00
Celtic Minstrel
b295aab4ba Deprecate {MAGENTA_IS_THE_TEAM_COLOR}
The magenta colour is now the default flag_rgb colour if one is not specified.
2016-08-05 00:49:39 -04:00
Gregory A Lundberg
140cc946bb Fix bug: libpng warning: iCCP: known incorrect sRGB profile
Some changes in libpng 1.6+ cause it issue warning or even not work correctly with the original HP/MS sRGB profile. You will notice this in stderr:

    libpng warning: iCCP: known incorrect sRGB profile

The old profile uses a D50 whitepoint, where D65 is standard. This profile is not uncommon, being used by Adobe Photoshop, although it was not embedded into images by default.

The simplest solution is simply to remove the embedded profile from your image. This can cause a slight shift in color *IF* have have a properly calibrated system, monitor, and software.
2016-08-04 22:37:44 -05:00
Charles Dang
a6dd6c668c Ran wmlindent and fixed badly formatted code 2016-08-05 13:46:39 +11:00
Charles Dang
95fecb9d90 Small code and border cleanups 2016-08-05 05:06:52 +11:00
fendrin
f321e71685 SoF 08: Removed some more [+unit]. 2016-08-04 03:09:30 +02:00
fendrin
5a9f45ddba UtBS 01: Replace some calls to unit_utils macros with [+unit] by single macro calls.
This also fixes "Eranor" being a female Archer from time to time.
2016-08-04 02:40:36 +02:00
Charles Dang
e2d48f4482 Cleaned up some unused code
This was left around after switching the dialog to a unit preview pane widget.
2016-08-04 08:09:40 +11:00
fendrin
7e0c853f42 Campaigns: [+units] -> [units] 2016-08-03 22:04:47 +02:00
fendrin
f5e22bf03a UtBS: [+units] -> [units] 2016-08-03 21:50:43 +02:00
fendrin
bd5ff0e35f LoW: [+units] -> [units] 2016-08-03 21:45:47 +02:00
fendrin
0fd792a676 Removed a silly use of [+unit]. 2016-08-03 20:10:53 +02:00
Fabian Müller
f7c48a0222 LoW: Add Great Ogre unit. 2016-08-03 17:07:39 +02:00
Charles Dang
c2b09cbe5b tunit_preview_pane: general cleanup and functionality improvements
This includes:
* Allowing the details area to scroll should the parent dialog not be long enough.
* Scaling all displayed sprites to 144x144 while maintaining aspect ratio.
* Forcing extra width so all mainline unit names have enough space to appear.
* Removing the unused 'minimal' definition. Might be added back later.
* Fixing the borders. The internal widgets shouldn't have outside borders, since borders
  should be set for the widget instance in a containing dialog.
2016-08-04 01:11:47 +11:00
Charles Dang
5b8a64405a Load Game: used a spacer to force space in the details area 2016-08-03 14:46:39 +11:00
Charles Dang
12601cc6e2 Convert several GUI2 dialogs to use the new sorting code 2016-08-03 11:42:16 +11:00
Gregory A Lundberg
09e124aa8e Unique items: don't be a pig
And the Lord said, "Thou hast already consumed My Holy Water, thou needest another not."

And, hearing the Word of the Lord, Posieden said, "Yo! Storm Trident! Dude, look in your hand!"
2016-08-02 14:58:09 -05:00
Jyrki Vesterinen
c4d51b1bbb Add @PoignardAzur to credits 2016-08-02 15:43:09 +03:00
Celtic Minstrel
53828a01b9 New [remove_object] WML tag 2016-08-02 00:52:52 -04:00
Celtic Minstrel
6dab777f66 Accept [effect] in [modify_unit] 2016-08-02 00:01:48 -04:00
Charles Dang
853cbb7347 Forgot to add Recall dialog WML... 2016-08-02 12:23:54 +11:00
Gregory A Lundberg
ee8778a6d7 objectives.lua show_turn_counter in white
This matches the style used for OBJECTIVE_FOOTNOTE and makes the turn count more apparent.
2016-08-01 20:22:15 -05:00
Charles Dang
105fbe6bc6 Converted Recall dialog to GUI2
This also includes  the appropriate expansions and design updates to the unit_preview_pane widget.
2016-08-02 09:13:07 +11:00
gfgtdf
864d84c2b5 fix recall list lost in LoW scenario13
fixes http://gna.org/bugs/?24896
2016-08-01 14:46:03 +02:00
Andreas Löf
2360fb6260 Merge branch 'monte-carlo-damage-calculation' of https://github.com/jyrkive/wesnoth into jyrkive-monte-carlo-damage-calculation 2016-08-01 22:04:06 +12:00
Charles Dang
6080cfb969 Switch unit_preview_pane image_facing key to image_mods 2016-08-01 08:14:19 +11:00
Bär Halberkamp
fd1a776997 Change attack sounds for short swords 2016-07-31 13:10:00 -04:00
Charles Dang
639548a108 Made Attack dialog use a unit_preview_pane widget
This also adds the necessary changes to said widget to allow single-unit stats display.
It still needs to be expanded somewhat. Right now it contains the minimum required for
the attack dialog.
2016-08-01 02:17:03 +11:00
Charles Dang
db5f497fd7 Logging: fixed placement of title 2016-07-30 17:05:54 +11:00
Charles Dang
56e2a733e5 Merge pull request #674 from jyrkive/mute-in-background
Mute the music when the game loses focus
2016-07-30 16:49:21 +11:00
Charles Dang
fbef58a29a Lua console: made window fullscreen and cleaned up layout code 2016-07-30 16:46:55 +11:00
Celtic Minstrel
dc3d22a5e4 Merge pull request #710 from spixi/call_events_by_id
Allow firing an event by id instead of name.
2016-07-30 01:21:12 -04:00
Gregory A Lundberg
346d8ceac5 L S04 Update for new auto_recall sub-tag 2016-07-29 18:18:53 -05:00
Gregory A Lundberg
585412a222 AOI Update macros for new auto_recall sub-tag 2016-07-29 18:18:53 -05:00
Gregory A Lundberg
b064328102 New features for [role]
Add search_recall_list=only to search the recall list, but not the map
This is intended as a more clear way of doing 'x,y=recall,recall' and omitting search_recall_list. Note that search_recall_list=no with x,y=recall,recall produces a useless [role] which only runs the [else] block(s).

Add reassign attribute
Optional attribute, default 'yes'. If 'no' then do not re-assign the role if a unit already has the role. If 'no' and no unit has the role, the role is still assigned.

Refactor auto_recall as a sub-tag
Instead of a yes|no attribute, if there is an [auto_recall] sub-tag then recall the unit from the recall list. This acts as a [recall] tag without any StandardUnitFilterto which we add id=$unit.id and issue the recall.
2016-07-29 18:18:53 -05:00
Bär Halberkamp
4e71bbe448 Generate trait help instead of hardcoding
Introduces a new key "help_text=" in [trait]
2016-07-29 18:44:10 -04:00
Celtic Minstrel
95c4556a59 fai -> wfl in FormulaAI files 2016-07-29 12:52:10 -04:00
Charles Dang
db7d94f4f4 tunit_attack: few layout tweaks 2016-07-29 18:00:08 +11:00
Charles Dang
1dafd22365 Further text clipping fixes (bug #24707) 2016-07-29 05:21:38 +11:00
Celtic Minstrel
f828ad0eea Reduce max font scaling to avoid crashes 2016-07-28 11:48:11 -04:00
Charles Dang
9f3639d5bb Tweaked minimal slider magic numbers again so maximum value can be reached (bug #24531)
There seems to possibly be an internal issue with the slider (and more generally, the
scrollbar implementation form which it inherits) where is min/maximum_positioner_length
equal an even number, sliders with an even number of options will reach max value.

Setting it to what, in this case is 1 below the actual width of the slider image (15)
means both even and odd-numbered sliders will reach max value, however the edge is cut off.

Attempting to set the right_offset to 1 and using the above off value for the positioned
width means only sliders with an odd number of options reach max value.

The magic numbers in this commit seem to give the widget enough space to reach the end of
the slider and max values regardless of the number of options, but the internal widget dimension
calculation should perhaps be investigated in the future.
2016-07-29 01:50:19 +11:00
Charles Dang
6c98f52b82 Don't show BfW text in loadscreen, only logo 2016-07-29 01:08:53 +11:00
Charles Dang
772f78b5a0 Fixed some ext clipping with Lato in sidebar (bug #24707) 2016-07-29 00:22:50 +11:00
Charles Dang
1cfad2404f Simpler and safer GUI2 text positioning formulas 2016-07-28 23:01:35 +11:00
Charles Dang
95ab7971f8 Fixup GUI2 centered text formula 2016-07-28 21:52:48 +11:00
mattsc
3f2df87bed Recruit rushers AIs: adapt syntax to recent AI changes
This caused an error message and recruiting to be abandoned when the
recruit rushers Micro AI was used for two different sides in the same
scenario.  It was only presents since the AI refactoring done during
1.13.4+dev and did not affect any release.
2016-07-27 19:58:22 -07:00