Commit graph

54 commits

Author SHA1 Message Date
kervala
1e8d28759a Merge with develop 2016-12-18 20:44:33 +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
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
21f31f1827 Merge with develop 2016-12-05 19:53:15 +01:00
kervala
18ca67b199 Merge with develop 2016-12-04 17:32:34 +01: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
Nimetu
e529295ca4 Merge with develop 2016-11-13 23:07:03 +02: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
c3bcfb42b8 Merge with develop 2016-10-20 13:08:48 +02:00
kervala
4c51c4e68c Merge with develop 2016-09-24 14:22:22 +02:00
Nimetu
e146348e03 Merge with develop 2016-09-21 20:12:51 +03:00
Nimetu
70aa8676c2 Merge with develop 2016-07-25 19:27:04 +03:00
Nimetu
85838aec19 Merge with develop 2016-07-24 16:09:25 +03:00
Nimetu
0be0a1e9e7 Merge with develop 2016-07-23 11:28:22 +03:00
kervala
120d2d7dba Merge with develop 2016-06-26 19:43:53 +02:00
Nimetu
975ed523be Merge with develop 2016-06-25 22:30:51 +03:00
Nimetu
8f9d7078bd Merge with develop 2016-06-12 12:49:14 +03:00
Nimetu
dca7c1f40b Merge with develop 2016-06-04 10:36:21 +03:00
kervala
6fbf8c5326 Merge with develop 2016-05-26 19:36:25 +02:00
Nimetu
13bef3b94d Merge with develop 2016-05-14 13:47:03 +03:00
Nimetu
8c7086fa9d Merge with develop 2016-05-13 13:58:33 +03:00
Nimetu
932acf2e11 Merge with develop 2016-05-09 20:14:15 +03:00
Nimetu
3530beb7fe Merge with develop 2016-05-05 15:01:10 +03:00
Nimetu
a26d4063f7 Merge with develop 2016-04-23 18:49:52 +03:00
kervala
208e02b31e Merge with develop 2016-04-06 09:34:34 +02:00
kervala
5109ae5443 Merge with develop 2016-03-19 19:30:06 +01:00
kaetemi
eb8835c36c Merge with develop 2016-03-08 12:46:47 +01:00
Nimetu
526a716948 Merge with develop 2016-03-03 00:00:30 +02:00
Nimetu
94d2d95efa Merge with develop 2016-03-01 22:39:10 +02:00
kervala
0350c97f0a Merge with develop 2016-02-20 19:29:00 +01:00
Nimetu
02d706092b Merge with develop 2016-02-14 01:24:10 +02:00
kervala
0f3a4cb78e Merge with develop 2016-01-26 23:30:48 +01:00
kervala
1dd308474c Merge with develop 2016-01-26 22:44:40 +01:00
Nimetu
493329ca7f Merge with develop 2016-01-20 19:15:45 +02:00
kervala
628c2b1d80 Merge with develop 2016-01-16 10:52:18 +01:00
kervala
1b7db1e92d Merge with develop 2016-01-11 11:44:44 +01:00
Nimetu
4158e851a9 Merge with develop 2016-01-10 16:34:13 +02:00
Nimetu
378b520048 Merge with develop 2016-01-06 01:02:22 +02:00
kervala
d46d1e45ad Merge with develop 2016-01-05 13:00:18 +01:00
kervala
1354d99609 Merge with develop 2016-01-02 17:11:59 +01:00
kervala
ce91dc1cf8 Merge with develop 2015-12-26 15:13:08 +01:00
kervala
f66c15c5da Merge with develop 2015-12-26 14:38:37 +01:00
kervala
8dda998ea5 Merged with develop 2015-12-25 20:52:18 +01:00
Nimetu
0f44e01d18 Merge with develop 2015-12-22 01:30:11 +02:00