Commit graph

211 commits

Author SHA1 Message Date
Nimetu
d3235c9a20 Merge with develop 2016-04-29 12:26:41 +03:00
kervala
9b837748aa Merge with develop 2016-04-18 13:40:46 +02:00
kervala
ec25d0f62a Backed out changeset: 10cdacbad9a1 2016-04-15 16:12:12 +02:00
kervala
d86fc2ac29 Changed: Temporary log for a OS X 10.7 bug... 2016-04-14 18:58:54 +02:00
kervala
9c3dc650e7 Backed out changeset: 44cd3beacab6 2016-04-14 18:56:48 +02:00
kervala
45565e2bb8 Changed: Temporary checks for a OS X 10.7 bug... 2016-04-14 18:19:19 +02:00
kervala
7292d41acf Merge with develop 2016-04-12 19:55:05 +02:00
kervala
910c6dc7b9 Merge with develop 2016-04-12 15:43:47 +02:00
kervala
a98e6b1fee Merge with develop 2016-04-09 13:02:40 +02:00
kervala
0d49004311 Merge with develop 2016-04-06 09:36:35 +02:00
kervala
18cd57a1d1 Merge with develop 2016-04-02 19:34:20 +02:00
kervala
c93a8e4e69 Changed: Pass LoginCustomParameters to different login URLs if defined 2016-04-02 19:09:21 +02:00
kervala
a355fb9b2a Changed: If only login is passed as parameter, neither use auto login nor alt login 2016-04-02 19:08:13 +02:00
Nimetu
6a258886fe Merge with develop 2016-03-22 12:23:04 +02:00
kervala
5109ae5443 Merge with develop 2016-03-19 19:30:06 +01:00
kervala
5670c0cd2b Changed: Try to load Steam DLL without path if fails 2016-03-19 18:29:14 +01:00
kervala
f627729e05 Changed: Load Steam DLL just after initializing logs and before loading config 2016-03-18 22:21:01 +01:00
kervala
eb92bf7b00 Fixed: Use language defined in Ryzom properties from Steam 2016-03-18 22:20:28 +01:00
kervala
63b2843232 Merge with develop 2016-03-18 22:16:28 +01:00
kervala
f192068bc4 Merge with develop 2016-03-16 19:15:11 +01:00
kervala
01c2dd9f33 Merge with develop 2016-03-15 17:45:55 +01:00
kervala
0e1cbe909c Merge with develop 2016-03-15 12:37:11 +01:00
kervala
df7917c012 Merge with develop 2016-03-15 00:08:40 +01:00
kaetemi
4eb9d884d0 Merge with develop 2016-03-10 12:09:18 +01:00
kaetemi
eb8835c36c Merge with develop 2016-03-08 12:46:47 +01:00
kervala
79556d7204 Merge with develop 2016-03-05 12:46:17 +01:00
kervala
794b91022e Merge with develop 2016-03-05 11:51:08 +01:00
Nimetu
94d2d95efa Merge with develop 2016-03-01 22:39:10 +02:00
kervala
9283eecd5a Merge with develop 2016-03-01 13:46:49 +01:00
kervala
3b33bfdc47 Merge with develop 2016-02-29 09:33:00 +01:00
kervala
b44945edb6 Changed: Try to load Steam DLL using absolute path 2016-02-28 18:56:19 +01:00
kervala
ea7463afc0 Merge with develop 2016-02-28 16:46:11 +01:00
kervala
24cfde8037 Merge with develop 2016-02-27 18:39:41 +01:00
kervala
121bb76b97 Merge with develop 2016-02-23 19:42:49 +01:00
kervala
75199aad21 Merge with develop 2016-02-23 17:05:57 +01:00
kervala
10f56871e6 Fixed: Implement alternate login system with LoginCustomParameters 2016-02-23 17:03:40 +01:00
kervala
cfba5be067 Changed: Updated world_editor_classes.xml 2016-02-21 17:28:43 +01:00
kervala
e66f7a10c0 Changed: PatchServer not used anymore, use PatchUrl instead 2016-02-21 17:26:48 +01:00
kervala
b443e2e11d Merge with develop 2016-02-21 14:22:18 +01:00
kervala
b81cee92c8 Merge with develop 2016-02-21 13:57:35 +01:00
kervala
990a966504 Changed: Guild missions 2016-02-21 13:51:09 +01:00
kervala
179c6e4e04 Changed: Minor changes 2016-02-21 13:50:44 +01:00
kervala
c4b768833b Merge with develop 2016-02-21 13:22:22 +01:00
kervala
01257931d4 Changed: Added NamingPolicyURL in client_default.cfg 2016-02-21 12:33:15 +01:00
kervala
21da88a762 Merge with develop 2016-02-20 20:44:23 +01:00
kervala
16cacef922 Merge with develop 2016-02-20 19:57:43 +01:00
kervala
0350c97f0a Merge with develop 2016-02-20 19:29:00 +01:00
kervala
708c5d0d41 Merge with develop 2016-02-15 12:11:08 +01:00
kervala
672f30c816 Changed: If symbol not found, return false 2016-02-13 23:47:20 +01:00
kervala
cd68bd93a3 Changed: Log Steam warnings and messages 2016-02-13 23:46:50 +01:00
kervala
3ab60af016 Merge with develop 2016-02-13 23:43:04 +01:00
Nimetu
30454c9ef5 Merge with develop 2016-02-13 17:36:57 +02:00
kervala
5bf0b023e3 Merge with develop 2016-02-13 14:00:02 +01:00
kervala
8a6598270c Fixed: Copy Steam runtime to bundle and sign it under OS X 2016-02-11 21:05:03 +01:00
kervala
3a5c2da73d Merge with develop 2016-02-11 21:01:27 +01:00
kervala
bfb2c7d222 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
kervala
f7046f21b1 Merge with develop 2016-02-08 14:37:34 +01:00
kervala
93a0e60b59 Merge with develop 2016-02-06 00:24:44 +01:00
kervala
59dcd867e9 Merge with develop 2016-02-03 21:58:58 +01:00
kervala
5d3385510b Merge with develop 2016-02-02 20:49:21 +01:00
kervala
0880232caa Merge with develop 2016-02-02 19:51:11 +01:00
kervala
c85cbfc869 Merge with develop 2016-02-02 19:31:12 +01:00
kervala
4d29b54d0a Merge with develop 2016-02-02 14:33:32 +01:00
kervala
4808dfcecb Merge with develop 2016-02-02 12:37:59 +01:00
kervala
164eb4de7b Merge with develop 2016-01-27 15:16:44 +01:00
kervala
1dd308474c Merge with develop 2016-01-26 22:44:40 +01:00
kervala
059f3b77b4 Merge with develop 2016-01-23 20:33:28 +01:00
kervala
b9a761925b Merge with develop 2016-01-23 19:07:13 +01:00
kervala
9e3ef029c6 Merge with develop 2016-01-23 12:30:33 +01:00
kervala
b1849e9859 Removed: installscript_osx.vdf because we manage it directly in code now 2016-01-21 10:15:09 +01:00
kervala
11f2f1e3e1 Merge with develop 2016-01-21 10:08:56 +01:00
kervala
2d15a8d6e8 Merge with develop 2016-01-20 13:06:47 +01:00
kervala
63984e4a2a Merge with develop 2016-01-18 21:32:01 +01:00
kervala
3be3e94aec Changed: Remove InstallStatsUrl in client_default.cfg 2016-01-17 20:16:18 +01:00
kervala
628c2b1d80 Merge with develop 2016-01-16 10:52:18 +01:00
kervala
130847cac5 Merge with develop 2016-01-14 21:28:47 +01:00
kervala
9c8018d1f7 Merge with develop 2016-01-14 10:22:22 +01:00
kervala
6a5fc56ce0 Merge with develop 2016-01-13 20:05:06 +01:00
kervala
8d905df095 Merge with develop 2016-01-12 22:32:22 +01:00
kervala
ad11c4c4ce Merge with develop 2016-01-11 13:53:32 +01:00
kervala
44bd19fbf4 Merge with develop 2016-01-11 12:55:47 +01:00
kervala
aed875fe3b Merge with develop 2016-01-09 19:42:29 +01:00
kervala
6e471c02d3 Merge with develop 2016-01-09 19:32:59 +01:00
kervala
79d11b8919 Merge with develop 2016-01-09 18:10:49 +01:00
kervala
fd21a8f50a Merge with develop 2016-01-09 17:17:59 +01:00
kervala
e0e990566c Merge with develop 2016-01-09 16:32:59 +01:00
kervala
48757c15b7 Merge with develop 2016-01-09 16:08:34 +01:00
kervala
989569c137 Merge with develop 2016-01-07 17:41:02 +01:00
kervala
88226323e0 Merge with develop 2016-01-06 13:22:47 +01:00
kervala
a6694d122b Merge with develop 2016-01-04 14:03:11 +01:00
kervala
a046a06db3 Merge with develop 2016-01-03 18:16:07 +01:00
kervala
50b846d56c Merge with develop 2016-01-02 22:36:05 +01:00
kervala
1354d99609 Merge with develop 2016-01-02 17:11:59 +01:00
kervala
83f8502b51 Merge with develop 2016-01-01 16:27:45 +01:00
kervala
4f24898102 Merge with develop 2015-12-29 22:36:04 +01:00
Nimetu
9fc64124f3 Merge with develop 2015-12-29 15:03:12 +02:00
kervala
965971a86d Merge with develop 2015-12-28 18:21:56 +01:00
kervala
cde1975f25 Merge with develop 2015-12-26 18:00:04 +01:00
kervala
f66c15c5da Merge with develop 2015-12-26 14:38:37 +01:00
kervala
8dda998ea5 Merged with develop 2015-12-25 20:52:18 +01:00
kervala
d2676c3b57 Merge with develop 2015-12-23 15:31:37 +01:00
kervala
560a51136f Changed: Only copy installscript_osx.vdf for Steam client 2015-12-21 17:46:38 +01:00
kervala
c09d7e6884 Merge with develop 2015-12-21 17:39:49 +01:00
kervala
2368805d2f Merge with develop 2015-12-20 19:26:36 +01:00
kervala
6c19bba957 Changed: Revert back PreDataPath directories 2015-12-20 18:56:23 +01:00
kervala
a7f0b854d2 Merge with develop 2015-12-20 11:21:40 +01:00
Nimetu
2c94ec2e2d Merge with develop 2015-12-19 20:40:05 +02:00
Nimetu
588d1ca8ce Merge with develop 2015-12-18 14:34:48 +02:00
kervala
46b82be25e Merge with develop 2015-12-15 15:09:50 +01:00
Nimetu
752f45f25b Merge with develop 2015-12-15 12:27:11 +02:00
Nimetu
bf33ad683f Merge with develop 2015-12-13 21:04:37 +02:00