Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
22571 commits 14 branches 1 tag 255 MiB
Commit graph

3429 commits

Author SHA1 Message Date
deed
d526953811 mise a jour de RC 2017-03-15 20:29:34 +01:00
Nimetu
85cd5beced Merge with develop 2017-03-15 17:45:19 +02:00
Nimetu
327686c1ce Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-15 17:45:19 +02:00
Nimetu
be591b2107 Changed: replace c++11 code 
--HG--
branch : develop
 2017-03-15 17:43:49 +02:00
Nimetu
5d827c967f Changed: replace c++11 code 2017-03-15 17:43:49 +02:00
Nimetu
6adae34ad3 Merge with develop 2017-03-14 23:42:52 +02:00
Nimetu
88c81e8895 Merge with develop 
--HG--
branch : compatibility-develop
 2017-03-14 23:42:52 +02:00
Guillaume Dupuy
c2049935a4 Support for an item beeing in multiple groups 
--HG--
branch : item_group
 2017-03-11 19:25:45 +01:00
Guillaume Dupuy
5dcc7932ff Forgot a return 
--HG--
branch : item_group
 2017-03-11 01:06:39 +01:00
Guillaume Dupuy
d4b2e64c21 Fix compilation 
--HG--
branch : item_group
 2017-03-10 11:51:36 +01:00
Guillaume Dupuy
8880c37fb2 Remove C++11 features 
--HG--
branch : item_group
 2017-03-09 21:31:26 +01:00
Guillaume Dupuy
54ff3a88d5 Fix a crash 
--HG--
branch : item_group
 2017-03-09 20:52:02 +01:00
Guillaume Dupuy
6c9bbb8c0b Allow support for room / guild movement 
--HG--
branch : item_group
 2017-03-09 18:54:12 +01:00
Guillaume Dupuy
ecf2ac530c Remove usePrice from xml, it's now used if minPrice or maxPrice are not default value 
--HG--
branch : item_group
 2017-03-09 17:58:07 +01:00
Guillaume Dupuy
9fffec8ef1 Added interface for item groups 
--HG--
branch : item_group
 2017-03-09 17:47:25 +01:00
Guillaume Dupuy
fdbc261a7e First working prototype of itemgroups 
--HG--
branch : item_group
 2017-03-08 17:30:09 +01:00
Nimetu
cea9549cd8 Added: Clickable urls in chat text (issue 282) 
--HG--
branch : develop
 2017-01-21 13:29:34 +02:00
Nimetu
2e5bcdf248 Added: Clickable urls in chat text (issue 282) 2017-01-21 13:29:34 +02:00
Nimetu
0f5ec6c0b4 Fixed: Windowed resolution resetting when closing from login/outgame views. 
--HG--
branch : develop
 2017-01-12 13:29:47 +02:00
Nimetu
795c91bcc8 Fixed: Windowed resolution resetting when closing from login/outgame views. 2017-01-12 13:29:47 +02:00
ulukyn
3d270b7a1f Fixed: Scenographic Editor lua issues 2017-01-11 16:27:25 +01:00
ulukyn@gmail.com
c43627159c Fixed: Scenographic Editor lua issues 
--HG--
branch : compatibility-develop
 2017-01-11 16:27:25 +01:00
Nimetu
109725fc9e Changed: Move dyn channel commands (/0, /1 ..) to commands.xml 
--HG--
branch : develop
 2017-01-11 15:12:06 +02:00
Nimetu
9db20a28cb Changed: Move dyn channel commands (/0, /1 ..) to commands.xml 2017-01-11 15:12:06 +02:00
ulukyn
f8b7db0bfe Fixed: Scenographic Editor crash the client (revert bad commit of actions.h) 2017-01-10 12:35:53 +01:00
ulukyn@gmail.com
8dce467417 Fixed: Scenographic Editor crash the client (revert bad commit of actions.h) 
--HG--
branch : compatibility-develop
 2017-01-10 12:35:53 +01:00
ulukyn
57057b7794 Fixed: Scenographic Editor crash the client 2017-01-10 12:32:44 +01:00
ulukyn@gmail.com
56c4674d10 Fixed: Scenographic Editor crash the client 
--HG--
branch : compatibility-develop
 2017-01-10 12:32:44 +01:00
