216 commits

Author	SHA1	Message	Date
kervala	c7ef9d9773	Merge with develop	2016-12-19 13:58:14 +01:00
kervala	bbf15b7a80	Merge with develop	2016-12-19 12:02:47 +01:00
kervala	1e8d28759a	Merge with develop	2016-12-18 20:44:33 +01:00
kervala	bb28b25e71	Merge with develop	2016-12-18 14:47:16 +01:00
kervala	487a6eacfa	Merge with develop	2016-12-15 21:12:19 +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
kervala	861a9b399a	Merge with develop	2016-12-11 14:25:19 +01:00
kervala	f3147c7616	Merge with develop	2016-12-11 12:43:05 +01:00
kervala	486a5e4638	Merge with develop	2016-12-11 12:32:05 +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
kervala	dab3de7a74	Merge with develop	2016-12-10 19:52:43 +01:00
kervala	75e183e637	Backed out changeset: 6b7af3bc4752	2016-12-08 18:20:34 +01:00
kervala	52301431e4	Merge with develop	2016-12-06 20:29:22 +01:00
kervala	21f31f1827	Merge with develop	2016-12-05 19:53:15 +01:00
kervala	c53133e7f2	Merge with develop	2016-12-04 19:19:15 +01:00
kervala	061bed6635	Merge with develop	2016-12-04 18:39:21 +01:00
kervala	18ca67b199	Merge with develop	2016-12-04 17:32:34 +01:00
C?dric OCHS	916f1b008b	Merged in Glorf/ryzomcore/target_sheet (pull request #142) ... Update target command	2016-12-04 12:43:36 +00:00
Guillaume Dupuy	54f128ad17	Use std::string instead of ucstring	2016-12-04 13:37:04 +01:00
Guillaume Dupuy	6f1197d633	Allow target to work with sheetName and a quiet option ... HG : Enter commit message. Lines beginning with 'HG:' are removed.	2016-11-28 00:54:33 +01:00
Nimetu	3ab4c7d714	Merge with develop	2016-11-26 15:24:24 +02:00
kervala	4bf0e1b0d9	Merge with develop	2016-11-25 10:44:44 +01:00
kervala	4d96978674	Merge with develop	2016-11-20 14:51:11 +01:00
Nuno Gon?alves	e157a7453e	Changed: Fix the way to load ryzhome lua/xml files	2016-11-07 13:53:41 +01:00
kervala	9f434db97b	Merge with develop	2016-10-31 19:03:04 +01:00
kervala	7a1a082135	Merge with develop	2016-10-30 16:52:02 +01:00
kervala	0cfd8cb35d	Merge with develop	2016-10-27 16:48:45 +02:00
kervala	c9244568eb	Merge with develop	2016-10-26 14:30:17 +02:00
kervala	956da7f9da	Merge with develop	2016-10-25 17:41:54 +02:00
kervala	dc9c463483	Changed: Don't force PatchUrl in client_default.cfg	2016-10-25 14:10:25 +02:00
kervala	df676ede7e	Merge with develop	2016-10-25 11:50:27 +02:00
kervala	627dea4a06	Merge with develop	2016-10-23 16:29:49 +02:00
kervala	bb9608bcea	Merge with develop	2016-10-22 19:40:34 +02:00
kervala	14917f114f	Merge with develop	2016-10-22 16:55:51 +02:00
kervala	2945dbf3b9	Merge with develop	2016-10-21 20:00:50 +02:00
kervala	c26056c53a	Merge with develop	2016-10-21 19:04:29 +02:00
kervala	52678ea899	Merge with develop	2016-10-20 13:55:34 +02:00
kervala	afc03e63ee	Merge with develop	2016-10-19 17:25:45 +02:00
kervala	6fc090d4c1	Merge with develop	2016-10-19 13:32:14 +02:00
kervala	a388c89fd5	Merge with develop	2016-10-19 10:50:26 +02:00
kervala	ff2bb04474	Merge with develop	2016-10-18 10:33:11 +02:00
kervala	bbb97b7b5b	Merge with develop	2016-10-17 16:51:42 +02:00
kervala	eaa19cdfd2	Merge with develop	2016-10-17 13:30:00 +02:00