66625 Commits

Author SHA1 Message Date
Charles Dang
afa4bf8ea9 MP Create Game: fixed settings polluting loaded of saved games
This gives game loading a separate retval to avoid the settings specified in the dialog from overriding
those provided by the saved game.
2016-10-16 17:41:11 +11:00
Charles Dang
ae18397608 Merge pull request #828 from GregoryLundberg/GL_Require_SDL-2.0.4
Require SDL2 2.0.4 on all target platforms.
2016-10-16 16:58:58 +11:00
Gregory A Lundberg
907eb5bf7e Require SDL2 2.0.4 on all target platforms. 2016-10-16 00:55:24 -05:00
Celtic Minstrel
db5cf990de Fix use of constexpr 2016-10-16 01:45:05 -04:00
Charles Dang
a5350ea9f9 Menu Button: cleaned up a duplicate member
This makes the member name consistent with that used by other widgets.
2016-10-16 16:38:56 +11:00
Charles Dang
7e84adf348 Menu Button: added validation check for case where dropdown returned -1 as its selected value
As mentioned in the comment, this could happen if one clicks a selection and moves their mouse away too quickly.
This simply swallows that case.
2016-10-16 16:38:55 +11:00
Chris Beck
144179f694 remove an obsolete code comment, rename a variable 2016-10-16 01:14:24 -04:00
Chris Beck
2bc4cf2304 fix an off-by-one error, reformat unpremultiply function 2016-10-16 00:29:38 -04:00
Celtic Minstrel
9908335f3f XCode: Fix unit tests compilation 2016-10-16 00:24:10 -04:00
Celtic Minstrel
f7856c11d4 XCode: Build Lua as a separate static lib 2016-10-16 00:24:10 -04:00
Celtic Minstrel
0ce1bc68ca Add deprecation check for stacked_widget change 2016-10-16 00:24:10 -04:00
Celtic Minstrel
c21a64863a XCode: Some targets cleanup 2016-10-16 00:24:10 -04:00
Charles Dang
0c546be54e INSTALL: make SDL 2.0.4 minimum for Linux as well
The change to use a renderer context for the GUI2 canvas causes problems for any install using < 2.0.4.
Since 2.0.4 was already advertised as the minimum for Windows and Mac OS, this simply bumps the min version
for Linux as well.
2016-10-16 13:24:49 +11:00
Charles Dang
c489e189f2 Merge pull request #820 from GregoryLundberg/GL_fribidi_log2vis
Supress warnings
2016-10-16 12:54:25 +11:00
mattsc
d89af04a64 Update Xcode project 2016-10-15 18:52:41 -07:00
Gregory A Lundberg
26449ffc58 Supress warnings
Replacing fribidi_log2vis looks like more work than it's worth.