kervala
4f518b4b1d Merge with develop 2016-12-31 15:16:40 +01:00
kervala
cdd1250066 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-31 15:16:40 +01:00
kervala
1bb75d8956 Fixed: Bug with C++11 under Linux with clang (an iterator is invalidated after an erase) 
--HG--
branch : develop
 2016-12-31 15:16:09 +01:00
kervala
e1549eb73c Fixed: Bug with C++11 under Linux with clang (an iterator is invalidated after an erase) 2016-12-31 15:16:09 +01:00
kervala
6f4c2c843f Merge with develop 2016-12-24 14:24:44 +01:00
kervala
c91cd27a25 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-24 14:24:44 +01:00
kervala
66fcc5081a Changed: Temporary comment Lua functions registration (crash when reselect characters) 
--HG--
branch : develop
 2016-12-24 14:02:33 +01:00
kervala
30545b8f7c Changed: Temporary comment Lua functions registration (crash when reselect characters) 2016-12-24 14:02:33 +01:00
kervala
3265749bfe Changed: Don't need to release twice CEditor 
--HG--
branch : develop
 2016-12-24 14:01:51 +01:00
kervala
16b5e22864 Changed: Don't need to release twice CEditor 2016-12-24 14:01:51 +01:00
kervala
48734b6d2f Changed: Minor change 
--HG--
branch : develop
 2016-12-24 14:01:35 +01:00
kervala
7cca6c1443 Changed: Minor change 2016-12-24 14:01:35 +01:00
kervala
d8ffb10df8 Changed: Use a global C64BitsParts union to avoid strict aliasing warnings 
--HG--
branch : develop
 2016-12-24 14:01:21 +01:00
kervala
73663e30dc Changed: Use a global C64BitsParts union to avoid strict aliasing warnings 2016-12-24 14:01:21 +01:00
kervala
31cf9a5349 Fixed: Steam latest client API changes 2016-12-23 13:49:49 +01:00
kervala
6927bb5849 Fixed: Steam latest client API changes 
--HG--
branch : compatibility-develop
 2016-12-23 13:49:49 +01:00
kervala
8bf9a665ce Merge with develop 2016-12-19 17:48:07 +01:00
kervala
8884a8fcb1 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-19 17:48:07 +01:00
kervala
1b1e08b7f6 Changed: Warnings 
--HG--
branch : develop
 2016-12-19 17:47:15 +01:00
kervala
c9413d7b63 Changed: Warnings 2016-12-19 17:47:15 +01:00
kervala
6570b26297 Fixed: Virtual methods with different parameters 
--HG--
branch : develop
 2016-12-19 17:46:07 +01:00
kervala
67e3108c25 Fixed: Virtual methods with different parameters 2016-12-19 17:46:07 +01:00
kervala
0da48b0abb Merge with develop 2016-12-19 15:58:48 +01:00
kervala
b04451c473 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-19 15:58:48 +01:00
kervala
4e0a19205c Changed: Check return value of fwrite 
--HG--
branch : develop
 2016-12-19 15:50:54 +01:00
kervala
4e9788116f Changed: Check return value of fwrite 2016-12-19 15:50:54 +01:00
kervala
7aabc217b0 Fixed: Compilation under Linux 
--HG--
branch : develop
 2016-12-19 15:50:21 +01:00
kervala
3f8aa231a5 Fixed: Compilation under Linux 2016-12-19 15:50:21 +01:00
kervala
db9fbd2746 Fixed: Strict aliasing warnings 
--HG--
branch : develop
 2016-12-19 15:49:50 +01:00
kervala
e30ba1d186 Fixed: Strict aliasing warnings 2016-12-19 15:49:50 +01:00
kervala
8db7d75e7e Fixed: Uninitialized variables 
--HG--
branch : develop
 2016-12-19 15:43:38 +01:00
kervala
82d8e04ab2 Fixed: Uninitialized variables 2016-12-19 15:43:38 +01:00
kervala
c7ef9d9773 Merge with develop 2016-12-19 13:58:14 +01:00
kervala
929cf93b87 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-19 13:58:14 +01:00
kervala
6978dc9bee Changed: Use std::string instead of const char* 
--HG--
branch : develop
 2016-12-19 13:33:24 +01:00
kervala
5c36c08b60 Changed: Use std::string instead of const char* 2016-12-19 13:33:24 +01:00
kervala
e186c7796b Changed: New DEV command to display a bubble with a long text 
--HG--
branch : develop
 2016-12-19 13:16:27 +01:00
