8996 commits

Author	SHA1	Message	Date
kervala	bbf15b7a80	Merge with develop	2016-12-19 12:02:47 +01:00
kervala	5203c18a69	Fixed: Truncated bubble texts	2016-12-19 12:01:55 +01:00
kervala	03aeffdda7	Merge with develop	2016-12-19 09:27:18 +01:00
kervala	76848d6172	Changed: Minor changes	2016-12-19 09:26:46 +01:00
kervala	93b0557ca1	Fixed: Wrong argument checked	2016-12-19 09:26:28 +01:00
kervala	1fdd44a673	Fixed: Servers compilation	2016-12-19 09:25:51 +01:00
kervala	1e8d28759a	Merge with develop	2016-12-18 20:44:33 +01:00
kervala	5152d83666	Fixed: Compilation	2016-12-18 20:39:47 +01:00
kervala	3c1ff1f14b	Changed: Minor changes	2016-12-18 20:39:35 +01:00
kervala	44a7872135	Changed: Merged changes from compatibility-develop that should also be in develop	2016-12-18 20:39:16 +01:00
kervala	bb28b25e71	Merge with develop	2016-12-18 14:47:16 +01:00
kervala	8cbdf6917a	Fixed: Unicode MFC use	2016-12-18 14:42:04 +01:00
kervala	9032a98096	Changed: Strings initialization	2016-12-18 14:41:47 +01:00
kervala	e2f3e5ee89	Changed: Replaced comparisons with string("") by empty() check	2016-12-18 14:40:54 +01:00
kervala	b87ce2c134	Changed: Use NLMISC::toString instead of sprintf	2016-12-18 14:03:29 +01:00
kervala	525ec6b487	Fixed: Warning when generating DLU	2016-12-18 14:00:55 +01:00
kervala	22e236f2fe	Changed: Use %u instead of %d for uint	2016-12-18 14:00:20 +01:00
kervala	c4cd6ccfc2	Fixed: Compilation	2016-12-18 13:59:17 +01:00
kervala	ff0581a402	Fixed: Unicode MFC use	2016-12-18 13:59:02 +01:00
kervala	33983dec8d	Changed: Make 2 different upgd_nl.bat depending on compiler	2016-12-18 13:58:20 +01:00
kervala	5756137e9f	Changed: Memory leaks detection	2016-12-18 13:57:26 +01:00
kervala	288b13dbfb	Changed: Replace some const char* by std::string	2016-12-18 13:45:07 +01:00
Guillaume Dupuy	116769bc4e	Remove duplicate code	2016-12-17 14:31:27 +01:00
Guillaume Dupuy	82dcde8aa6	Fix a bug where a monster could be stuck after dropping aggro while rooted	2016-12-17 02:47:05 +01:00
kervala	487a6eacfa	Merge with develop	2016-12-15 21:12:19 +01:00
kervala	77c4520ce3	Changed: Support VC++ 2013 DLLs	2016-12-15 21:11:27 +01:00
ulukyn	ae32111ea2	Fixed: Load Scenographic Editor lua files	2016-12-14 22:24:49 +01:00
ulukyn	fd1f324c5c	Fixed: Load Scenographic Editor lua files	2016-12-14 20:16:42 +01:00
ulukyn	8fc66a4af4	Fixed: Load Scenographic Editor lua files	2016-12-14 16:14:33 +01:00
ulukyn	569793d779	Added: sceneedit.lua and json.lua used by Scenographic Editor	2016-12-14 13:36:59 +01:00
ulukyn	390765d49f	Fixed: updateVector don't need return a boolean	2016-12-13 23:42:02 +01:00
ulukyn	66a34ace54	Fusion	2016-12-13 21:16:30 +01:00
ulukyn	448da5375d	Fixed: Removing some nlinfo and correction getMouseRightDown	2016-12-13 21:08:33 +01:00
deed	a6339b7fd9	Merge branch 'feature/v3+CI' into 'develop' ... Feature/v3+ci Toujours le merge de la v3... See merge request !28	2016-12-13 13:54:26 +00:00
kervala	d3dc21ad46	Merge with develop	2016-12-12 12:03:15 +01:00
kervala	e084c2014a	Fixed: Compilation	2016-12-12 12:02:25 +01:00
deed	0e55d39f53	Update egs_mirror.cpp (ajout ChaScore1 ) warning dans le shard	2016-12-12 09:34:03 +00:00
kervala	5acd03d77d	Merge with develop	2016-12-11 19:27:27 +01:00
kervala	ea2caaeb55	Changed: Fix warning	2016-12-11 19:26:38 +01:00
kervala	64bcfd92fa	Fixed: Compilation with clang	2016-12-11 19:26:23 +01:00
kervala	861a9b399a	Merge with develop	2016-12-11 14:25:19 +01:00
kervala	3e98e267a2	Fixed: Use -Wno-...	2016-12-11 14:24:43 +01:00
kervala	879cac9d29	Changed: GCC warnings	2016-12-11 14:23:58 +01:00
kervala	bb3f3370b8	Fixed: Wrong indent	2016-12-11 14:21:28 +01:00
kervala	43a3391a98	Chnged: Sign comparison warning	2016-12-11 14:20:52 +01:00
kervala	b4d5bb9af5	Changed: Removed unused variables	2016-12-11 14:20:31 +01:00
kervala	f3147c7616	Merge with develop	2016-12-11 12:43:05 +01:00
kervala	e8b906c59b	Fixed: Compilation	2016-12-11 12:42:06 +01:00
kervala	486a5e4638	Merge with develop	2016-12-11 12:32:05 +01:00
kervala	3665c79b3a	Fixed: Use std::vector instead of CUniquePtr for arrays	2016-12-11 12:31:24 +01:00