Checking the fribidi mailing list, I see remarks that it's not likely to go away and recommending people who hit the warnings ignore them and continue using the function.
2016-10-15 20:48:19 -05:00
Charles Dang
c2f01ce228 Updated CB projectfile 2016-10-16 12:16:28 +11:00
Charles Dang
be51353800 Merge pull request #827 from cbeck88/font_refactor
refactor font code
2016-10-16 11:47:17 +11:00
Chris Beck
7e844082f1 fix indentation 2016-10-15 13:26:44 -04:00
Chris Beck
a9f15c5795 remove code comment related to surface buffer initialization 2016-10-15 13:23:31 -04:00
Chris Beck
b280639abe rewrite cairo format conversion function to avoid squirrely endian stuff
this way, no preprocessor symbols / explicit endian detection is required...
2016-10-15 13:13:08 -04:00
Chris Beck
f82f996347 move font constants to their own compilation unit
avoids including SDL_TTF unnecessarily
2016-10-15 12:38:52 -04:00
Chris Beck
6b978a7411 fix a copyright statement 2016-10-15 11:32:47 -04:00
Charles Dang
28a45d0013 MP Staging: fixed Widget Not Found errors after switching teams 2016-10-16 01:08:15 +11:00
Chris Beck
1e1a23e083 add missing copyright statements 2016-10-15 08:13:00 -04:00
Chris Beck
42898b79f9 refactor font::ttext to use a vector for buffer 2016-10-15 08:10:37 -04:00
Chris Beck
c2df433380 move pango-related helper objects and functions to their own file
this avoids including pango unnecessarily and keeps things more
organized
2016-10-15 07:47:30 -04:00
Chris Beck
1336306884 move font_options, text.?pp to font folder
also fix indentation in previous commit
2016-10-15 06:32:37 -04:00
Chris Beck
e3417bd954 split gui1 font interface into a font_config and sdl_ttf interface
move all of these into font folder
2016-10-15 05:52:23 -04:00
Chris Beck
df8f42c26d add code comments, fixup some pre C++11 code 2016-10-15 02:30:45 -04:00
Chris Beck
683d517d7e remove unnecessary includes, boost::noncopyable, add code comments
helps to better explain what ttext is
2016-10-15 01:50:40 -04:00
Charles Dang
cf0e780ac1 Preferences: initially sort hotkey list by name 2016-10-14 18:42:28 +11:00
Charles Dang
198150613f Listbox: added second argument to set_active_sorting_option to allow selecting first sorted row
Also added documentation
2016-10-14 18:42:06 +11:00
Charles Dang
60e81be6e6 GUI2/Generator: expose a few functions as public 2016-10-14 18:18:11 +11:00
Ignacio R. Morelle
6e5633929b gui2/ttext_: Disable blinking cursor
There's an issue with textboxes across separate window instances (e.g.
when firing up the New Folder dialog in the file dialog) each getting a
blinking cursor simultaneously displayed on the screen due to timer
events persisting even when a GUI2 window isn't running. This may cause
repaint issues since the whole textbox may need to be redrawn each time
the timer fires, so it's best to disable it until I figure out a better
way to implement a unique global blinking cursor.
2016-10-14 03:33:45 -03:00
Charles Dang
1d820b2fa6 Unit Recall: initially sort by level and preserve any sort settings through dialog invocations 2016-10-14 11:34:45 +11:00
Charles Dang
425e554915 Listbox: added functions to set/get sorting order 2016-10-14 11:34:44 +11:00
Ignacio R. Morelle
5a57f0c5cf campaignd: Code formatting 2016-10-13 21:32:00 -03:00
Ignacio R. Morelle
d99817a639 campaignd: Drop unimplemented method declaration on Windows 2016-10-13 21:26:59 -03:00
Ignacio R. Morelle
3b741b6209 campaignd: Delete copy ctor now that we're C++11 2016-10-13 21:22:01 -03:00
Ignacio R. Morelle
9542417dcd campaignd: Don't allude to signals that don't exist, on Windows
Fixes Windows builds.
2016-10-13 21:20:36 -03:00
Jyrki Vesterinen
2d84467e11 Merge pull request #823 from GregoryLundberg/GL_No_FIFODIR
Suppress NO_FIFO_DIR message on WIN32
2016-10-13 19:36:28 +03:00
Jyrki Vesterinen
2cc92e881e Don't try to suppress -Wmaybe-uninitialized with Clang
According to a warning log from @mattsc, attempting to suppress
-Wmaybe-uninitialized causes a compiler warning in Clang because
it doesn't have a -Wmaybe-uninitialized warning.

(I wish Clang didn't pretend to be GCC to begin with...)
2016-10-13 19:21:20 +03:00
Charles Dang
36be1ce21e Fixed incorrect color result when using ~TC() with number of last defined side 2016-10-13 22:48:40 +11:00
ln-zookeeper
6eb6220360 Reverted the addition of submerge for Aquatic Encampment Keep 2016-10-13 12:02:43 +03:00
ln-zookeeper
b24477b233 Tweaked submerge and unit_height_adjust values for aquatic castle/camp 2016-10-13 11:55:23 +03:00
Charles Dang
403c0c624c MP Create Game: skip exit hook if loading saved game 2016-10-13 19:41:12 +11:00
Charles Dang
b19443483c Aethermaw: removed some excessive newlines in starting message 2016-10-13 19:32:32 +11:00
Ignacio R. Morelle
66915f4b93 Update about_cfg_to_wiki to handle U+2022 BULLET correctly 2016-10-13 05:29:36 -03:00
Ignacio R. Morelle
4c5b7d1f87 Fix credits 2016-10-13 05:26:13 -03:00