kervala
d0a87e5210 Changed: New DEV command to display a bubble with a long text 2016-12-19 13:16:27 +01:00
kervala
31a540b35d Changed: Replace size() comparisons by empty() ones 
--HG--
branch : develop
 2016-12-19 13:15:25 +01:00
kervala
4b36ad57cb Changed: Replace size() comparisons by empty() ones 2016-12-19 13:15:25 +01:00
kervala
bbf15b7a80 Merge with develop 2016-12-19 12:02:47 +01:00
kervala
89318ea69d Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-19 12:02:47 +01:00
kervala
1e45f7bd45 Fixed: Truncated bubble texts 
--HG--
branch : develop
 2016-12-19 12:01:55 +01:00
kervala
5203c18a69 Fixed: Truncated bubble texts 2016-12-19 12:01:55 +01:00
kervala
1e8d28759a Merge with develop 2016-12-18 20:44:33 +01:00
kervala
c8bc57d0a4 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-18 20:44:33 +01:00
kervala
8da20b30cc Changed: Merged changes from compatibility-develop that should also be in develop 
--HG--
branch : develop
 2016-12-18 20:39:16 +01:00
kervala
44a7872135 Changed: Merged changes from compatibility-develop that should also be in develop 2016-12-18 20:39:16 +01:00
kervala
bb28b25e71 Merge with develop 2016-12-18 14:47:16 +01:00
kervala
4e99767ae2 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-18 14:47:16 +01:00
kervala
1ed5dcdda9 Changed: Use %u instead of %d for uint 
--HG--
branch : develop
 2016-12-18 14:00:20 +01:00
kervala
22e236f2fe Changed: Use %u instead of %d for uint 2016-12-18 14:00:20 +01:00
kervala
c4d8565185 Changed: Make 2 different upgd_nl.bat depending on compiler 
--HG--
branch : develop
 2016-12-18 13:58:20 +01:00
kervala
33983dec8d Changed: Make 2 different upgd_nl.bat depending on compiler 2016-12-18 13:58:20 +01:00
kervala
cbf2c744f0 Changed: Replace some const char* by std::string 
--HG--
branch : develop
 2016-12-18 13:45:07 +01:00
kervala
288b13dbfb Changed: Replace some const char* by std::string 2016-12-18 13:45:07 +01:00
kervala
487a6eacfa Merge with develop 2016-12-15 21:12:19 +01:00
kervala
81008cd9ff Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-15 21:12:19 +01:00
kervala
3142a8d99f Changed: Support VC++ 2013 DLLs 
--HG--
branch : develop
 2016-12-15 21:11:27 +01:00
kervala
77c4520ce3 Changed: Support VC++ 2013 DLLs 2016-12-15 21:11:27 +01:00
ulukyn
ae32111ea2 Fixed: Load Scenographic Editor lua files 2016-12-14 22:24:49 +01:00
ulukyn@gmail.com
3f58cbd077 Fixed: Load Scenographic Editor lua files 
--HG--
branch : compatibility-develop
 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@gmail.com
b0dc979718 Fixed: Load Scenographic Editor lua files 
--HG--
branch : compatibility-develop
 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@gmail.com
6238139c08 Fixed: Load Scenographic Editor lua files 
--HG--
branch : compatibility-develop
 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@gmail.com
6ff3cc9d77 Added: sceneedit.lua and json.lua used by Scenographic Editor 
--HG--
branch : compatibility-develop
 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@gmail.com
c6f10d493d Fixed: updateVector don't need return a boolean 
--HG--
branch : compatibility-develop
 2016-12-13 23:42:02 +01:00
ulukyn
66a34ace54 Fusion 2016-12-13 21:16:30 +01:00
ulukyn@gmail.com
68e6dbaf9a Fusion 
--HG--
branch : compatibility-develop
 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
ulukyn@gmail.com
80fc274813 Fixed: Removing some nlinfo and correction getMouseRightDown 
--HG--
branch : compatibility-develop
 2016-12-13 21:08:33 +01:00
kervala
861a9b399a Merge with develop 2016-12-11 14:25:19 +01:00
kervala
2b53cc82aa Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-11 14:25:19 +01:00
kervala
bd8cdb46e0 Fixed: Wrong indent 
--HG--
branch : develop
 2016-12-11 14:21:28 +01:00
kervala
bb3f3370b8 Fixed: Wrong indent 2016-12-11 14:21:28 +01:00
kervala
e7d1710747 Chnged: Sign comparison warning 
--HG--
branch : develop
 2016-12-11 14:20:52 +01:00
