65219 Commits

Author SHA1 Message Date
Celtic Minstrel
ad4fe895e9 Remove use of boost::unordered_map
This also moves the LuaAI's push_location_key into public
view as the map_location hash function.
2016-07-29 23:22:51 -04:00
Celtic Minstrel
7212e5963d Replace boost map_list_of with C++11 initializers 2016-07-29 23:22:50 -04:00
Charles Dang
7ccbd53a7a Convert cases of boost::next to std::next 2016-07-29 23:22:49 -04:00
Charles Dang
649b65d2ae Convert remaining boost::lexical_cast cases to our own implementation (extension of 211ba2e770) 2016-07-29 23:22:48 -04:00
Charles Dang
0ecaa78513 Use initializer lists in place of remaining boost::asign::list_of cases 2016-07-29 23:22:47 -04:00
Charles Dang
d778db8af6 Convert uses of boost integer types to their stdlib equivalents 2016-07-29 23:18:10 -04:00
Celtic Minstrel
8fa73053b8 Remove a couple more MSVC 2008 workarounds 2016-07-29 23:18:10 -04:00
Celtic Minstrel
d1728ea0c5 Remove some instances of boost::ref 2016-07-29 23:18:10 -04:00
Celtic Minstrel
ad7daee4a8 Remove a few more uses of Boost type traits and enable_if 2016-07-29 23:18:10 -04:00
Celtic Minstrel
fc97838626 Use raw string literals for regex
Also ensure some regexes cannot match null characters.
2016-07-29 23:18:10 -04:00
Celtic Minstrel
e8d148bec4 Merge pull request #698 from GregoryLundberg/GL_role
New features for [role]
2016-07-29 22:53:58 -04:00
Bär Halberkamp
07d365b9b5 Separate the description and generated description with a newline 2016-07-29 20:30:17 -04:00
Gregory A Lundberg
2a3a3fdd7b Update changelog 2016-07-29 18:28:03 -05: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
a72c68547f Add a comment to the C++
Might as well warn the programmer about this just in case someone adds or removes a recall-specific attribute.
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
Celtic Minstrel
7ca8897ff5 Merge pull request #707 from CelticMinstrel/uanim_output_cleanup
Clean up the debug output for unit animations
2016-07-29 18:54:42 -04:00
Bär Halberkamp
7b61ce2400 Merge pull request #715 from bumbadadabum/master
Generate trait help instead of hardcoding
2016-07-29 18:45:57 -04: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
ancestral
3a428e8adf Removed bug for monospace font as this is resolved 2016-07-29 16:50:58 -05:00
Celtic Minstrel
95c4556a59 fai -> wfl in FormulaAI files 2016-07-29 12:52:10 -04:00
Celtic Minstrel
53fd31554a Update RELEASE_NOTES
(Mainly spelling and grammar fixes, a few clarifications)
2016-07-29 12:52:10 -04:00
loonycyborg
b55fc012df Post-release version bump 2016-07-29 19:44:22 +03:00
loonycyborg
38306057f9 Pre-release version bump 1.13.5 2016-07-29 17:38:53 +03:00
gfgtdf
735b70ec01 Update RELEASE_NOTES 2016-07-29 16:03:35 +02:00
gfgtdf
d92c711051 fix some accidently inserted testing code. 2016-07-29 14:38:01 +02:00
gfgtdf
36d14951c6 less config copying in unit::generate_traits 2016-07-29 14:36:22 +02:00
gfgtdf
daf7b90b72 use std::move in some places 2016-07-29 14:36:22 +02:00
gfgtdf
6f021631e1 replace some std::bind with lambdas 2016-07-29 14:36:22 +02:00
gfgtdf
8bc8efb04d Revert "explicitly use std::placeholders for the second std::bind parameter"
This reverts commit b87d8e5ede060e10b5927b8721933c05d1295c0d.

This didn't completeley fix the issue, also this casues merging conflicts
with some other commits so i'm reverting this.
2016-07-29 14:36:22 +02:00
Andreas Löf
15ff7e7d1a Fix bug #24553: Prevent the display (and others) from drawing over the storyscreen.
This also adds a call to stop flips during a full redraw as a consequence of a window event.
2016-07-30 00:20:53 +12:00
loonycyborg
24d0d4fe65 Fix "End of file" error if client is redirected 2016-07-29 13:43:00 +03:00
ancestral
f3d14a3145 Removed macOS bugs which have now been resolved. 2016-07-29 03:10:25 -05:00
Charles Dang
4cd73ff590 Clear some fixed known bugs (General and Windows) 2016-07-29 18:07:03 +11:00
Charles Dang
db7d94f4f4 tunit_attack: few layout tweaks 2016-07-29 18:00:08 +11:00
Charles Dang
32e1d2ba45 Add space between weapon specials in list 2016-07-29 17:43:51 +11:00
Charles Dang
4c259e4a1d Post-release version bump 2016-07-29 16:30:12 +11:00
Charles Dang
33f33eade1 Pre-release version bump 2016-07-29 16:19:15 +11:00
gfgtdf
b87d8e5ede explicitly use std::placeholders for the second std::bind parameter
done by using this regex replace:
'(std::bind[\ \t\n\r]*\([\ \t\n\r]*[^\,]*[\ \t\n\r]*,[\
\t\n\r]*)_([1-9])' to '$1std::placeholders::_$2' (msvc syntax)

Using boost::placeholder with std::bind seeed to cause compilation
erros with some libc++ version used by dafault on some OSX versions.
2016-07-28 20:32:51 +02:00
Charles Dang
1dafd22365 Further text clipping fixes (bug #24707) 2016-07-29 05:21:38 +11:00
Charles Dang
c18fbf90da Moved some newlines around in the carryover report
Makes the minimal carryover report popups don't have excess newlines
2016-07-29 02:51:07 +11:00
Charles Dang
84dc059429 Set restore flags on a few dialogs 2016-07-29 02:51:06 +11:00
Celtic Minstrel
f828ad0eea Reduce max font scaling to avoid crashes 2016-07-28 11:48:11 -04:00
Charles Dang
7538142719 Hide GUI2 unhandled event warnings behind a define guard 2016-07-29 01:59:19 +11: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
Andreas Löf
abc64e62c8 Fix crash by reintroduce splice.
This fixes a crash that would be caused by memory incorrectly being freed
when removed from a list. Relying on splice stops that from happening.

This also fixes an exit condition when deleting handlers as depth could
sometimes not be decremented.

Finally, checks are made to made sure that an sdl_handler is either
exclusively in the global context or a different context, ensuring
that they cannot be in both.
2016-07-29 00:20:05 +12:00
Charles Dang
1cfad2404f Simpler and safer GUI2 text positioning formulas 2016-07-28 23:01:35 +11:00