Commit graph

72 commits

Author SHA1 Message Date
kervala
6f4c2c843f Merge with develop 2016-12-24 14:24:44 +01:00
kervala
8bf9a665ce Merge with develop 2016-12-19 17:48:07 +01:00
kervala
c7ef9d9773 Merge with develop 2016-12-19 13:58:14 +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
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
5e67e0f93c Merge with develop 2016-12-05 09:53:58 +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
4d96978674 Merge with develop 2016-11-20 14:51:11 +01:00
kervala
4438ab108c Merge with develop 2016-11-07 14:12:11 +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
14917f114f Merge with develop 2016-10-22 16:55:51 +02:00
Guillaume Dupuy
9ec5a6e693 Fixed a rare case where float and double mixup would result in an incorrect speed 2016-10-13 20:46:10 +02:00
Nimetu
e146348e03 Merge with develop 2016-09-21 20:12:51 +03: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
Nimetu
85838aec19 Merge with develop 2016-07-24 16:09:25 +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
kervala
208e02b31e Merge with develop 2016-04-06 09:34:34 +02:00
kervala
587804cab7 Merge with develop 2016-04-02 13:32:28 +02:00
kervala
e29d08861d Merge with develop 2016-04-02 11:34:39 +02:00
kaetemi
4bdca3e82e Merge with develop 2016-03-19 22:34:32 +01:00
kervala
5109ae5443 Merge with develop 2016-03-19 19:30:06 +01:00
kervala
dc52b3e24f Merge with develop 2016-03-19 16:21:46 +01:00
kervala
63b2843232 Merge with develop 2016-03-18 22:16:28 +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
24cfde8037 Merge with develop 2016-02-27 18:39:41 +01:00
kervala
0350c97f0a Merge with develop 2016-02-20 19:29:00 +01:00
kervala
08e9906e0d Merge with develop 2016-02-14 18:21:41 +01:00
kervala
3ab60af016 Merge with develop 2016-02-13 23:43:04 +01:00
kervala
cb4c93648e Merge with develop 2016-02-04 14:33:30 +01:00
kervala
4808dfcecb Merge with develop 2016-02-02 12:37:59 +01:00
kervala
1dd308474c Merge with develop 2016-01-26 22:44:40 +01:00
kervala
39e8135a82 Merge with develop 2016-01-23 10:19:01 +01:00
kervala
11f2f1e3e1 Merge with develop 2016-01-21 10:08:56 +01:00
Nimetu
493329ca7f Merge with develop 2016-01-20 19:15:45 +02:00
kervala
567ddba324 Merge with develop 2016-01-19 20:42:11 +01:00