Commit graph

1018 commits

Author SHA1 Message Date
kervala
a5c5726601 Merge with develop 2017-01-03 13:43:52 +01:00
kervala
7d608488cd Merge with develop 2017-01-03 12:31:25 +01:00
kervala
db2581a789 Merge with develop 2017-01-02 09:58:41 +01:00
kervala
28561a7e94 Merge with develop 2017-01-01 22:45:29 +01:00
kervala
4f518b4b1d Merge with develop 2016-12-31 15:16:40 +01:00
kervala
6f4c2c843f Merge with develop 2016-12-24 14:24:44 +01:00
kervala
31cf9a5349 Fixed: Steam latest client API changes 2016-12-23 13:49:49 +01:00
kervala
a11e74f18e Merge with develop 2016-12-23 09:59:27 +01:00
Nimetu
485c4721bc Merge with develop 2016-12-21 23:48:28 +02:00
Nimetu
d994a29d79 Merge with develop 2016-12-21 23:16:48 +02:00
kervala
63b7d0f8fd Merge with develop 2016-12-21 15:18:59 +01:00
kervala
8bf9a665ce Merge with develop 2016-12-19 17:48:07 +01:00
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