Commit graph

157 commits

Author SHA1 Message Date
0d1f1067bc Merge remote-tracking branch 'upstream/develop' into ryzomcore 2018-10-14 20:05:30 +02:00
root
cf1db62ab8 correction pour la compilation sous windows à cause des merges RC mal fait 2018-03-25 12:04:43 +02:00
1c898ea0b2 Merge branch 'ryzomcore' into ryzomcore+develop
# Conflicts:
#	.hgtags
#	.travis.yml
#	code/CMakeModules/FindMSVC.cmake
#	code/ryzom/client/src/steam_client.cpp
2018-03-24 18:18:50 +01:00
kervala
df032e220e Fixed: CURL also depends on libunistring under OS X
--HG--
branch : develop
2018-08-07 16:02:34 +02:00
kervala
dd517424c7 Fixed: CURL also depends on libidn2 and libpsl under OS X
--HG--
branch : develop
2018-08-07 13:38:00 +02:00
kervala
a0c3a3adc5 Fixed: Link nelgui to Security framework (fix compilation with curl using DarwinSSL backend)
--HG--
branch : develop
2018-08-07 13:29:36 +02:00
kervala
4df0fd37f3 Changed: Define and use LIB_SUFFIX
--HG--
branch : develop
2018-07-28 11:45:49 +02:00
kervala
0bd577310d Added: New CMake modules to find NeL and Ryzom GameShare
--HG--
branch : develop
2018-07-28 11:44:33 +02:00
kervala
d9e509d3cc Changed: NeL/Ryzom Core Version 1.0.0 (why to keep a 0.x version for almost 20 years ?)
--HG--
branch : develop
2018-07-28 11:38:48 +02:00
kervala
307eb77e63 Changed: Generate version_nl.h in include/nel/misc
--HG--
branch : develop
2018-07-28 11:31:32 +02:00
kervala
41d2b26d1a Changed: Link dynamically to existing system libs only
--HG--
branch : develop
2018-07-18 22:17:04 +02:00
kervala
7b23be0c46 Fixed: Compilation under Linux with Qt 5.10
--HG--
branch : develop
2018-07-18 10:40:36 +02:00
Nimetu
c228349098 Added: Personal projects directory
--HG--
branch : develop
2018-05-28 14:36:58 +03:00
kervala
450181f244 Fixed: Always link to Crypt32.lib for OpenSSL under Windows
--HG--
branch : develop
2017-10-03 14:32:13 +02:00
kervala
ac7474c7ba Merge with develop
--HG--
branch : compatibility-develop
2017-10-01 15:37:51 +02:00
kervala
30c6a7a935 Changed: CMake policy CMP0005 will be removed soon so don't use it
--HG--
branch : develop
2017-10-01 15:17:41 +02:00
kervala
8acaa65e04 Fixed: Compilation with OpenSSL 1.1.0
--HG--
branch : develop
2017-10-01 15:17:10 +02:00
kervala
36bd31c809 Changed: Update Ryzom version to 3.2.1
--HG--
branch : compatibility-develop
2017-07-13 20:59:42 +02:00
kervala
cb55615659 Merge with develop
--HG--
branch : compatibility-develop
2017-06-20 12:31:31 +02:00
kervala
0d12fe5604 Fixed: Case of CMake Freetype module
--HG--
branch : develop
2017-06-20 12:27:05 +02:00
Riasan
abe569ce51 Changed: increased RYZOM_VERSION_MINOR for comming client Patch
--HG--
branch : compatibility-develop
2017-06-19 21:46:53 +02:00
kervala
d0a199d22d Merge with develop
--HG--
branch : compatibility-develop
2017-04-21 11:06:24 +02:00
kervala
8dca705f73 Fixed: Misc depends on Carbon under OS X
--HG--
branch : develop
2017-04-21 11:03:39 +02:00
kervala
ef625959f0 Changed: Version 3.1.0
--HG--
branch : compatibility-develop
2016-12-08 18:19:36 +01:00
kervala
5844a4ff32 Changed: Ryzom version 3.0.2
--HG--
branch : compatibility-develop
2016-11-02 09:21:10 +01:00
kervala
7a894c1506 Merge with develop
--HG--
branch : compatibility-develop
2016-10-31 19:03:04 +01:00
kervala
637895e578 Fixed: Update libovr detection
--HG--
branch : develop
2016-10-31 19:00:19 +01:00
kervala
0c30ddd380 Changed: Client 3.0.1
--HG--
branch : compatibility-develop
2016-10-28 14:48:25 +02:00
kervala
1e1f6ece8b Merge with develop
--HG--
branch : compatibility-develop
2016-10-27 16:48:45 +02:00
kervala
19e8ee1d05 Changed: Simplified all ENDIF and ELSE
--HG--
branch : develop
2016-10-27 10:54:09 +02:00
kervala
fe9def78f0 Merge with develop
--HG--
branch : compatibility-develop
2016-10-15 10:37:56 +02:00
kervala
0f8a397408 Changed: Qt depends too on xcb-glx
--HG--
branch : develop
2016-10-15 10:37:29 +02:00
kervala
166acdf69c Merge with develop
--HG--
branch : compatibility-develop
2016-07-27 12:49:01 +02:00
kervala
8ba09b0c56 Changed: Winch Gate instead of Winchgate
--HG--
branch : develop
2016-07-27 12:48:16 +02:00
kervala
465609f942 Merge with develop
--HG--
branch : compatibility-develop
2016-04-13 20:37:30 +02:00
kervala
e82ada1026 Fixed: Link to freetype when using Qt
--HG--
branch : develop
2016-04-13 20:36:43 +02:00
kervala
54ac3bd1d5 Merge with develop
--HG--
branch : compatibility-develop
2016-04-12 19:55:05 +02:00
kervala
32ce9a47cb Fixed: Compilation with Qt 5.6
--HG--
branch : develop
2016-04-12 19:54:05 +02:00
kervala
ef5b22045c Changed: Version 3.0.0
--HG--
branch : compatibility-develop
2016-04-09 12:53:30 +02:00
kervala
91f995b259 Merge with develop
--HG--
branch : compatibility-develop
2016-02-21 14:22:18 +01:00
kervala
baf9f6c7f9 Changed: Make OpenSSL required
--HG--
branch : develop
2016-02-21 14:21:49 +01:00
kervala
5284bd37f1 Merge with develop
--HG--
branch : compatibility-develop
2016-02-21 13:22:22 +01:00
kervala
d18c7b24f5 Changed: Don't look for Qt5WinExtras in root CmakeLists.txt
--HG--
branch : develop
2016-02-21 13:19:23 +01:00
kervala
3161ec2a77 Merge with develop
--HG--
branch : compatibility-develop
2016-02-20 19:29:00 +01:00
kaetemi
30c5a88eb7 Sorry
--HG--
branch : develop
2016-02-15 22:09:43 +01:00
kervala
b5ef1ace01 Merge with develop
--HG--
branch : compatibility-develop
2016-02-04 15:25:39 +01:00
kervala
0f727e7714 Changed: Only link to Qt5::WinExtras if required
--HG--
branch : develop
2016-02-04 15:23:02 +01:00
kervala
325242c2e4 Merge with develop
--HG--
branch : compatibility-develop
2016-01-26 22:44:40 +01:00
kervala
af2f38612a Fixed: Remove inherited dependency on libxml2 for all projects
--HG--
branch : develop
2016-01-26 22:30:13 +01:00
kervala
d03e896702 Changed: Ryzom version 2.9.0 (stable version will be 3.0.0)
--HG--
branch : compatibility-develop
2016-01-20 13:08:23 +01:00