784 commits

Author	SHA1	Message	Date
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