kervala
|
0da48b0abb
|
Merge with develop
|
2016-12-19 15:58:48 +01:00 |
|
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
|
03aeffdda7
|
Merge with develop
|
2016-12-19 09:27:18 +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 |
|
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 |
|
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
|
d3dc21ad46
|
Merge with develop
|
2016-12-12 12:03:15 +01:00 |
|
kervala
|
5acd03d77d
|
Merge with develop
|
2016-12-11 19:27:27 +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 |
|
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 |
|
kervala
|
75e183e637
|
Backed out changeset: 6b7af3bc4752
|
2016-12-08 18:20:34 +01:00 |
|
kervala
|
b9adbbca89
|
Changed: Version 3.1.0
|
2016-12-08 18:19:36 +01:00 |
|
kervala
|
1c8dff239d
|
Merge with develop
|
2016-12-08 10:51:07 +01:00 |
|
kervala
|
52301431e4
|
Merge with develop
|
2016-12-06 20:29:22 +01:00 |
|
kervala
|
6d67ad70e0
|
Merge with develop
|
2016-12-05 20:13:49 +01:00 |
|
kervala
|
21f31f1827
|
Merge with develop
|
2016-12-05 19:53:15 +01:00 |
|
kervala
|
7036702324
|
Merge with develop
|
2016-12-05 14:06:48 +01:00 |
|
kervala
|
1ae9e6c9f1
|
Merge with develop
|
2016-12-05 12:03:34 +01:00 |
|
kervala
|
5e67e0f93c
|
Merge with develop
|
2016-12-05 09:53:58 +01:00 |
|
kervala
|
5baaa3bcd9
|
Merge with develop
|
2016-12-05 09:04:36 +01:00 |
|
kervala
|
b61c9d4cf8
|
Merge with develop
|
2016-12-04 20:31:56 +01:00 |
|
kervala
|
b3e23b5ef0
|
Merge with develop
|
2016-12-04 20:01:00 +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 |
|
kervala
|
0bbabbf635
|
Merge with develop
|
2016-11-26 16:32:57 +01:00 |
|
kervala
|
4cdd6c845f
|
Merge with develop
|
2016-11-26 16:17:04 +01:00 |
|
Nimetu
|
dcf8b9b77c
|
Changed: Added translation
|
2016-11-26 15:24:27 +02:00 |
|
Nimetu
|
3ab4c7d714
|
Merge with develop
|
2016-11-26 15:24:24 +02:00 |
|
kervala
|
99ab8fba3e
|
Merge with develop
|
2016-11-26 13:20:32 +01:00 |
|
kervala
|
5daac508c1
|
Merge with develop
|
2016-11-25 10:58:35 +01:00 |
|
kervala
|
4bf0e1b0d9
|
Merge with develop
|
2016-11-25 10:44:44 +01:00 |
|