21725 Commits

Author SHA1 Message Date
gfgtdf
09e88c89d1 remove a useless prprocessor guard
in inclusion of test/multiplayer/ is already guarded with a #ifdef
MP_TEST so there is no point in using #ifdef MP_TEST in that file.
2016-02-15 18:00:43 +01:00
Elvish_Hunter
b9380e88c1 wmltools3: fixed a bug reported by Robertdebrus in PR #596
The bug consisted in the accidental removal of the 'vcdir' constant, still used by wmlindent and wmllint-1.4.
2016-02-15 00:12:47 +01:00
Ignacio R. Morelle
5e6da3f9aa gui2/tpreferences: Fix button labels case 2016-02-14 15:50:04 -03:00
ln-zookeeper
93a7f5e599 Fixed the last character of [objectives] note= getting eaten 2016-02-14 02:12:01 +02:00
Celtic Minstrel
1873b38243 Demote [option] deprecated message even further 2016-02-13 18:42:02 -05:00
Celtic Minstrel
d28365730b Demote [option] deprecated message to log 2016-02-13 18:23:07 -05:00
Ignacio R. Morelle
bd8066313c gui2/tmp_alerts_options: Substantial dialog design cleanup
This primarily consists of rearranging things slightly to make the
dialog more visually balanced, and moving text out of (non-functional)
tooltips into a more visible explanation area.

The control buttons at the bottom also get some additional padding above
so that the Defaults button doesn't look somehow visually tied to the
toggle buttons row directly above it.

