329 commits

Author	SHA1	Message	Date
depyraken	d6ef802487	merge aquatic to lirria	2016-03-30 23:13:00 +02:00
kervala	7517200cc7	Merge with develop	2016-03-29 14:00:04 +02:00
kervala	8b5c38392a	Fixed: Typo	2016-03-29 13:59:34 +02:00
SIELA1915	52702f64f1	merged from compatibility-develop	2016-03-28 02:12:19 +02:00
kervala	323d981318	Merge with develop	2016-03-20 17:09:13 +01:00
kervala	d11053aa03	Fixed: Compilation (missing NLMISC namespaces for nlfopen)	2016-03-20 17:08:44 +01:00
kervala	894ee5a47b	Merge with develop	2016-03-18 22:27:43 +01:00
kervala	78c7a925c7	Changed: Minor changes	2016-03-18 22:26:58 +01:00
kaetemi	4a581d89fa	Merge with develop	2016-03-10 12:09:18 +01:00
kaetemi	af0568e131	Fix rounding error in _RyzomDay and _RyzomTime calculation	2016-03-10 12:08:48 +01:00
Yann	0ce6b3c411	Adding new talents in mdehaviours in common	2016-03-04 20:16:16 +01:00
kervala	4a8741a9b0	Merge with develop	2016-02-23 17:05:57 +01:00
kervala	6c1cf58572	Changed: Trim URL before to display it	2016-02-23 17:05:04 +01:00
kervala	db2c2c64a7	Changed: Updated world_editor_classes.xml	2016-02-21 17:10:28 +01:00
kervala	d0261d2fc5	Merge with develop	2016-02-21 17:06:38 +01:00
kervala	a58a3451b8	Fixed: Add unlearn_brick command for missions (a big thanks to Depyraken for the patch!)	2016-02-21 17:05:54 +01:00
kervala	24302acc35	Merge with develop	2016-02-21 13:57:35 +01:00
kervala	af54e427c8	Changed: Updated world_editor_classes.xml	2016-02-21 13:52:20 +01:00
kervala	9f7e192926	Changed: Minor changes (replaced l: by L:)	2016-02-21 13:30:48 +01:00
kervala	b552f850e8	Merge with develop	2016-02-21 13:22:22 +01:00
kervala	045d255a09	Changed: Use L:/ path instead of R:/ for leveldesign	2016-02-21 13:10:16 +01:00
kervala	c217f28626	Merge with develop	2016-02-20 19:29:00 +01:00
kervala	35570eb0a3	Adapt CSTLoader to use nlfopen and some simplifications, issue #261	2016-02-20 18:56:21 +01:00
kervala	e9f8202701	Changed: Minor changes	2016-02-20 18:53:39 +01:00
kervala	bfb32b811d	Removed useless comments/commented code	2016-02-20 18:09:24 +01:00
kervala	808f7b2c30	Use new wrapper insteaf of fopen, issue #261	2016-02-20 17:56:25 +01:00
Yann	c76fdbf7db	Deleting tries to delete unused continents - doesn't suffice, weather_everywhere.cpp ask for a different number of continents ... q	2016-02-09 23:36:10 +01:00
Yann	37c45bebac	Changing somelines in continent.cpp	2016-02-09 21:54:52 +01:00
Yann	3fa275e64d	merging to lirria	2016-02-09 21:32:08 +01:00
Yann	0dd802f677	Deleting unused continents from code	2016-02-09 21:31:30 +01:00
SIELA1915	68d97aeb0e	fixed use of CI18N (it is in namespace NLMISC)	2016-01-31 19:36:58 +01:00
SIELA1915	095bc1b04c	merged with compatibility-develop	2016-01-31 15:42:41 +01:00
SIELA1915	db771f1d2b	fixed missing include for server when trying to get the date	2016-01-31 15:39:32 +01:00
SIELA1915	223139d53c	merged	2016-01-30 20:51:30 +01:00
SIELA1915	5c77c15107	Changed date to match Khanat	2016-01-30 20:43:01 +01:00
kervala	51a54813f3	Merge with develop	2016-01-30 16:23:28 +01:00
kervala	976ebabf74	Changed: Minor changes (thanks to SIELA1915)	2016-01-30 16:22:55 +01:00
kervala	3c66481476	Merge	2016-01-26 22:45:40 +01:00
kervala	2583139ea9	Merge with develop	2016-01-26 22:44:40 +01:00
kervala	3faeb82290	Changed: Removed more useless dependencies	2016-01-26 22:43:35 +01:00
kervala	9bf34dd055	Fixed: Use same XML files as on Atys	2016-01-24 17:08:32 +01:00
kervala	0d8b09001a	Merge with develop	2016-01-16 10:52:18 +01:00
kaetemi	c4f5b5d521	And more VS2015 fixes	2016-01-15 12:33:27 +01:00
kaetemi	9c1d333924	More of the VS2015 stuff	2016-01-15 12:29:05 +01:00
kervala	7b075b979f	Merge with develop	2016-01-13 20:05:06 +01:00
kervala	d55b781374	Fixed: Use map for faster search for example (implemented a TODO of GUIGUI)	2016-01-13 20:04:01 +01:00
kervala	304297e284	Merge with develop	2016-01-02 20:29:55 +01:00
kervala	ae43a9ce4e	Fixed: Warnings with GCC	2016-01-02 19:19:39 +01:00
kervala	4a45f10c75	Merge with develop	2016-01-02 17:11:59 +01:00
kervala	3020f03333	Changed: Don't need to cast since it's already a sint32	2016-01-02 17:10:50 +01:00