upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-16 10:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,548 Commits 51 Branches 374 Tags
Commit Graph

66548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregory A Lundberg
97b20ad60f Missing override qualifiers 2016-10-16 10:55:09 -05:00
Celtic Minstrel
3b52ae37fc Fixup unicode figure dash 2016-10-16 11:38:30 -04:00
Jyrki Vesterinen
5e2af01fba Fix build 
This involves splitting standard colors out of font/constants.cpp.
Serialization/string_utils.cpp, that is part of wesnothlib
(compiled into both client and server) uses ellipsis and Unicode minus sign
from font constants, which means that font/constants.cpp must be part of
wesnothlib as well. However, one of standard colors is evaluated by calling
inverse(const SDL_Color&) declared in sdl/utils.hpp. Sdl/utils.cpp has way
too many dependencies to live in wesnothlib.

Hence, standard colors are now in a file of their own:
font/standard_colors.cpp. That file is part of wesnoth (not wesnothlib) and
only available for the client.
 2016-10-16 18:34:22 +03:00
Chris Beck
dd165091ff fixup non-utf8 font/constants.cpp 
fixes up ebc8ddfb78a777db9077d7ef1a9dfbb78507c909
 2016-10-16 11:16:44 -04:00
Chris Beck
415cdd74e5 correct compilation errors, ODR violation 
fixes up commit 30c1a852d37c555c6b5551d03d792baf9e08040e
 2016-10-16 11:11:42 -04:00
Chris Beck
0f3fdb6064 add a code comment to unpremultiply alpha function 2016-10-16 10:14:44 -04:00
gfgtdf
3b04fecb3c attempt to fix crash when starting a mp game 
same as c2dd4c93d8 but for the mp path
 2016-10-16 15:13:00 +02:00
Charles Dang
8e3c554094 Replace utils::replace, strip, and strip_end with their Boost equivalents 2016-10-17 00:01:16 +11:00
Charles Dang
047bae7b66 Forgot to actually commit the moved files... (fixup b6ea5106ca70) 2016-10-16 23:12:47 +11:00
Charles Dang
b6ea5106ca Moved marked-up_text.*pp to font/ 2016-10-16 22:54:07 +11:00
Charles Dang
30c1a852d3 Attempt to fix compilation 2016-10-16 22:52:54 +11:00
Charles Dang
ebc8ddfb78 Move certain text constants into the constants file 2016-10-16 22:07:37 +11:00
Charles Dang
b5d6186ea2 Move some pango formatting-related functions to their own file 2016-10-16 22:06:46 +11:00
Ignacio R. Morelle
f6d6f9545c Revert "travis: Enable ccache support" 
This reverts commit 2b12dd8e427d5ea4b1b720086637c1134d4dea89.
 2016-10-16 06:24:24 -03:00
Ignacio R. Morelle
db400ed1cc Merge pull request #829 from GregoryLundberg/GL_travis 
Test for Travis and only require SDL 2.0.2
 2016-10-16 06:22:06 -03:00
Jyrki Vesterinen
988096d450 Fix build with Visual Studio 2013 
The linker complained about font constants being multiply defined,
so I moved the definitions to constants.cpp.
 2016-10-16 11:47:43 +03:00
Jyrki Vesterinen
313aa3241d Update Visual Studio project 2016-10-16 11:45:07 +03:00
Gregory A Lundberg
34dcd0657f Test for Travis and only require SDL 2.0.2 2016-10-16 03:36:57 -05:00
Ignacio R. Morelle
d2f02b553e campaignd: Delete campaignd::server::operator= too 2016-10-16 05:31:58 -03:00
Ignacio R. Morelle
07492073cc campaignd: Ignore old-style-cast warning caused by a system macro on GCC 
Somehow only happens with the Travis GCC configuration we use as of this
writing when using ccache.
 2016-10-16 05:04:27 -03:00
Ignacio R. Morelle
2b12dd8e42 travis: Enable ccache support 
This should halve build times in the best case, and only seems to expose
one GCC warning-related issue that will be addressed by the next commit.
Actual build times will continue to vary wildly based on the kind of
changes people push and the build's I/O-bound nature triggering the
limitations inherent to shared hosting services.
 2016-10-16 05:04:27 -03:00
Charles Dang
a8136a2b42 Merge pull request #819 from wesnoth/lua-helper-safe-metatables 
helper.lua: set __metatable field to guard against external access to metatables
 2016-10-16 18:10:14 +11:00
Charles Dang
fc320e463f MP Create Game: moved entry point selection to dialog postshow 
This serves two purposes:
* It should (hopefully) ensure that user-specified settings override any from the new scenario.
* Prevents it from appearing when loading saved games.
 2016-10-16 17:51:41 +11:00
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