Commit graph

530 commits

Author SHA1 Message Date
kervala
2b4058ed95 Merge with develop 2016-10-10 20:47:56 +02:00
kervala
e668405115 Merge with develop 2016-10-10 20:03:13 +02:00
kervala
35b59843cf Merge with develop 2016-10-10 18:55:28 +02:00
kervala
2715eecda7 Merge with develop 2016-10-10 16:36:38 +02:00
kervala
c315480e56 Merge with develop 2016-10-09 19:53:31 +02:00
kervala
276cfa4b60 Merge with develop 2016-10-09 15:34:28 +02:00
kervala
c0be448a85 Merge with develop 2016-10-08 18:29:31 +02:00
kervala
a4b3c7c01c Merge with develop 2016-10-08 14:15:15 +02:00
kervala
51970f9b79 Merge with develop 2016-10-04 19:27:56 +02:00
kervala
643c0fabf2 Merge with develop 2016-10-04 12:04:23 +02:00
kervala
98066af393 Merge with develop 2016-10-03 17:22:46 +02:00
kervala
329402c1cf Merge with develop 2016-10-03 10:02:06 +02:00
kervala
6b24cd95d0 Merge with develop 2016-10-01 14:11:10 +02:00
kervala
4fc06a0c63 Merge with develop 2016-10-01 13:10:05 +02:00
kervala
f888b9f3bf Merge with develop 2016-09-29 20:47:46 +02:00
kervala
f983a551a2 Merge with develop 2016-09-29 17:08:03 +02:00
kervala
6eb85803eb Merge with develop 2016-09-29 00:20:47 +02:00
kervala
6744ded402 Merge with develop 2016-09-28 23:55:21 +02:00
kervala
1fa75e0c6d Merge with develop 2016-09-28 12:25:45 +02:00
kervala
3d304c1735 Changed: Updated translations 2016-09-27 14:57:12 +02:00
kervala
72f62fdf32 Merge with develop 2016-09-26 10:41:52 +02:00
kervala
4c692ba040 Added: Ryzhome files 2016-09-25 14:21:42 +02:00
kervala
d18317e532 Added: Missing files from data_common.bnp 2016-09-25 14:17:30 +02:00
kervala
3b23cddbdb Merge with develop 2016-09-25 10:37:42 +02:00
kervala
e1555f9e24 Merge with develop 2016-09-24 15:54:47 +02:00
kervala
4c51c4e68c Merge with develop 2016-09-24 14:22:22 +02:00
kervala
fc903ff30c Removed: Textures shouldn't go in gamedev 2016-09-22 21:56:28 +02:00
kervala
bec471034f Merge with develop 2016-09-22 18:48:22 +02:00
kervala
d6ca7b2657 Merge with develop 2016-09-22 18:12:21 +02:00
kervala
d8656a5578 Merge with develop 2016-09-22 11:40:42 +02:00
kervala
e80aac9953 Merge with develop 2016-09-21 18:04:29 +02:00
kervala
203490b838 Merge with develop 2016-09-21 17:38:33 +02:00
kervala
420bf07057 Merge with develop 2016-09-21 17:34:34 +02:00
kervala
2393e0660c Merge with develop 2016-09-21 17:19:31 +02:00
kervala
1e733fec01 Merge with develop 2016-09-21 15:52:53 +02:00
kervala
faff5ad04d Changed: Moved SSL certificate to gamedev 2016-09-21 12:46:04 +02:00
kervala
01423acdc5 Merge with develop 2016-09-21 10:04:04 +02:00
kervala
feac1ffdb4 Merge with develop 2016-09-21 09:57:47 +02:00
kervala
e20e3b4866 Merge with develop 2016-09-20 21:59:11 +02:00
kervala
c82b04b597 Merge with develop 2016-09-20 18:36:02 +02:00
kervala
61a3bc0c9a Merge with develop 2016-09-20 17:51:27 +02:00
kervala
2455fc02d7 Merge with develop 2016-09-19 14:52:47 +02:00
kervala
5fc7c25be4 Merge with develop 2016-09-18 16:35:01 +02:00
kervala
e68258e56e Merge with develop 2016-09-16 19:25:17 +02:00
kervala
16598659b5 Merge with develop 2016-09-16 19:00:32 +02:00
kervala
30ad6fa760 Merge with develop 2016-09-14 08:18:14 +02:00
kervala
58a8da6590 Merge with develop 2016-09-10 19:40:40 +02:00
kervala
b8bd9b4e33 Changed: Updated translations 2016-09-08 17:38:31 +02:00
kervala
8c0af53b48 Merge with develop 2016-09-03 10:15:39 +02:00
Nimetu
3cacd76a30 Changed: Added mp3 player playlist translation 2016-08-30 21:31:53 +03:00
Nimetu
3610c6c8cb Merge with develop 2016-08-30 21:27:56 +03:00
Nimetu
5e712f3e02 Merge with develop 2016-08-30 18:39:58 +03:00
kervala
d16ab852f3 Merge with develop 2016-08-26 13:55:25 +02:00
kervala
8f8ded0f12 Merge with develop 2016-08-26 13:01:32 +02:00
Nimetu
dee80dc90e Merge with develop 2016-08-25 22:18:35 +03:00
ulukyn
e9f3fa6ba4 Added: New getGroundZ lua function 2016-08-25 18:54:35 +02:00
kervala
0b4f365d60 Merge with develop 2016-08-16 18:27:42 +02:00
kervala
80275386ec Merge with develop 2016-08-14 13:36:44 +02:00
kervala
5ea8a69890 Changed: Only enable Atys at first 2016-08-13 15:53:49 +02:00
kervala
1e12bb27cc Merge with develop 2016-08-10 15:46:13 +02:00
kervala
8af64c9e71 Merge with develop 2016-08-06 20:12:39 +02:00
kervala
f797f55b8d Merge with develop 2016-07-27 12:49:01 +02:00
kervala
87df259f07 Merge with develop 2016-07-27 12:44:09 +02:00
kervala
7ce529452f Merge with develop 2016-07-26 18:23:35 +02:00
kervala
f81a367111 Merge with develop 2016-07-25 18:58:02 +02:00
kervala
dabd3b2fdb Merge with develop 2016-07-25 10:46:09 +02:00
Nimetu
85838aec19 Merge with develop 2016-07-24 16:09:25 +03:00
Nimetu
0be0a1e9e7 Merge with develop 2016-07-23 11:28:22 +03:00
Riasan
8aefb645e1 Fix: right text align by Info Window 2016-07-19 20:54:54 +02:00
kervala
ca0346645b Merge with develop 2016-07-19 09:42:54 +02:00
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
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