kervala
43a3391a98 Chnged: Sign comparison warning 2016-12-11 14:20:52 +01:00
kervala
c240c45514 Changed: Removed unused variables 
--HG--
branch : develop
 2016-12-11 14:20:31 +01:00
kervala
b4d5bb9af5 Changed: Removed unused variables 2016-12-11 14:20:31 +01:00
kervala
f3147c7616 Merge with develop 2016-12-11 12:43:05 +01:00
kervala
035a267e92 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-11 12:43:05 +01:00
kervala
71b5a1734e Fixed: Compilation 
--HG--
branch : develop
 2016-12-11 12:42:06 +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
ac404a2c8f Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-11 12:32:05 +01:00
kervala
106c924f49 Fixed: Use std::vector instead of CUniquePtr for arrays 
--HG--
branch : develop
 2016-12-11 12:31:24 +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@gmail.com
1a4c020e56 Added: ARKPACSBorders to enable/disable the display of collisions by user 
--HG--
branch : compatibility-develop
 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@gmail.com
9e73cd8d22 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

--HG--
branch : compatibility-develop
 2016-12-10 22:04:33 +01:00
kervala
dab3de7a74 Merge with develop 2016-12-10 19:52:43 +01:00
kervala
f085121937 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-10 19:52:43 +01:00
kervala
faecd5b952 Changed: extern keyword useless there 
--HG--
branch : develop
 2016-12-10 19:02:06 +01:00
kervala
e1f810ffba Changed: extern keyword useless there 2016-12-10 19:02:06 +01:00
kervala
d37a1e032c Fixed: Don't call CCoTask::releaseInstance() because allocated on heap 
--HG--
branch : develop
 2016-12-10 19:01:34 +01:00
kervala
0be5b4b248 Fixed: Don't call CCoTask::releaseInstance() because allocated on heap 2016-12-10 19:01:34 +01:00
kervala
9a6b3c91b7 Changed: Minor changes 
--HG--
branch : develop
 2016-12-10 18:58:13 +01:00
kervala
7fb636f37d Changed: Minor changes 2016-12-10 18:58:13 +01:00
kervala
934df9bd6f Changed: Already a std::string 
--HG--
branch : develop
 2016-12-10 13:09:16 +01:00
kervala
51068e2164 Changed: Already a std::string 2016-12-10 13:09:16 +01:00
kervala
ab44d7e809 Changed: Use a CUniquePtr macro since std::unique_ptr doesn't exist on all (yet) supported platforms 
--HG--
branch : develop
 2016-12-10 12:05:29 +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
0f6ae5e239 Changed: Release all memory when leaving in login screen 
--HG--
branch : develop
 2016-12-09 16:15:18 +01:00
kervala
a6b31df8de Changed: Release all memory when leaving in login screen 2016-12-09 16:15:18 +01:00
kervala
eabfcbf708 Fixed: Release CCurrentCoTask singleton 
--HG--
branch : develop
 2016-12-09 16:14:16 +01:00
kervala
9bfa8f1049 Fixed: Release CCurrentCoTask singleton 2016-12-09 16:14:16 +01:00
kervala
995ea1e64f Changed: Unimplemented functions 
--HG--
branch : develop
 2016-12-09 16:04:50 +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
e2b74b77c6 Changed: Memory leaks detection 
--HG--
branch : develop
 2016-12-09 13:51:09 +01:00
kervala
75e183e637 Backed out changeset: 6b7af3bc4752 2016-12-08 18:20:34 +01:00
kervala
c767e55344 Backed out changeset: 6b7af3bc4752 
--HG--
branch : compatibility-develop
 2016-12-08 18:20:34 +01:00
kervala
52301431e4 Merge with develop 2016-12-06 20:29:22 +01:00
kervala
5ce03c278b Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-06 20:29:22 +01:00
kervala
e5362bdae7 Changed: Warning 
--HG--
branch : develop
 2016-12-06 20:27:05 +01:00
kervala
9022dfafde Fixed: Compilation with clang 
--HG--
branch : develop
 2016-12-06 20:26:48 +01:00
kervala
21f31f1827 Merge with develop 2016-12-05 19:53:15 +01:00
kervala
4316dfaa98 Merge with develop 
--HG--
branch : compatibility-develop
 2016-12-05 19:53:15 +01:00