Commit graph

159 commits

Author SHA1 Message Date
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
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
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
486a5e4638 Merge with develop 2016-12-11 12:32:05 +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
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
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
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
kervala
99ab8fba3e Merge with develop 2016-11-26 13:20:32 +01:00
kervala
4bf0e1b0d9 Merge with develop 2016-11-25 10:44:44 +01:00
kervala
1b0c3c2326 Merge with develop 2016-11-20 15:10:30 +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
4438ab108c Merge with develop 2016-11-07 14:12:11 +01:00
kervala
328da50ed2 Merge with develop 2016-11-03 15:23:32 +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
956da7f9da Merge with develop 2016-10-25 17:41:54 +02:00
kervala
df676ede7e Merge with develop 2016-10-25 11:50:27 +02:00
kervala
f1b0d8cc58 Changed: Use FMod driver by default under Windows (to verify if it's fixing crash when teleporting) 2016-10-24 13:54:06 +02:00
kervala
14917f114f Merge with develop 2016-10-22 16:55:51 +02:00
kervala
76c27c64f8 Merge with develop 2016-10-21 14:27:31 +02:00
kervala
c3bcfb42b8 Merge with develop 2016-10-20 13:08:48 +02:00
kervala
80cbda23e5 Merge with develop 2016-10-18 10:27:44 +02:00
kervala
8a52b34e09 Merge with develop 2016-10-17 11:49:38 +02:00
kervala
6fc8853d51 Merge with develop 2016-10-15 17:16:34 +02:00
kervala
35b59843cf Merge with develop 2016-10-10 18:55:28 +02:00
kervala
8fd439eb34 Merge with develop 2016-10-01 18:43:48 +02:00
kervala
c1439da922 Merge with develop 2016-09-25 10:50:38 +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
kervala
e68258e56e Merge with develop 2016-09-16 19:25:17 +02:00
kervala
89ab635693 Merge with develop 2016-09-12 14:39:38 +02:00
kervala
8c0af53b48 Merge with develop 2016-09-03 10:15:39 +02:00
Nimetu
3610c6c8cb Merge with develop 2016-08-30 21:27:56 +03:00
kervala
8af64c9e71 Merge with develop 2016-08-06 20:12:39 +02:00
Nimetu
70aa8676c2 Merge with develop 2016-07-25 19:27:04 +03:00