Commit graph

66063 commits

Author SHA1 Message Date
Celtic Minstrel
185fca8444 Misc WIP 2016-09-18 18:12:38 -04:00
Celtic Minstrel
6d8e44a4f0 Try floating textbox as popup instead of a standalone widget 2016-09-18 17:37:27 -04:00
Celtic Minstrel
916f8f63ca Use GUI2 for floating textboxes (WIP) 2016-09-18 16:00:07 -04:00
Celtic Minstrel
a63903cca0 Use FAIL() instead of VALIDATE(false) 2016-09-18 15:58:03 -04:00
Celtic Minstrel
1816e1147f Remove asserts.hpp
This file seemed to be some sort of reimplementation of <cassert> except
with some "feature" of trying to force the debugger to hit a breakpoint.
However, any decent debugger already hits a breakpoint with a standard
assert(), and this file really only served to make it harder to see the
actual error when using a Windows console.

Some instances of these macros were replaced with assert(), others with
VALIDATE() which instead throws an exception (and possibly puts up a
dialog, if the exception is caught before main()).

A few other related changes that got mixed in:
- Several error conditions now have a better error message (or indeed
  any error message at all)
- Removed an unnecessary use of std::distance on a Boost iterator range.
- Removed a large chunk of code which did nothing but construct a widget
  builder and then crash; the code was unreachable since an earlier loop
  did the same thing (without crashing), and the comment seems to suggest
  that it was a (seemingly no longer necessary) workaround for some buggy
  compilers / linkers.
- noreturn added to the list of compatibilty C++11 features in global.hpp
  (Of supported compilers, only VC12 lacks the new [[attribute]] syntax.)
- Fix detection of GCC in global.hpp

