Commit graph

1005 commits

Author SHA1 Message Date
Nimetu
0d571e617e Backed out changeset: 61529eb4c24f 2016-07-18 23:44:47 +03:00
Riasan
8f15a04d2d Fix: Right Text Align by Map and Rewspwan Windows 2016-07-18 20:14:20 +02:00
Nimetu
25f6f1980f Merge with develop 2016-07-09 14:59:22 +03:00
kervala
a3b8a2749e Merge with develop 2016-07-09 13:48:03 +02:00
Nimetu
2ce1a63026 Merge with develop 2016-07-07 01:01:00 +03:00
Riasan
391706c1d8 Fix: Bad Position of Text after fix the Text High 2016-07-02 23:07:47 +02:00
Nimetu
62e5552859 Merge with develop 2016-07-01 23:38:32 +03:00
kervala
7df642535b Merge with develop 2016-07-01 10:42:21 +02:00
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
Nimetu
975ed523be Merge with develop 2016-06-25 22:30:51 +03: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
41ef412c0c Merge with develop 2016-06-16 17:16:27 +02: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
a096a9ccff Merge with develop 2016-06-07 20:01:47 +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
d5b086b0c8 Merge with develop 2016-06-04 17:05:41 +02:00
Nimetu
dca7c1f40b Merge with develop 2016-06-04 10:36:21 +03:00
kervala
d6fc8af573 Merge with develop 2016-05-30 17:51:54 +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
Nimetu
13bef3b94d Merge with develop 2016-05-14 13:47:03 +03:00
kervala
673fb8d52a Merge with develop 2016-05-13 20:55:24 +02:00
Nimetu
8c7086fa9d Merge with develop 2016-05-13 13:58:33 +03: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
Nimetu
932acf2e11 Merge with develop 2016-05-09 20:14:15 +03: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
9bb4273fe1 Merge with develop 2016-05-08 14:00:40 +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
Nimetu
a26d4063f7 Merge with develop 2016-04-23 18:49:52 +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
77927a2558 Merge with develop 2016-04-15 16:12:32 +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
ae6168e534 Merge with develop 2016-04-13 20:37:30 +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
587804cab7 Merge with develop 2016-04-02 13:32:28 +02:00
kervala
e29d08861d Merge with develop 2016-04-02 11:34:39 +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
2d5cf29861 Merge with develop 2016-03-20 17:28:00 +01:00
kervala
2c35c82d9d Merge with develop 2016-03-20 17:09:13 +01:00
kaetemi
4bdca3e82e Merge with develop 2016-03-19 22:34:32 +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
bf411d530b Merge with develop 2016-03-05 18:44:19 +01:00
kervala
79556d7204 Merge with develop 2016-03-05 12:46:17 +01:00
kervala
417b72447c Changed: Temporarily disable Spanish and Russian translations (not yet ready) 2016-03-05 12:45:49 +01:00
kervala
794b91022e Merge with develop 2016-03-05 11:51:08 +01:00
kervala
fb71c217ca Merge with develop 2016-03-03 20:50:56 +01:00
Nimetu
526a716948 Merge with develop 2016-03-03 00:00:30 +02: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
379af19bd9 Merge with develop 2016-02-28 12:46:34 +01:00
kervala
207f749a93 Merge with develop 2016-02-27 19:22:53 +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
kervala
121bb76b97 Merge with develop 2016-02-23 19:42:49 +01:00
kervala
9146e406a1 Changed: Updated translations 2016-02-23 17:27:01 +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
840f5b7c61 Changed: Updated german translations 2016-02-23 12:36:47 +01:00
kervala
9b53b815f7 Merge with develop 2016-02-21 20:30:16 +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
9006c8e8c2 Merge with develop 2016-02-21 17:06:38 +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
9ad79cc4b6 Changed: Updated world_editor_classes.xml 2016-02-21 13:52:20 +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
fe700e63f3 Changed: Updated translations 2016-02-20 20:11:52 +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
c1fbf4742c Fixed: Reverted removed translation 2016-02-16 15:26:41 +01:00
kervala
5027ef8414 Changed: Minor changes in translations 2016-02-16 15:26:14 +01:00
kervala
cdeddbfea4 Changed: Updated hash 2016-02-16 15:22:06 +01:00
kervala
d1415a8290 Fixed: Wrong indices 2016-02-16 15:10:07 +01:00
kervala
c4e852cb10 Changed: Symbol for byte unit 2016-02-16 15:07:24 +01:00
kervala
60b78aeae8 Changed: Don't compile client_patcher if using Steam 2016-02-15 17:09:06 +01:00
kervala
8f0fb9671f Changed: Updated translations 2016-02-15 16:46:29 +01:00
kervala
708c5d0d41 Merge with develop 2016-02-15 12:11:08 +01:00
kervala
ed8afa1b6c Merge with develop 2016-02-14 19:59:16 +01:00
kervala
17e86cce21 Merge with develop 2016-02-14 19:16:53 +01:00
kervala
08e9906e0d Merge with develop 2016-02-14 18:21:41 +01:00
Nimetu
02d706092b Merge with develop 2016-02-14 01:24:10 +02: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
7212a8e360 Merge with develop 2016-02-12 16:05:43 +01:00
kervala
1399b4d9d5 Merge with develop 2016-02-11 21:06:28 +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
21a8db2085 Changed: Updated translations 2016-02-11 16:26:07 +01:00
kervala
ac0ac5e1ab Changed: Updated translations 2016-02-11 16:24:06 +01:00
kervala
ce15467492 Changed: Updated translations 2016-02-11 15:58:53 +01:00
kervala
06bfd577a4 Merge with develop 2016-02-10 18:48:09 +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
24451d67ab Merge with develop 2016-02-09 13:02:57 +01:00
kervala
f7046f21b1 Merge with develop 2016-02-08 14:37:34 +01:00
kervala
5e434a6d86 Changed: Updated translations 2016-02-08 13:10:34 +01:00
kervala
4fb43ee999 Changed: Updated translations 2016-02-08 12:34:53 +01:00
kervala
93a0e60b59 Merge with develop 2016-02-06 00:24:44 +01:00
kervala
4bfacefdd8 Merge with develop 2016-02-05 12:30:26 +01:00
kervala
eef399dcc7 Merge with develop 2016-02-04 15:25:39 +01:00
kervala
cb4c93648e Merge with develop 2016-02-04 14:33:30 +01:00
kervala
59dcd867e9 Merge with develop 2016-02-03 21:58:58 +01:00
kervala
272e7bf0c9 Changed: Translate some texts in patch screen 2016-02-03 20:17:42 +01:00
kervala
cc267b4bcd Changed: Use KiB and MiB as units 2016-02-03 20:17:16 +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
058b36aa4a Merge with develop 2016-02-01 09:07:45 +01:00
kervala
3e51da6264 Merge with develop 2016-01-30 20:45:19 +01:00
kervala
3324471931 Merge with develop 2016-01-30 18:16:16 +01:00
kervala
2962e88e7f Merge with develop 2016-01-30 18:02:33 +01:00
kervala
ab14a96bd5 Merge with develop 2016-01-30 16:23:28 +01:00
kervala
b4f90b459b Changed: Updated translations 2016-01-30 14:31:45 +01:00
kervala
4997fa9b08 Fixed: Reverted translations fix in wk 2016-01-30 14:31:34 +01:00
kervala
b1fb123c0a Fixed: Reverted modified ID for translations 2016-01-30 14:31:13 +01:00
kervala
1ec561e3c2 Changed: Updated translations 2016-01-30 14:30:33 +01:00
kervala
f473416ecc Changed: Updated german translations 2016-01-28 17:12:53 +01:00
kervala
9febb7374a merge with develop 2016-01-28 13:27:35 +01:00
kervala
164eb4de7b Merge with develop 2016-01-27 15:16:44 +01:00
kervala
fabef15e80 Merge with develop 2016-01-27 13:30:49 +01:00
kervala
8083f47f35 Merge with develop 2016-01-26 23:43:34 +01:00
kervala
0f3a4cb78e Merge with develop 2016-01-26 23:30:48 +01:00
kervala
ee30d06fa3 Merge 2016-01-26 22:45:40 +01:00
kervala
1dd308474c Merge with develop 2016-01-26 22:44:40 +01:00
kervala
198759a880 Fixed: Use same XML files as on Atys 2016-01-24 17:08:32 +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
56f56def72 Merge with develop 2016-01-23 13:03:27 +01:00
kervala
9e3ef029c6 Merge with develop 2016-01-23 12:30:33 +01:00
kervala
40719ddda8 Merge with develop 2016-01-23 10:59:56 +01:00
kervala
f8ceec9e3d Merge with develop 2016-01-23 10:28:00 +01:00
kervala
39e8135a82 Merge with develop 2016-01-23 10:19:01 +01:00
kervala
b8225c4fef Merge with develop 2016-01-21 15:07:14 +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
d82f7de732 Changed: Updated translations 2016-01-20 19:50:51 +01:00
Nimetu
493329ca7f Merge with develop 2016-01-20 19:15:45 +02:00
kervala
8ae2f144b4 Changed: Ryzom version 2.9.0 (stable version will be 3.0.0) 2016-01-20 13:08:23 +01:00
kervala
2d15a8d6e8 Merge with develop 2016-01-20 13:06:47 +01:00
kervala
567ddba324 Merge with develop 2016-01-19 20:42:11 +01:00
kervala
5ece2ac54f Changed: Updated translations 2016-01-19 09:17:09 +01:00
kervala
eea12f5170 Merge with develop 2016-01-18 21:48:31 +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
19ab8294bb Merge with develop 2016-01-17 13:24:01 +01:00
kervala
6995adfbc7 Merge with develop 2016-01-16 23:50:23 +01:00
kervala
8bda57bf89 Merge with develop 2016-01-16 15:58:19 +01:00
kervala
628c2b1d80 Merge with develop 2016-01-16 10:52:18 +01:00
kervala
88799427bf Merge with develop 2016-01-15 10:47:37 +01:00
kervala
a0d2adcc90 Merge with develop 2016-01-14 23:58:34 +01:00
kervala
e32543564d Merge with develop 2016-01-14 23:54:26 +01:00
kervala
f4d0b123ee Fixed: Use language name in native language in config window 2016-01-14 22:42:34 +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
1b7db1e92d Merge with develop 2016-01-11 11:44:44 +01:00
kervala
6c341fc348 Merge with develop 2016-01-11 10:09:58 +01:00
Nimetu
4158e851a9 Merge with develop 2016-01-10 16:34:13 +02:00
kervala
a8e28a20b4 Merge with develop 2016-01-10 12:13:59 +01:00
kervala
aed875fe3b Merge with develop 2016-01-09 19:42:29 +01:00