14761 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
deed	9bd0bf131c	Update .gitlab-ci.yml	2016-12-13 13:22:52 +00:00
deed	f46cad2e63	Update .gitlab-ci.yml	2016-12-13 12:56:37 +00:00
deed	1fdbb7e688	Update .gitlab-ci.yml	2016-12-13 12:47:22 +00:00
deed	4f784dc460	Update .gitlab-ci.yml	2016-12-13 12:35:32 +00:00
deed	7369ce6f78	Update .gitlab-ci.yml	2016-12-12 21:51:23 +00:00
deed	eba869c7f0	Update .gitlab-ci.yml	2016-12-12 21:46:56 +00:00
deed	2e8bfb3f0b	Update .gitlab-ci.yml	2016-12-12 21:39:35 +00:00
deed	9242213489	Update .gitlab-ci.yml	2016-12-12 21:36:14 +00:00
deed	5cedb47135	Update .gitlab-ci.yml	2016-12-12 21:24:36 +00:00
deed	2a21b4b517	Update .gitlab-ci.yml	2016-12-12 21:13:26 +00:00
deed	f229de6ba5	Update .gitlab-ci.yml	2016-12-12 14:59:45 +00:00
deed	3c25a4eb8c	Update .gitlab-ci.yml	2016-12-12 14:32:42 +00:00
deed	15db81852c	Update .gitlab-ci.yml	2016-12-12 14:28:21 +00:00
deed	a549e75526	Update .gitlab-ci.yml	2016-12-12 13:58:04 +00:00
deed	e7a8320e98	Update .gitlab-ci.yml	2016-12-12 13:30:54 +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
kervala	ffdbcd1ab8	Changed: Use %u for uint	2016-12-11 11:59:30 +01:00
kervala	42497fed77	Changed: Display line number instead of a pointer on a string	2016-12-11 11:59:10 +01:00
kervala	93fa57d25c	Fixed: %s needs a const char*	2016-12-11 11:58:30 +01:00
kervala	27d3fd12d9	Fixed: Don't crash if a file is not unique in BNPs	2016-12-11 11:57:02 +01:00
ulukyn	2a7615b2f4	Added: ARKPACSBorders to enable/disable the display of collisions by user	2016-12-10 22:05:38 +01:00
ulukyn	512d300741	Added: Export usefull cursor and shape functions in lua: ... getGroundAtMouse getMousePos getMouseDown getMouseMiddleDown getMouseRightDown setMouseCursor setupShape getShapeIdAt addShape moveShape rotateShape getShapePos getShapeScale getShapeRot getShapeColPos getShapeColScale getShapeColOrient deleteShape	2016-12-10 22:04:33 +01:00
ulukyn	18b024f0c7	Added: Add lua function to have an icon at left of menu option	2016-12-10 21:58:15 +01:00
kervala	dab3de7a74	Merge with develop	2016-12-10 19:52:43 +01:00