Commit graph

264 commits

Author SHA1 Message Date
kervala
f3147c7616 Merge with develop 2016-12-11 12:43:05 +01:00
kervala
e8b906c59b Fixed: Compilation 2016-12-11 12:42:06 +01:00
kervala
486a5e4638 Merge with develop 2016-12-11 12:32:05 +01:00
kervala
3665c79b3a Fixed: Use std::vector instead of CUniquePtr for arrays 2016-12-11 12:31:24 +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
kervala
dab3de7a74 Merge with develop 2016-12-10 19:52:43 +01:00
kervala
e1f810ffba Changed: extern keyword useless there 2016-12-10 19:02:06 +01:00
kervala
0be5b4b248 Fixed: Don't call CCoTask::releaseInstance() because allocated on heap 2016-12-10 19:01:34 +01:00
kervala
7fb636f37d Changed: Minor changes 2016-12-10 18:58:13 +01:00
kervala
51068e2164 Changed: Already a std::string 2016-12-10 13:09:16 +01:00
kervala
bbeac21e82 Changed: Use a CUniquePtr macro since std::unique_ptr doesn't exist on all (yet) supported platforms 2016-12-10 12:05:29 +01:00
kervala
a6b31df8de Changed: Release all memory when leaving in login screen 2016-12-09 16:15:18 +01:00
kervala
9bfa8f1049 Fixed: Release CCurrentCoTask singleton 2016-12-09 16:14:16 +01:00
kervala
a905001849 Changed: Unimplemented functions 2016-12-09 16:04:50 +01:00
kervala
914980875b Changed: Unicode MFC support 2016-12-09 16:04:26 +01:00
kervala
75e183e637 Backed out changeset: 6b7af3bc4752 2016-12-08 18:20:34 +01:00
kervala
52301431e4 Merge with develop 2016-12-06 20:29:22 +01:00
kervala
21f31f1827 Merge with develop 2016-12-05 19:53:15 +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
Nimetu
3ab4c7d714 Merge with develop 2016-11-26 15:24:24 +02: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
Nuno Gon?alves
e157a7453e Changed: Fix the way to load ryzhome lua/xml files 2016-11-07 13:53:41 +01:00
kervala
9f434db97b Merge with develop 2016-10-31 19:03:04 +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
c9244568eb Merge with develop 2016-10-26 14:30:17 +02:00
kervala
956da7f9da Merge with develop 2016-10-25 17:41:54 +02:00
kervala
dc9c463483 Changed: Don't force PatchUrl in client_default.cfg 2016-10-25 14:10:25 +02:00
kervala
df676ede7e Merge with develop 2016-10-25 11:50:27 +02:00
kervala
627dea4a06 Merge with develop 2016-10-23 16:29:49 +02:00
kervala
bb9608bcea Merge with develop 2016-10-22 19:40:34 +02:00
kervala
14917f114f Merge with develop 2016-10-22 16:55:51 +02:00
kervala
2945dbf3b9 Merge with develop 2016-10-21 20:00:50 +02:00
kervala
c26056c53a Merge with develop 2016-10-21 19:04:29 +02:00
kervala
52678ea899 Merge with develop 2016-10-20 13:55:34 +02:00
kervala
afc03e63ee Merge with develop 2016-10-19 17:25:45 +02:00
kervala
6fc090d4c1 Merge with develop 2016-10-19 13:32:14 +02:00
kervala
a388c89fd5 Merge with develop 2016-10-19 10:50:26 +02:00
kervala
ff2bb04474 Merge with develop 2016-10-18 10:33:11 +02:00
kervala
bbb97b7b5b Merge with develop 2016-10-17 16:51:42 +02:00
kervala
eaa19cdfd2 Merge with develop 2016-10-17 13:30:00 +02:00
kervala
25d66dafa2 Merge with develop 2016-10-17 13:09:17 +02:00
kervala
2379918a3e Merge with develop 2016-10-16 17:39:37 +02:00
kervala
b8114b2cd6 Changed: Executable flags 2016-10-16 14:49:29 +02:00
kervala
6fc8853d51 Merge with develop 2016-10-15 17:16:34 +02:00
kervala
913b43f243 Merge with develop 2016-10-15 10:37:56 +02:00
kervala
e67d86eeda Merge with develop 2016-10-12 15:12:52 +02:00
kervala
c0be448a85 Merge with develop 2016-10-08 18:29:31 +02:00
kervala
6744ded402 Merge with develop 2016-09-28 23:55:21 +02:00
kervala
4c692ba040 Added: Ryzhome files 2016-09-25 14:21:42 +02:00
kervala
4c51c4e68c Merge with develop 2016-09-24 14:22:22 +02:00
kervala
fc903ff30c Removed: Textures shouldn't go in gamedev 2016-09-22 21:56:28 +02:00
kervala
e80aac9953 Merge with develop 2016-09-21 18:04:29 +02:00
kervala
203490b838 Merge with develop 2016-09-21 17:38:33 +02:00
kervala
420bf07057 Merge with develop 2016-09-21 17:34:34 +02:00
kervala
faff5ad04d Changed: Moved SSL certificate to gamedev 2016-09-21 12:46:04 +02:00
kervala
e20e3b4866 Merge with develop 2016-09-20 21:59:11 +02:00
kervala
58a8da6590 Merge with develop 2016-09-10 19:40:40 +02:00
Nimetu
3610c6c8cb Merge with develop 2016-08-30 21:27:56 +03:00
Nimetu
5e712f3e02 Merge with develop 2016-08-30 18:39:58 +03:00
kervala
d16ab852f3 Merge with develop 2016-08-26 13:55:25 +02:00
kervala
8f8ded0f12 Merge with develop 2016-08-26 13:01:32 +02:00
Nimetu
dee80dc90e Merge with develop 2016-08-25 22:18:35 +03:00
ulukyn
e9f3fa6ba4 Added: New getGroundZ lua function 2016-08-25 18:54:35 +02:00
kervala
dabd3b2fdb Merge with develop 2016-07-25 10:46:09 +02: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
Riasan
8aefb645e1 Fix: right text align by Info Window 2016-07-19 20:54:54 +02:00
kervala
ca0346645b Merge with develop 2016-07-19 09:42:54 +02:00
Nimetu
0d571e617e Backed out changeset: 61529eb4c24f 2016-07-18 23:44:47 +03:00
Riasan
8f15a04d2d Fix: Right Text Align by Map and Rewspwan Windows 2016-07-18 20:14:20 +02:00
Nimetu
25f6f1980f Merge with develop 2016-07-09 14:59:22 +03:00
kervala
a3b8a2749e Merge with develop 2016-07-09 13:48:03 +02:00
Nimetu
2ce1a63026 Merge with develop 2016-07-07 01:01:00 +03:00
Riasan
391706c1d8 Fix: Bad Position of Text after fix the Text High 2016-07-02 23:07:47 +02:00
Nimetu
62e5552859 Merge with develop 2016-07-01 23:38:32 +03:00
kervala
7df642535b Merge with develop 2016-07-01 10:42:21 +02:00
kervala
120d2d7dba Merge with develop 2016-06-26 19:43:53 +02:00
kervala
ad98793560 Merge with develop 2016-06-19 21:10:23 +02:00
Nimetu
1bff654c7b Merge with develop 2016-06-16 23:32:47 +03:00
kervala
3ae8a19af1 Merge with develop 2016-06-12 15:44:48 +02:00
Nimetu
8f9d7078bd Merge with develop 2016-06-12 12:49:14 +03:00
kervala
2275e55db9 Merge with develop 2016-06-07 13:32:06 +02:00
kervala
c4f5512b24 Merge with develop 2016-05-29 20:38:55 +02:00
kervala
ac448eac18 Merge with develop 2016-05-27 22:24:20 +02:00
kervala
6fbf8c5326 Merge with develop 2016-05-26 19:36:25 +02:00
kervala
ed03eb0a02 Merge with develop 2016-05-24 11:25:04 +02:00
kervala
1656e82303 Merge with develop 2016-05-18 14:31:14 +02:00
kervala
0c2cdd108e Merge with develop 2016-05-17 20:50:14 +02:00
kervala
0766c4766f Merge with develop 2016-05-17 11:02:02 +02:00
kervala
ece22ab9f3 Merge with develop 2016-05-15 12:05:19 +02:00
kervala
5bbd69cbe0 Merge with develop 2016-05-12 19:57:37 +02:00
kervala
bf79b16b5b Merge with develop 2016-05-08 13:42:53 +02:00