Commit graph

128 commits

Author SHA1 Message Date
Nimetu
1bff654c7b Merge with develop 2016-06-16 23:32:47 +03:00
kervala
3ae8a19af1 Merge with develop 2016-06-12 15:44:48 +02:00
Nimetu
8f9d7078bd Merge with develop 2016-06-12 12:49:14 +03:00
kervala
2275e55db9 Merge with develop 2016-06-07 13:32:06 +02:00
kervala
c4f5512b24 Merge with develop 2016-05-29 20:38:55 +02:00
kervala
ac448eac18 Merge with develop 2016-05-27 22:24:20 +02:00
kervala
6fbf8c5326 Merge with develop 2016-05-26 19:36:25 +02:00
kervala
ed03eb0a02 Merge with develop 2016-05-24 11:25:04 +02:00
kervala
1656e82303 Merge with develop 2016-05-18 14:31:14 +02:00
kervala
0c2cdd108e Merge with develop 2016-05-17 20:50:14 +02:00
kervala
0766c4766f Merge with develop 2016-05-17 11:02:02 +02:00
kervala
ece22ab9f3 Merge with develop 2016-05-15 12:05:19 +02:00
kervala
5bbd69cbe0 Merge with develop 2016-05-12 19:57:37 +02:00
kervala
bf79b16b5b Merge with develop 2016-05-08 13:42:53 +02:00
kervala
43db9313f8 Merge with develop 2016-05-05 17:57:47 +02:00
Nimetu
3530beb7fe Merge with develop 2016-05-05 15:01:10 +03:00
kervala
aa59952038 Merge with develop 2016-05-04 10:09:49 +02:00
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