Commit graph

216 commits

Author SHA1 Message Date
kervala
f7c0d296fa Fixed: Load Steam library if Ryzom compiled with WITH_STEAM, request auth session ticket and send it to login server 2016-02-10 18:46:50 +01:00
SIELA1915
fbc25847e1 corrections for Khanatising the code 2016-02-09 23:09:12 +01:00
kervala
3c75bdb82e Merge with develop
--HG--
branch : compatibility-develop
2016-02-02 14:33:32 +01:00
kervala
185c48b026 Merge with develop 2016-02-02 14:33:32 +01:00
kervala
dd695f0b1f Fixed: Compile seven_zip for tools
--HG--
branch : develop
2016-02-02 14:31:57 +01:00
kervala
78d17f478d Fixed: Compile seven_zip for tools 2016-02-02 14:31:57 +01:00
SIELA1915
223139d53c merged 2016-01-30 20:51:30 +01:00
kervala
2583139ea9 Merge with develop 2016-01-26 22:44:40 +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
237b6767b0 Fixed: Remove inherited dependency on libxml2 for all projects 2016-01-26 22:30:13 +01:00
kervala
ebe4f7406d Removed: installscript_osx.vdf because we manage it directly in code now 2016-01-21 10:15:09 +01:00
kervala
7abbc07bc7 Removed: installscript_osx.vdf because we manage it directly in code now
--HG--
branch : compatibility-develop
2016-01-21 10:15:09 +01:00
SIELA1915
93d2b80966 Adjustments to give more options to do custom emotes, "Khanatization" for the Mac Client, changements to the key system. 2016-01-13 19:26:28 +01:00
kervala
acd0d6d88a Merge with develop 2016-01-11 13:53:32 +01:00
kervala
f3a971fc21 Merge with develop
--HG--
branch : compatibility-develop
2016-01-11 13:53:32 +01:00
kervala
adb1cbf4bc Fixed: Wrong directory 2016-01-11 13:53:01 +01:00
kervala
7104a6cb29 Fixed: Wrong directory
--HG--
branch : develop
2016-01-11 13:53:01 +01:00
kervala
9ec144c2b5 Merge with develop 2016-01-11 12:55:47 +01:00
kervala
9a342f7acf Merge with develop
--HG--
branch : compatibility-develop
2016-01-11 12:55:47 +01:00
kervala
1a56512b24 Fixed: Error when signing bundle 2016-01-11 12:55:09 +01:00
kervala
fc5e6ca982 Fixed: Error when signing bundle
--HG--
branch : develop
2016-01-11 12:55:09 +01:00
kervala
1a7595369a Merge with develop 2016-01-04 14:03:11 +01:00
kervala
b78afa1c4d Merge with develop
--HG--
branch : compatibility-develop
2016-01-04 14:03:11 +01:00
kervala
873ac7e727 Changed: Copy tools related to client into client bundle under OS X 2016-01-04 13:43:49 +01:00
kervala
6627c04a97 Changed: Copy tools related to client into client bundle under OS X
--HG--
branch : develop
2016-01-04 13:43:49 +01:00
kervala
1725f5b0e6 Merge with develop 2016-01-03 18:16:07 +01:00
kervala
cf89d60682 Merge with develop
--HG--
branch : compatibility-develop
2016-01-03 18:16:07 +01:00
kervala
df89274053 Fixed: Sign OS X binaries needed by client and copy them in Ryzom bundle 2016-01-03 17:47:31 +01:00
kervala
33e701192d Fixed: Sign OS X binaries needed by client and copy them in Ryzom bundle
--HG--
branch : develop
2016-01-03 17:47:31 +01:00
kervala
26013094e1 Merge with develop 2016-01-02 22:36:05 +01:00
kervala
a1ee429b92 Merge with develop
--HG--
branch : compatibility-develop
2016-01-02 22:36:05 +01:00
kervala
2a9c54aff7 Changed: Minor changes 2016-01-02 22:24:16 +01:00
kervala
12c4adf943 Changed: Minor changes
--HG--
branch : develop
2016-01-02 22:24:16 +01:00
kervala
dc4cefff2b Changed: Only copy installscript_osx.vdf for Steam client 2015-12-21 17:46:38 +01:00
kervala
806a6d21ab Changed: Only copy installscript_osx.vdf for Steam client
--HG--
branch : compatibility-develop
2015-12-21 17:46:38 +01:00
kervala
4174e2c6a6 Merge with develop 2015-12-21 17:39:49 +01:00
kervala
5bc5527fd6 Merge with develop
--HG--
branch : compatibility-develop
2015-12-21 17:39:49 +01:00
kervala
330ffa860d Changed: Only copy installscript_osx.vdf in compatibility branch 2015-12-21 17:34:09 +01:00
kervala
5cf0fd10af Changed: Only copy installscript_osx.vdf in compatibility branch
--HG--
branch : develop
2015-12-21 17:34:09 +01:00
kervala
84f8628385 Changed: Added WITH_RYZOM_CUSTOM_PATCH_SERVER that allows to give priority to PatchUrl defined in client.cfg 2015-12-21 17:33:32 +01:00
kervala
fb98ffe809 Changed: Added WITH_RYZOM_CUSTOM_PATCH_SERVER that allows to give priority to PatchUrl defined in client.cfg
--HG--
branch : develop
2015-12-21 17:33:32 +01:00
kervala
134fb4f97d Merge with develop 2015-12-20 11:21:40 +01:00
kervala
eb60aa4446 Merge with develop
--HG--
branch : compatibility-develop
2015-12-20 11:21:40 +01:00
kervala
35926ab60f Changed: There is no client_default.cfg.in anymore 2015-12-20 11:14:13 +01:00
kervala
935809b40f Changed: There is no client_default.cfg.in anymore
--HG--
branch : develop
2015-12-20 11:14:13 +01:00
kervala
7c5222ec52 Merge with develop 2015-12-15 15:09:50 +01:00
kervala
0e63e81565 Merge with develop
--HG--
branch : compatibility-develop
2015-12-15 15:09:50 +01:00
kervala
896262659c Fixed: Allow to sign OS X bundles with APPLE_CERTIFICATE 2015-12-15 15:03:42 +01:00
kervala
3b3b1d0d4c Fixed: Allow to sign OS X bundles with APPLE_CERTIFICATE
--HG--
branch : develop
2015-12-15 15:03:42 +01:00
kervala
6f031728f5 Merge with develop
--HG--
branch : compatibility-develop
2015-12-11 20:21:56 +01:00
kervala
c2fa7e4137 Merge with develop 2015-12-11 20:21:56 +01:00
kervala
82e835cd59 Changed: Append _dev to client if compiling without FINAL_VERSION (like Nevrax did) 2015-12-11 20:16:06 +01:00
kervala
a75ebeffa7 Changed: Append _dev to client if compiling without FINAL_VERSION (like Nevrax did)
--HG--
branch : develop
2015-12-11 20:16:06 +01:00
kervala
5688c75bba Merge with develop
--HG--
branch : compatibility-develop
2015-11-29 17:55:33 +01:00
kervala
590b72e05f Merge with develop 2015-11-29 17:55:33 +01:00
kervala
7a2dd18095 Changed: Add and use more constants in config.h
--HG--
branch : develop
2015-11-29 14:19:02 +01:00
kervala
a6ed27598f Changed: Add and use more constants in config.h 2015-11-29 14:19:02 +01:00
kervala
520eb941b1 Changed: Simplified CMake ELSE and ENDIF
--HG--
branch : develop
2015-11-29 14:06:05 +01:00
kervala
532aaa1078 Changed: Simplified CMake ELSE and ENDIF 2015-11-29 14:06:05 +01:00
kervala
5a34740b15 Added: Steam OS X script installscript_osx.vdf
--HG--
branch : compatibility-develop
2015-11-07 15:56:47 +01:00
kervala
e0ca13b550 Added: Steam OS X script installscript_osx.vdf 2015-11-07 15:56:47 +01:00
kervala
54ce40729d Fixed: Add revision in Info.plist for long version
--HG--
branch : compatibility-develop
2015-11-07 14:57:43 +01:00
kervala
5efa005715 Fixed: Add revision in Info.plist for long version 2015-11-07 14:57:43 +01:00
kervala
a21ebfe544 Merge with develop
--HG--
branch : compatibility-develop
2015-04-25 19:49:15 +02:00
kervala
32efe50809 Merge with develop 2015-04-25 19:49:15 +02:00
kervala
9a55ee46b7 Removed dependency on libwww
--HG--
branch : develop
2015-04-25 12:53:52 +02:00
kervala
0a20a6b7a1 Removed dependency on libwww 2015-04-25 12:53:52 +02:00
kervala
97eac497ff Merge with develop
--HG--
branch : compatibility-develop
2015-03-07 17:03:34 +01:00
kervala
d51e2fb861 Merge with develop 2015-03-07 17:03:34 +01:00
kaetemi
aebda454dc Visual Studio 2013 compilation support for Ryzom Client
--HG--
branch : develop
2015-02-20 17:53:39 +01:00
kaetemi
a5ede54ded Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:53:39 +01:00
kervala
eb05c962de Merge with develop
--HG--
branch : compatibility
2015-02-14 14:36:37 +01:00
kervala
b2d7194606 Merge with develop 2015-02-14 14:36:37 +01:00
kervala
303f7d2e79 Changed: Minor changes
--HG--
branch : develop
2015-01-13 14:11:07 +01:00
kervala
d6a2af6abd Changed: Minor changes 2015-01-13 14:11:07 +01:00
kervala
ec12e6a75e Changed: Allow to enable UAC for Windows client
--HG--
branch : develop
2014-12-26 13:44:03 +01:00
kervala
a728ae6b36 Changed: Allow to enable UAC for Windows client 2014-12-26 13:44:03 +01:00
kervala
305a6658ec Merge with default
--HG--
branch : compatibility
2014-08-30 16:22:41 +02:00
kervala
73283b02d5 Merge with default 2014-08-30 16:22:41 +02:00
kervala
63d62391a7 Changed: Preserve attributes when copying files in Application Bundle 2014-08-30 16:20:36 +02:00
kervala
687927ba10 Changed: Preserve attributes when copying files in Application Bundle 2014-08-30 16:20:36 +02:00
kaetemi
fad363efb5 Merge with ryzomcore/v0.9.1
--HG--
branch : compatibility
2014-08-25 15:09:16 +02:00
kaetemi
8d524ee849 Merge with ryzomcore/v0.9.1 2014-08-25 15:09:16 +02:00
kaetemi
e8f7851dd2 Fix compile 2014-06-21 22:32:49 +02:00
kaetemi
8ede6ba6e8 Fix compile 2014-06-21 22:32:49 +02:00
kervala
574382fcbb Changed: Set official Ryzom client version and identifiers for OS X bundle
--HG--
branch : compatibility
2014-05-13 10:02:32 +02:00
kervala
d666ec71f4 Changed: Set official Ryzom client version and identifiers for OS X bundle 2014-05-13 10:02:32 +02:00
kervala
350c6ec5d7 Changed: Renamed RZ_PATCH to RZ_USE_PATCH 2014-03-23 20:25:48 +01:00
kervala
4d4daf0541 Changed: Renamed RZ_PATCH to RZ_USE_PATCH 2014-03-23 20:25:48 +01:00
kervala
6c4d33c2a6 Changed: Improvements in patch system 2014-03-22 16:23:17 +01:00
kervala
3ed24c6955 Changed: Improvements in patch system 2014-03-22 16:23:17 +01:00
kervala
91a3e128cc Changed: Renamed RZ_PATCH to RZ_USE_PATCH
--HG--
branch : compatibility
2014-03-23 20:25:48 +01:00
kervala
20ce763f35 Changed: Improvements in patch system
--HG--
branch : compatibility
2014-03-22 16:23:17 +01:00
botanic
275542fa01 Added 7z library to all versions needed for in-game patcher 2014-02-07 20:12:15 -08:00
botanic
18c2b62c0c Added 7z library to all versions needed for in-game patcher 2014-02-07 20:12:15 -08:00
kervala
1c50b1f943 Fixed: Compilation under Mac OS X 10.9 2014-01-30 14:43:51 +01:00
kervala
37d36e0ab5 Fixed: Compilation under Mac OS X 10.9 2014-01-30 14:43:51 +01:00
kaetemi
347d4e0940 Some necessary ryzom tools did not build when client and server were unchecked 2013-07-19 18:11:31 +02:00
kaetemi
32553f4d87 Some necessary ryzom tools did not build when client and server were unchecked 2013-07-19 18:11:31 +02:00