# Conflicts:
#	src/gui/widgets/settings.cpp
2016-09-18 15:57:47 -04:00
doofus-01
376d45a292 new terrain: Merfolk or aquatic camp (#773)
* adding aquatic encampment terrain

* Update changelog

* remove hardwired terrain codes and image-path from aquatic.cfg

* removed wood.png images

* touch-up to stone-posts in Kme-Cme transition
2016-09-18 13:23:38 +03:00
Lari Nieminen
8397201f60 Merge pull request #789 from GregoryLundberg/GL_HttT_S23_objectives
HttT S23 Fix bug: Unclear objective
2016-09-18 12:31:34 +03:00
gfgtdf
f2635e5ad6 Update changelog 2016-09-18 11:29:11 +02:00
Gregory A Lundberg
fc4c75e56d HttT S23 Fix bug: Unclear objective
The bonus is (1) recruit Knights and (2) the defeated leaders join you for the Battle for Wesnoth. You do not need to defeat all four for this.
2016-09-18 02:54:11 -05:00
mattsc
0e87d7fd43 High XP attack CA: respect the default 'avoid' aspect 2016-09-17 16:41:41 -07:00
gfgtdf
55edd99c3e attempt to fix wrong recruitlist in UtBS 1 2016-09-17 21:12:35 +02:00
gfgtdf
60d114b606 finish moving cavegen (cave_map_generator.cpp) to lua.
This map generator is used in HttT 17 and SoF 4. which needed to be updated aswell.

With this we finally have a lua generator that is used in mainline and that
can be used an an example by wml authors who want to write other map generators.

Unfortunateley there are still umc add ons in 1.12 that use
scenario_generation=cave so i didn't remove the cpp implementation yet.
2016-09-17 20:52:49 +02:00
mattsc
304cb0dd1a [tunnel] tag: change default for pass_allied_units key to yes
This way it is consistent with how all other moves are done by default.
2016-09-17 09:12:12 -07:00
Charles Dang
33653e3969 Reduced chatbox size slightly 2016-09-18 03:01:03 +11:00
Celtic Minstrel
31a972242a When --wconsole causes the allocation of a new console,
print a 'press enter to continue' message when the program
terminates due to a caught exception.
2016-09-17 11:53:27 -04:00
Celtic Minstrel
8ceac00cd3 Finish support for GUI2 themes
A test theme that replaces one window and one window definition appears to
work correctly now. There is still no option in Preferences to change
the theme. Maybe that can be done when there actually are multiple themes.
2016-09-17 11:53:26 -04:00
mattsc
b84ec9f775 Micro AIs: fix attacks aspect setup when ca_id= key not given
This is an optional key of the [micro_ai] tag.
2016-09-17 08:33:55 -07:00
Celtic Minstrel
c9cbdb287d Fix MSVC 2013 build 2016-09-16 22:17:47 -04:00
Celtic Minstrel
946be0c02c ~ADJUST_ALPHA() now takes formula 2016-09-16 19:56:49 -04:00
Lari Nieminen
6d36550e1e Merge pull request #731 from GregoryLundberg/GL_HttT_S05b_use_advisor
HttT S05b Use Advisor
2016-09-17 01:07:31 +03:00
Lari Nieminen
1ab9b923df Merge pull request #735 from GregoryLundberg/GL_HttT_S13_snow_ditritus
HttT S13 Snow Detritus
2016-09-17 01:03:05 +03:00
Gregory A Lundberg
9bf3f91503 HttT S05b Use an Advisor
There was a TODO to use an actual unit to speak when the ship finally arrives, and to use the line on both victory events.
2016-09-16 16:53:54 -05:00
Gregory A Lundberg
0caaaaa596 HttT S13 Add some random snow
The amount of snow is based upon how quickly you made it through S12 (Northern Winter). It is 1/3rd the coverage from S12, so it varries from 0 to 33% total coverage of the map, since we don't want to really bog down the player. At 1/3rd coverage, if S12 was won on the last possible turn the player here should only lose a turn or two getting to the exits.
2016-09-16 16:51:00 -05:00
gfgtdf
8aa373246c cleanup gamemap::overlay 2016-09-16 22:35:43 +02:00
gfgtdf
96a8635ed9 fix travis build 2016-09-16 22:35:43 +02:00
gfgtdf
e93c6ae75e make filter never pass on off-map locations
multiple mainline tags, specially [store_locations] assume that filter
only returns valid locations. This commit fixes an error in TSG scneario
'06 March'.
2016-09-16 22:35:43 +02:00
gfgtdf
94611c6967 remove gamema::bordercache and gamema::terrainfrequencycache
Both are not used anymore because maps now always include a border and
gamemap::get_weighted_terrain_frequencies() was removed.
2016-09-16 22:35:42 +02:00
gfgtdf
296faefa20 remove gamemap.border_size_
This also fixes a msvc compile warning in src/scripting/lua_common.cpp
2016-09-16 22:35:42 +02:00
gfgtdf
d9a7729dbc fix [terrain_mask][rule]use_old=yes 2016-09-16 22:35:42 +02:00
gfgtdf
49621e3d2a remove border parameter from gamemap::overlay
This also moves the "map_data" atribute_value->sting conversion to the
game_board class becasue the config writing also happens in there.

This prepares a patch to remove the border_size_ member from
the gamemap object.
2016-09-16 22:35:42 +02:00
gfgtdf
62bbab330d remove unused code. 2016-09-16 22:35:42 +02:00
gfgtdf
050ef3ecd9 make gamemap.tiles_ non-jagged 2016-09-16 22:35:42 +02:00
gfgtdf
e8bf29c241 clean some includes
this contains a fix in  playcampaign.cpp where an object was accidently
copied.
2016-09-16 22:35:41 +02:00
gfgtdf
b43e5e697e remove an include 2016-09-16 22:35:41 +02:00
gfgtdf
3de50e5263 also mark terrains in map border as encountered. 2016-09-16 22:35:41 +02:00
gfgtdf
553ac0fd05 add wml_x/y() getter & setter in map_location 2016-09-16 22:35:41 +02:00
Lari Nieminen
f5b4ecf0c3 Merge pull request #736 from GregoryLundberg/GL_HttT_S20b_wose_assistance
HttT S20b Wose Assistance
2016-09-16 23:25:43 +03:00
Gregory A Lundberg
d4ec024048 HttT S20b Wose assistance quest
Help the wose and get a book which grants Elvish Ranger-like abilities in forest: move 1, defense 70% and ambush.
2016-09-16 15:22:42 -05:00
gfgtdf
fe85fa86cb Merge pull request #772 from GregoryLundberg/GL_allow_no_starting_positions
Fix bug: Map may not have starting positions
2016-09-16 22:12:25 +02:00
Lari Nieminen
479e9062db Merge pull request #737 from GregoryLundberg/GL_HttT_S22_gryphons_return
HttT S22 Gryphons Return
2016-09-16 23:04:54 +03:00
Gregory A Lundberg
898cf3b35d HttT S22 Gryphons return
This was an old TODO, now you know what that display was about at the end of S10!
2016-09-16 15:01:26 -05:00
Bär Halberkamp
6df17b37f4 EI: Rebalance S2 2016-09-16 19:10:23 +02:00
Charles Dang
9682df6ad0 Game Version: small max height bump to avoid a scrollbar in tab 2 2016-09-17 04:08:24 +11:00
Charles Dang
b48d08d687 Drop Down List: some border fixes
This fixes cases where the image height exceeded the label borders, which would lead to options
being too close together
2016-09-17 04:01:09 +11:00
Charles Dang
bb6baf8a78 Fixed bug where entering Preferences would clear saved password
After refactoring Prefs to use dialog fields, set_remember_password was called every time the dialog
closed. prv::password wasn't initialized at that point, meaning the password was always set to "".
This fixes the bug by explicitly clearing it if false is passed instead of setting it every time.

Previous iterations of the Prefs dialog only called the options setters when they were selected, meaning
this never came up as an issue. Toggling the option off would clear the saved password, and toggling it on
would leave it empty until it was re-entered.
2016-09-17 03:49:38 +11:00
Charles Dang
cf56400996 MP Create: significant layout improvements 2016-09-17 01:57:33 +11:00
Charles Dang
94b092fa9d Added a definition for a really large button 2016-09-17 01:54:41 +11:00
Celtic Minstrel
bc7b27e496 Minor end credits tweaks
- Increase max scroll speed
- Make help text smaller
2016-09-16 10:47:59 -04:00
Celtic Minstrel
076c327d56 "Reactivate" removed asserts as a log message 2016-09-16 10:42:48 -04:00
Charles Dang
33e21fda4a Commented out some aserts that were causing problems in a few places
Specifically, if you applied a filter that matched no games and switched to the campaigns view in
MP Create, you'd trigger the vertical list assert. If you enabled horizontal_grow = true on the
tab bar (a horizontal listbox) in the same dialog, you'd trigger the horizontal list assert.
2016-09-17 01:32:41 +11:00