Also, fixed macro definitions to match the conventions laid out in
data/gui/default/macros/_initial.cfg.
2016-02-13 06:22:15 -03:00
ln-zookeeper
0f47daf88c Removed a lot of the breeding details 2016-02-13 01:17:28 +02:00
Charles Dang
f43ed4161e taddon_list: cleaned up layout to bring it in line with production design 2016-02-13 10:09:56 +11:00
Charles Dang
63763774bc GUI WML cleanup: strip unless size_text keys as well as ones with empty attributes 2016-02-13 09:35:06 +11:00
Charles Dang
0394fe0a34 tpreferences: display descriptions of advanced preferences if available 2016-02-12 08:34:42 +11:00
Charles Dang
20350715ea Don't display Orb Color option for now 2016-02-12 01:13:33 +11:00
Charles Dang
e186a18846 Merge pull request #594 from sigurdfdragon/Help_Typo_Fix_Great_Ocean
Help: Fix typo in Help -> Encyclopedia -> Geography -> Great Ocean.
2016-02-11 16:54:26 +11:00
sigurdfdragon
56ea3a7d24 Help: Fix typo in Help -> Encyclopedia -> Geography -> Great Ocean. 2016-02-10 20:18:47 -05:00
ln-zookeeper
b6d2a685d3 Streamlined the WML for the basic terrain base and transition rules 2016-02-10 20:33:46 +02:00
Charles Dang
5d60f991a1 Merge pull request #581 from Vultraz/prefs_dialog_refactor
GUI2 prefs dialog refactor
2016-02-10 21:09:18 +11:00
Charles Dang
4e5a42cc42 tpreferences: refactored Advanced section to use a listbox
This allows the details widgets to stay in the same listbox cell as the main
displayed names
2016-02-10 19:51:08 +11:00
Charles Dang
fda94c8148 Removed unused [option] name_short keys from combobox-type advanced prefs 2016-02-10 19:51:07 +11:00
Charles Dang
acd46a8353 gui2/tmp_alerts_options: applied some formatting 2016-02-10 19:51:06 +11:00
Charles Dang
faf5d82a4e gui2/tpreferences: switch back to Alerts dialog (as opposed to tab) for now 2016-02-10 19:51:05 +11:00
Charles Dang
28acb89a77 Added advanced preferences for Adv. Graphics and Orb Colors 2016-02-10 19:51:02 +11:00
Charles Dang
9eecc28ef9 Moved 'Accept whispers from friends only' pref from Advanced to Multiplayer 2016-02-10 19:51:02 +11:00
Charles Dang
b7d56e0c11 gui2/tpreferences: implemented new gui2 Preferences dialog 2016-02-10 19:51:01 +11:00
Charles Dang
78ff082934 Merge pull request #593 from sigurdfdragon/AOI_Cleanup_&_Fixes
AOI cleanup & fixes
2016-02-10 13:05:51 +11:00
Charles Dang
b564fb7c5b Merge pull request #592 from sigurdfdragon/AOI_advisor_fix
AOI: Fix unreported bug of advisor dialog not showing in S4 & S5.
2016-02-10 13:05:36 +11:00
Charles Dang
9cfa7f55ae Merge pull request #591 from sigurdfdragon/Fix_Typo_in_Trolls_Description
Help: Fix typo in Trolls description.
2016-02-10 13:04:33 +11:00
sigurdfdragon
36683cfb9b AOI: Fix unreported bug of advisor dialog not showing in S4 & S5.
Changes a few more occurrences than needed for standardization.
2016-02-09 20:39:32 -05:00
sigurdfdragon
b8d3935a1a AOI S7: Make Elvish Rangers loyal trait clearly indicated to the player. 2016-02-09 19:44:37 -05:00
sigurdfdragon
da273c5bc9 AOI: Make Lomarfel so he has same traits in both scenarios and loyal clearly indicated. 2016-02-09 19:37:24 -05:00
sigurdfdragon
652b0c0873 AOI S3: Remove duplicate die event.
It's already included with the {HERODEATH_ERLORNAS} macro.
2016-02-09 19:04:47 -05:00
sigurdfdragon
7a035a79c2 AOI S5: Change Linaera's side name to Mages & hide side in status table.
'Mages' is more common usage in Wesnoth, and there's no reason to see that side in the status table.
2016-02-09 19:00:40 -05:00
sigurdfdragon
953a9442b3 AOI: Standardize player and enemy team_name key. 2016-02-09 18:55:15 -05:00
sigurdfdragon
c7618d95ab AOI: Standardize all recruit lists.
Using quotes, alphabetical order by id, and no spaces.
2016-02-09 18:49:45 -05:00
sigurdfdragon
3501f6eb91 Help: Fix typo in Trolls description. 2016-02-09 18:31:28 -05:00
sigurdfdragon
2fe58d3e67 Help: Fix typo in Orcs description. 2016-02-09 18:25:56 -05:00
ln-zookeeper
457e0cea74 Fixed stray pixel 2016-02-09 09:20:43 +02:00
ln-zookeeper
e7188fbfa8 Replace water->void transition with a simpler void->water transition 2016-02-09 09:19:15 +02:00
ln-zookeeper
15a235232a Some small optimization of water rules 2016-02-09 09:04:18 +02:00
gfgtdf
acc5ef3b8d fix sample lua cavegen 2016-02-08 23:38:06 +01:00
gfgtdf
527c3b1a1e fix sample lua cavegen 2016-02-08 23:37:23 +01:00
gfgtdf
fc1c9ff699 fix error in lua sample mapgenerator 2016-02-08 23:34:07 +01:00
gfgtdf
ac79ff350a improve lua sample cave generator. 2016-02-08 23:14:03 +01:00
gfgtdf
37e613b6fc Added a sample lua map generator
this is more or less the code of the cavegen as used in HttT scenario 17
ported to lua.
2016-02-08 21:22:27 +01:00
Lari Nieminen
72100d866f Remove some unnecessary uses of * in rule maps 2016-02-07 14:51:19 +02:00
Charles Dang
d21235deb5 Added definition for small-size scroll label 2016-02-06 20:19:44 +11:00
Charles Dang
352bd1cae2 Removed Titlescreen Animation option and related code 2016-02-06 20:19:42 +11:00
Charles Dang
db8c65aad8 Remove Reverse Time Graphics option 2016-02-06 20:19:41 +11:00
Charles Dang
d131f1d58c Removed the option to turn off Local ToD lighting. It is now always on. 2016-02-06 20:19:41 +11:00
Ignacio R. Morelle
677e7077ae gui2/tpreferences: initial layout 2016-02-06 20:19:39 +11:00
Charles Dang
aad0e02d10 taddon_list: strip debug borders 2016-02-05 00:20:00 +11:00