Commit graph

402 commits

Author SHA1 Message Date
kervala
ec1e27acca Merge with develop 2016-06-27 11:51:59 +02:00
kervala
120d2d7dba Merge with develop 2016-06-26 19:43:53 +02:00
kervala
ad98793560 Merge with develop 2016-06-19 21:10:23 +02:00
kervala
f54109d279 Merge with develop 2016-06-18 22:41:12 +02:00
Nimetu
1bff654c7b Merge with develop 2016-06-16 23:32:47 +03:00
kervala
5e75d9846d Merge with develop 2016-06-14 23:00:20 +02:00
kervala
e22cc2acf2 Merge with develop 2016-06-14 20:18:10 +02: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
8da49a8189 Merge with develop 2016-06-11 20:49:56 +02:00
kervala
8ab7ef6149 Merge with develop 2016-06-11 20:32:19 +02:00
kervala
e3c977ee57 Merge with develop 2016-06-11 17:06:08 +02:00
kervala
2275e55db9 Merge with develop 2016-06-07 13:32:06 +02:00
kervala
db686dc05c Merge with develop 2016-06-04 20:11:55 +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
cf5bd0e82d Changed: Renamed ring_map_entry_ponts.txt to r2_entry_points.txt in compatibility-develop too (don't forget to update data_common.bnp!) 2016-05-20 19:18:46 +02:00
kervala
1656e82303 Merge with develop 2016-05-18 14:31:14 +02:00
kervala
9340cb4449 Merge with develop 2016-05-18 09:57:33 +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
3b4b071839 Merge with develop 2016-05-16 20:33:43 +02:00
kervala
00e99132c7 Merge with develop 2016-05-16 18:20:14 +02:00
kervala
16ce9a7964 Merge with develop 2016-05-16 18:17:40 +02:00
kervala
cd89e4c348 Merge with develop 2016-05-16 16:50:11 +02:00
kervala
9a61bd9a7c Merge with develop 2016-05-16 16:31:30 +02:00
kervala
b85c2753a8 Merge with develop 2016-05-16 11:13:45 +02:00
kervala
ece22ab9f3 Merge with develop 2016-05-15 12:05:19 +02:00
kervala
294bf10666 Merge with develop 2016-05-14 18:55:54 +02:00
kervala
4cf6c0268a Changed: Updated translations 2016-05-12 19:59:08 +02:00
kervala
5bbd69cbe0 Merge with develop 2016-05-12 19:57:37 +02:00
kervala
2c8523a9d1 Changed: Updated translations 2016-05-08 19:25:15 +02:00
kervala
7bcf3bfe5c Merge with develop 2016-05-08 19:24:04 +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
792e6aabc5 Fixed: Typo 2016-05-04 19:52:31 +02:00
kervala
f2bc9c2159 Changed: Missing space 2016-05-04 19:30:20 +02:00
kervala
407c19d049 Changed: Updated EULAs 2016-05-04 19:21:43 +02:00
kervala
61e142dcf2 Fixed: Remove "Play Ryzom" button if using Steam 2016-05-04 10:10:42 +02: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
1a5ac4b839 Merge with develop 2016-04-22 10:56:31 +02:00
kervala
500e3fd4de Changed: Updated translations 2016-04-22 10:56:02 +02: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
0bcf110925 Changed: Version 3.0.0 2016-04-09 12:53:30 +02:00
kervala
0d49004311 Merge with develop 2016-04-06 09:36:35 +02:00
kervala
208e02b31e Merge with develop 2016-04-06 09:34:34 +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
kervala
e2c4def76c Changed: Updated translations 2016-04-02 11:26:07 +02:00
Nimetu
049bab8512 Fixed: Typo in translation key 2016-03-30 10:44:52 +03:00
kervala
dba1ff2ec4 Merge with develop 2016-03-29 14:00:04 +02:00
kervala
8c14b52235 Changed: Updated translations 2016-03-29 13:58:29 +02:00
Nimetu
4acb2409ef Added: AppZone translations 2016-03-22 12:17:57 +02:00
Nimetu
6a258886fe Merge with develop 2016-03-22 12:23:04 +02:00
kervala
2c35c82d9d Merge with develop 2016-03-20 17:09:13 +01: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
dc52b3e24f Merge with develop 2016-03-19 16:21:46 +01:00
kervala
371cba9a84 Merge with develop 2016-03-18 22:27:43 +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
224875c39f Changed: Updated translations 2016-03-17 13:51:44 +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
kervala
a779f737c9 Changed: Updated translations 2016-03-15 00:08:12 +01:00
kervala
e46f648a21 Changed: Updated translations 2016-03-12 15:40:28 +01:00
kervala
8dfe8412ae Merge with develop 2016-03-12 14:49:35 +01:00
kervala
c6d165d948 Changed: Updated translations 2016-03-12 14:37:39 +01:00
kervala
5a8dd806f0 Merge with develop 2016-03-11 09:51:59 +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
ff55eae20b Changed: Updated translations 2016-03-06 19:42:06 +01:00
kervala
edeb8e721f Changed: Updated translations 2016-03-05 19:30:35 +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
42cf13ce2a Changed: Update translations 2016-03-01 22:39:14 +02:00
Nimetu
94d2d95efa Merge with develop 2016-03-01 22:39:10 +02:00
kervala
12824fc1dc Merge with develop 2016-03-01 14:02:18 +01: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
8052354e83 Changed: Updated translations 2016-02-28 18:58:10 +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
dd833a6609 Fixed: Typos in french translations 2016-02-24 12:22:33 +01:00