Commit Graph

29 Commits

Author SHA1 Message Date
Sergii Pylypenko
3ba683874b Merge remote-tracking branch 'origin/master' into HEAD 2019-04-23 18:16:24 +03:00
glx
c540d72445 Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32 2018-12-27 18:09:16 +01:00
Michael Lutz
fa587ad3cc Codechange: [OSX] Use 10.6+ APIs to get the path for a font where available. 2018-04-10 23:30:01 +02:00
Sergii Pylypenko
cfef9c8f29 Better font detection 2016-03-27 22:57:26 +03:00
Sergii Pylypenko
2603e6b5e3 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/os/unix/unix.cpp
	src/widgets/dropdown.cpp
2014-08-19 19:21:47 +03:00
planetmaker
bcb9c64ac8 (svn r26709) -Fix (r15892 and others) [FS#6069]: [OSX] Compilation fails with some lzo2 versions if we define __LP64__ as 0 instead of checking whether it is defined (kernigh2) 2014-07-30 20:19:29 +00:00
planetmaker
cd084721b4 (svn r26709) -Fix (r15892 and others) [FS#6069]: [OSX] Compilation fails with some lzo2 versions if we define __LP64__ as 0 instead of checking whether it is defined (kernigh2) 2014-07-30 20:19:29 +00:00
Sergii Pylypenko
91ebce1a9c Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/console_gui.cpp
	src/genworld_gui.cpp
	src/group_gui.cpp
	src/misc_gui.cpp
	src/settings_gui.cpp
	src/widgets/settings_widget.h
2014-06-04 17:09:23 +03:00
rubidium
9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 2014-04-25 15:40:32 +00:00
rubidium
0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
rubidium
2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 2014-04-23 20:13:33 +00:00
pelya
6dc8be0332 Android patches 2014-03-15 19:44:27 +02:00
michi_cc
765e7d349e (svn r25676) -Fix: [Win32] The ANSI code page is not UTF-8 for non-Unicode builds. 2013-08-05 20:36:55 +00:00
michi_cc
8c7a4db53a (svn r25676) -Fix: [Win32] The ANSI code page is not UTF-8 for non-Unicode builds. 2013-08-05 20:36:55 +00:00
michi_cc
3569a4fe5a (svn r25663) -Fix [FS#4857]: [OSX] Monospace font detection. 2013-08-05 20:36:06 +00:00
michi_cc
3cd7eeb160 (svn r25663) -Fix [FS#4857]: [OSX] Monospace font detection. 2013-08-05 20:36:06 +00:00
michi_cc
313cdb579e (svn r25662) -Fix: [OSX] Better rejection of unsuitable fonts during fallback auto-detection. 2013-08-05 20:36:03 +00:00
michi_cc
4ab4e5a9e4 (svn r25662) -Fix: [OSX] Better rejection of unsuitable fonts during fallback auto-detection. 2013-08-05 20:36:03 +00:00
michi_cc
d5681d7f6d (svn r25661) -Fix [FS#4847]: [OSX] Rework font detection to work even if no default font sprites are present. 2013-08-05 20:35:59 +00:00
michi_cc
6c1444b992 (svn r25661) -Fix [FS#4847]: [OSX] Rework font detection to work even if no default font sprites are present. 2013-08-05 20:35:59 +00:00
rubidium
aa3c106843 (svn r25450) -Fix: compilation without freetype 2013-06-23 18:32:02 +00:00
rubidium
25f70e18b4 (svn r25450) -Fix: compilation without freetype 2013-06-23 18:32:02 +00:00
planetmaker
8b25444300 (svn r25447) -Fix (r25437): [OSX] Compilation was broken 2013-06-23 17:14:34 +00:00
planetmaker
c26002e621 (svn r25447) -Fix (r25437): [OSX] Compilation was broken 2013-06-23 17:14:34 +00:00
rubidium
97a42f4b4f (svn r25440) -Fix: MSVC compilation error 2013-06-23 15:27:55 +00:00
rubidium
44f1d2230a (svn r25440) -Fix: MSVC compilation error 2013-06-23 15:27:55 +00:00
rubidium
13c450a66b (svn r25436) -Codechange: split the font detection code out of the font caching code 2013-06-23 15:20:23 +00:00
rubidium
d99113bd00 (svn r25436) -Codechange: split the font detection code out of the font caching code 2013-06-23 15:20:23 +00:00