Commit graph

3036 commits

Author SHA1 Message Date
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
kervala
9bb46d2ae8 Fixed: Compilation with clang
--HG--
branch : develop
2016-12-05 19:39:19 +01:00
kervala
c53133e7f2 Merge with develop 2016-12-04 19:19:15 +01:00
kervala
44f2bcef8e Merge with develop
--HG--
branch : compatibility-develop
2016-12-04 19:19:15 +01:00
kervala
c71f712d11 Fixed: Release libxml2 structures before exit
--HG--
branch : develop
2016-12-04 19:17:21 +01:00
kervala
061bed6635 Merge with develop 2016-12-04 18:39:21 +01:00
kervala
c9c542de8b Merge with develop
--HG--
branch : compatibility-develop
2016-12-04 18:39:21 +01:00
kervala
00048f0d6d Changed: Don't use std::auto_ptr anymore (use std::unique_ptr instead)
--HG--
branch : develop
2016-12-04 18:38:16 +01:00
kervala
18ca67b199 Merge with develop 2016-12-04 17:32:34 +01:00
kervala
316ee0d69c Merge with develop
--HG--
branch : compatibility-develop
2016-12-04 17:32:34 +01:00
kervala
b4de1326d1 Fixed: Fix memory leaks about logs, displayers, etc...
--HG--
branch : develop
2016-12-04 17:23:28 +01:00
kervala
b8658f65f1 Changed: Don't need to use const char*
--HG--
branch : develop
2016-12-04 17:22:49 +01:00
kervala
35f1fa0609 Changed: Renamed thread to Thread and assign InstallThread and DownloadThread
--HG--
branch : develop
2016-12-04 17:19:37 +01:00
kervala
0449bee4a8 Changed: Replace 0 by NULL
--HG--
branch : develop
2016-12-04 17:17:25 +01:00
kervala
491b6a2b59 Fixed: Delete CViewRenderer instance (fix a memory leak)
--HG--
branch : develop
2016-12-04 17:17:06 +01:00
kervala
17847efa51 Fixed: Delete created thread (fix a memory leak)
--HG--
branch : develop
2016-12-04 17:15:43 +01:00
kervala
b6662b9e0b Changed: Memory leaks detection
--HG--
branch : develop
2016-12-04 17:00:20 +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
Cédric OCHS
f864aceee1 Merged in Glorf/ryzomcore/target_sheet (pull request #142)
Update target command

--HG--
branch : compatibility-develop
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
e82cb174e0 Use std::string instead of ucstring
--HG--
branch : target_sheet
2016-12-04 13:37:04 +01:00
kervala
e941cff0ff Fixed: Strict aliasing warnings
--HG--
branch : develop
2016-11-29 20:32:33 +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
Guillaume Dupuy
6bfb1fb588 Allow target to work with sheetName and a quiet option
HG : Enter commit message.  Lines beginning with 'HG:' are removed.

--HG--
branch : target_sheet
2016-11-28 00:54:33 +01:00
Nimetu
3ab4c7d714 Merge with develop 2016-11-26 15:24:24 +02:00
Nimetu
082b23ef55 Merge with develop
--HG--
branch : compatibility-develop
2016-11-26 15:24:24 +02:00
Nimetu
cf338681fa Changed: Add free-view mouse tablet mode option
--HG--
branch : develop
2016-11-26 14:55:38 +02:00
kervala
4bf0e1b0d9 Merge with develop 2016-11-25 10:44:44 +01:00
kervala
8adf092cb8 Merge with develop
--HG--
branch : compatibility-develop
2016-11-25 10:44:44 +01:00
kervala
88bfa8ec70 Fixed: Warnings
--HG--
branch : develop
2016-11-21 13:22:05 +01:00
kervala
4eb21c1612 Merge with develop
--HG--
branch : compatibility-develop
2016-11-20 14:51:11 +01:00
kervala
4d96978674 Merge with develop 2016-11-20 14:51:11 +01:00
kervala
f605c5faa5 Changed: Replace all "" by empty(), clear(), Empty(), etc...
--HG--
branch : develop
2016-11-20 14:49:13 +01:00
kervala
481bbae8ee Changed: Use wide versions of Win32 API
--HG--
branch : develop
2016-11-19 21:12:04 +01:00
kervala
9941fcf82b Fixed: Typos detected by Lintian
--HG--
branch : develop
2016-11-19 19:11:12 +01:00
kervala
f05cab8579 Changed: liblzma 16.04
--HG--
branch : develop
2016-11-15 11:32:20 +01:00
Sit Melai
ccb943b852 Merge de la v3 de Ryzom Core 2016-11-07 17:11:05 +01:00
Sit Melai
5231e8de28 various improvements to clients 2016-10-31 22:46:39 +01:00
kervala
7a894c1506 Merge with develop
--HG--
branch : compatibility-develop
2016-10-31 19:03:04 +01:00
kervala
9f434db97b Merge with develop 2016-10-31 19:03:04 +01:00
kervala
23d1d0f458 Fixed: Spaces in paths for patch under Linux and OS X
--HG--
branch : develop
2016-10-31 18:58:49 +01:00
kervala
ca9baf5e4c Fixed: Spaces in paths for patch under Linux and OS X 2016-10-31 18:58:49 +01:00
kervala
837197ca53 Merge with develop
--HG--
branch : compatibility-develop
2016-10-30 16:52:02 +01:00
kervala
7a1a082135 Merge with develop 2016-10-30 16:52:02 +01:00
kervala
b25298f0f8 Changed: std::string already empty
--HG--
branch : develop
2016-10-30 16:00:04 +01:00
kervala
ff11c8b8fb Changed: std::string already empty 2016-10-30 16:00:04 +01:00
kervala
16df8b8c1d Changed: Use empty() instead of comparison with ""
--HG--
branch : develop
2016-10-30 15:59:20 +01:00
kervala
b785a5114b Changed: Use empty() instead of comparison with "" 2016-10-30 15:59:20 +01:00
kervala
1e1f6ece8b Merge with develop
--HG--
branch : compatibility-develop
2016-10-27 16:48:45 +02:00
kervala
0cfd8cb35d Merge with develop 2016-10-27 16:48:45 +02:00
kervala
482b292a03 Changed: Minor changes
--HG--
branch : develop
2016-10-27 16:48:07 +02:00
kervala
afddb37b73 Changed: Minor changes 2016-10-27 16:48:07 +02:00
kervala
6d2c530210 Changed: Typo
--HG--
branch : develop
2016-10-27 10:55:20 +02:00
kervala
8a6a8765ac Changed: Typo 2016-10-27 10:55:20 +02:00
kervala
19e8ee1d05 Changed: Simplified all ENDIF and ELSE
--HG--
branch : develop
2016-10-27 10:54:09 +02:00
kervala
a53ec84c73 Changed: Simplified all ENDIF and ELSE 2016-10-27 10:54:09 +02:00
kervala
2afe4e5944 Merge with develop
--HG--
branch : compatibility-develop
2016-10-26 14:30:17 +02:00
kervala
c9244568eb Merge with develop 2016-10-26 14:30:17 +02:00
kervala
f2f2e94e51 Fixed: Crash when calling runAH in Lua scripts too soon
--HG--
branch : develop
2016-10-26 14:29:49 +02:00
kervala
d7782f758f Fixed: Crash when calling runAH in Lua scripts too soon 2016-10-26 14:29:49 +02:00
kervala
5322109eb3 Merge with develop
--HG--
branch : compatibility-develop
2016-10-25 17:41:54 +02:00
kervala
956da7f9da Merge with develop 2016-10-25 17:41:54 +02:00
kervala
a0075414c0 Changed: Use empty() to check if a string is empty
--HG--
branch : develop
2016-10-25 15:52:14 +02:00
kervala
56b8a61b16 Changed: Use empty() to check if a string is empty 2016-10-25 15:52:14 +02:00
kervala
35367c691f Merge with develop
--HG--
branch : compatibility-develop
2016-10-25 11:50:27 +02:00
kervala
df676ede7e Merge with develop 2016-10-25 11:50:27 +02:00
kervala
7f4fa540e1 Changed: Display a warning when SetWindowTextW fails
--HG--
branch : develop
2016-10-25 11:49:46 +02:00
kervala
f11527442c Changed: Display a warning when SetWindowTextW fails 2016-10-25 11:49:46 +02:00
kervala
564f00014a Merge with develop
--HG--
branch : compatibility-develop
2016-10-22 16:55:51 +02:00
kervala
14917f114f Merge with develop 2016-10-22 16:55:51 +02:00
kervala
f22fc6cea7 Changed: Support RYZOM_BUILD CMake option to force Bundle version
--HG--
branch : develop
2016-10-22 16:48:15 +02:00
kervala
b9ce644e15 Changed: Support RYZOM_BUILD CMake option to force Bundle version 2016-10-22 16:48:15 +02:00
kervala
d6eadbf02b Merge with develop
--HG--
branch : compatibility-develop
2016-10-21 20:00:50 +02:00
kervala
2945dbf3b9 Merge with develop 2016-10-21 20:00:50 +02:00
kervala
39280d10b8 Changed: MACOSX_BUNDLE_BUNDLE_VERSION must a short version
--HG--
branch : develop
2016-10-21 20:00:23 +02:00
kervala
3b00a6a2e0 Changed: MACOSX_BUNDLE_BUNDLE_VERSION must a short version 2016-10-21 20:00:23 +02:00
kervala
588d50a429 Merge with develop
--HG--
branch : compatibility-develop
2016-10-21 19:04:29 +02:00
kervala
c26056c53a Merge with develop 2016-10-21 19:04:29 +02:00
kervala
6920f0d5ba Fixed: Use real Ryzom version instead of 1.0
--HG--
branch : develop
2016-10-21 19:03:40 +02:00
kervala
162e4c6912 Fixed: Use real Ryzom version instead of 1.0 2016-10-21 19:03:40 +02:00
kervala
6964d7a68e Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 13:55:34 +02:00
kervala
52678ea899 Merge with develop 2016-10-20 13:55:34 +02:00
kervala
084bc2bba9 Changed: Allow to enable Sandbox under OS X
--HG--
branch : develop
2016-10-20 13:53:23 +02:00
kervala
6f1bb45f47 Changed: Allow to enable Sandbox under OS X 2016-10-20 13:53:23 +02:00
kervala
1e98eeaa0b Merge with develop
--HG--
branch : compatibility-develop
2016-10-19 17:25:45 +02:00
kervala
afc03e63ee Merge with develop 2016-10-19 17:25:45 +02:00
kervala
5539873337 Fixed: Use 3 numbers version (without revision) for MACOSX_BUNDLE_SHORT_VERSION_STRING
--HG--
branch : develop
2016-10-19 17:07:31 +02:00
kervala
7dcfbe78f1 Fixed: Use 3 numbers version (without revision) for MACOSX_BUNDLE_SHORT_VERSION_STRING 2016-10-19 17:07:31 +02:00
kervala
d100dd7823 Merge with develop
--HG--
branch : compatibility-develop
2016-10-19 13:32:14 +02:00
kervala
6fc090d4c1 Merge with develop 2016-10-19 13:32:14 +02:00
kervala
1cbbd9083f Changed: Use best dictionary size (128MB) to compress files and other parameters auto
--HG--
branch : develop
2016-10-19 13:31:45 +02:00
kervala
af1efdcfb9 Changed: Use best dictionary size (128MB) to compress files and other parameters auto 2016-10-19 13:31:45 +02:00
kervala
9bd254d25a Merge with develop
--HG--
branch : compatibility-develop
2016-10-19 10:50:26 +02:00
kervala
a388c89fd5 Merge with develop 2016-10-19 10:50:26 +02:00
kervala
142155d8c8 Fixed: Use & to not wait until client exits in bash script
--HG--
branch : develop
2016-10-19 10:49:20 +02:00
kervala
752f5e3cdb Fixed: Use & to not wait until client exits in bash script 2016-10-19 10:49:20 +02:00
kervala
4f996024d9 Fixed: Catch ESocket exceptions when disconnecting and log it
--HG--
branch : develop
2016-10-19 10:48:32 +02:00
kervala
2a407b8c00 Fixed: Catch ESocket exceptions when disconnecting and log it 2016-10-19 10:48:32 +02:00
kervala
73368b0635 Merge with develop
--HG--
branch : compatibility-develop
2016-10-18 10:33:11 +02:00
kervala
ff2bb04474 Merge with develop 2016-10-18 10:33:11 +02:00
kervala
0080dfc44e Changed: Use exec command under OS X to relaunch client
--HG--
branch : develop
2016-10-18 10:32:45 +02:00
kervala
c7a5ee9e24 Changed: Use exec command under OS X to relaunch client 2016-10-18 10:32:45 +02:00
kervala
a54d032093 Merge with develop
--HG--
branch : compatibility-develop
2016-10-17 13:30:00 +02:00
kervala
eaa19cdfd2 Merge with develop 2016-10-17 13:30:00 +02:00
kervala
25824bf8bf Fixed: Check exact filename with pgrep
--HG--
branch : develop
2016-10-17 13:29:37 +02:00
kervala
caafb52698 Fixed: Check exact filename with pgrep 2016-10-17 13:29:37 +02:00
kervala
1891033bc1 Merge with develop
--HG--
branch : compatibility-develop
2016-10-17 13:09:17 +02:00
kervala
25d66dafa2 Merge with develop 2016-10-17 13:09:17 +02:00
kervala
3a2488a126 Fixed: Escape path (it can contains spaces)
--HG--
branch : develop
2016-10-17 13:08:44 +02:00
kervala
4780450e41 Fixed: Escape path (it can contains spaces) 2016-10-17 13:08:44 +02:00
kervala
702516171d Merge with develop
--HG--
branch : compatibility-develop
2016-10-16 17:39:37 +02:00
kervala
2379918a3e Merge with develop 2016-10-16 17:39:37 +02:00
kervala
c8891166ff Changed: Disable FXAA checkbox if bloom not supported
--HG--
branch : develop
2016-10-16 17:39:07 +02:00
kervala
f0c464f4d3 Changed: Disable FXAA checkbox if bloom not supported 2016-10-16 17:39:07 +02:00
kervala
c3c377e4a6 Merge with develop
--HG--
branch : compatibility-develop
2016-10-15 17:16:34 +02:00
kervala
6fc8853d51 Merge with develop 2016-10-15 17:16:34 +02:00
kervala
85c2535a1f Fixed: Deadlock while calling CoUninitialize()
--HG--
branch : develop
2016-10-15 17:11:53 +02:00
kervala
fd5c22af05 Fixed: Deadlock while calling CoUninitialize() 2016-10-15 17:11:53 +02:00
kervala
a484a4aa53 Merge with develop
--HG--
branch : compatibility-develop
2016-10-08 18:29:31 +02:00
kervala
c0be448a85 Merge with develop 2016-10-08 18:29:31 +02:00
kervala
d3bf97e00f Fixed: NL_OS_WIN32 is never defined
--HG--
branch : develop
2016-10-08 18:28:54 +02:00
kervala
10e5fb77ed Fixed: NL_OS_WIN32 is never defined 2016-10-08 18:28:54 +02:00
kervala
ac9dcd663d Merge with develop
--HG--
branch : compatibility-develop
2016-09-28 23:55:21 +02:00
kervala
6744ded402 Merge with develop 2016-09-28 23:55:21 +02:00
kervala
bf96615bc4 Changed: Minor changes
--HG--
branch : develop
2016-09-28 23:42:33 +02:00
kervala
fde0edc21a Changed: Minor changes 2016-09-28 23:42:33 +02:00
kervala
e7b23c958a Fixed: Connexion -> Connection typo
--HG--
branch : develop
2016-09-28 23:42:01 +02:00
kervala
6abf3cbdaa Fixed: Connexion -> Connection typo 2016-09-28 23:42:01 +02:00
kervala
f168dd17e2 Changed: Also check icon in same directory as executable
--HG--
branch : develop
2016-09-28 23:30:24 +02:00
kervala
4a7b86721a Changed: Also check icon in same directory as executable 2016-09-28 23:30:24 +02:00
kervala
4c51c4e68c Merge with develop 2016-09-24 14:22:22 +02:00
kervala
58a8da6590 Merge with develop 2016-09-10 19:40:40 +02:00
kervala
bf5d8a366a Merge with develop
--HG--
branch : compatibility-develop
2016-09-10 19:40:40 +02:00
kervala
fc202e4034 Changed: Minor change
--HG--
branch : develop
2016-09-10 19:38:40 +02:00
kervala
833ba9baf8 Changed: Minor change 2016-09-10 19:38:40 +02:00
kervala
49abad7028 Fixed: Bug where exedll.bnp wasn't downloaded
--HG--
branch : develop
2016-09-10 19:38:27 +02:00
kervala
b78d33d1e2 Fixed: Bug where exedll.bnp wasn't downloaded 2016-09-10 19:38:27 +02:00
kervala
400c17826e Changed: Added getGroundZ to develop branch too
--HG--
branch : develop
2016-09-03 10:05:56 +02:00
kervala
34df094f24 Changed: Added getGroundZ to develop branch too 2016-09-03 10:05:56 +02:00
Nimetu
3610c6c8cb Merge with develop 2016-08-30 21:27:56 +03:00
Nimetu
0766ec46f8 Merge with develop
--HG--
branch : compatibility-develop
2016-08-30 21:27:56 +03:00
Nimetu
ee128cba1e Changed: Implement mp3 player playlist
--HG--
branch : develop
2016-08-30 21:25:58 +03:00
Nimetu
2c38ac8e2e Changed: Implement mp3 player playlist 2016-08-30 21:25:58 +03:00
Nimetu
5e712f3e02 Merge with develop 2016-08-30 18:39:58 +03:00
Nimetu
a86c38648b Merge with develop
--HG--
branch : compatibility-develop
2016-08-30 18:39:58 +03:00
Nimetu
c2226fe3ff Fixed: Adding songs from wrong list
--HG--
branch : develop
2016-08-30 18:38:30 +03:00
Nimetu
6487bc4dd9 Fixed: Adding songs from wrong list 2016-08-30 18:38:30 +03:00
kervala
d16ab852f3 Merge with develop 2016-08-26 13:55:25 +02:00
kervala
8835bc7551 Merge with develop
--HG--
branch : compatibility-develop
2016-08-26 13:55:25 +02:00
kervala
aa39c4fccc Changed: Use %~X instead of %X because it removes double quotes
--HG--
branch : develop
2016-08-26 13:30:30 +02:00
kervala
d71751293b Changed: Use %~X instead of %X because it removes double quotes 2016-08-26 13:30:30 +02:00
kervala
8f8ded0f12 Merge with develop 2016-08-26 13:01:32 +02:00
kervala
51df1034d9 Merge with develop
--HG--
branch : compatibility-develop
2016-08-26 13:01:32 +02:00
kervala
de109486b2 Changed: Remove unneeded double quotes in batch file
--HG--
branch : develop
2016-08-26 13:00:51 +02:00
kervala
77c9be8d5b Changed: Remove unneeded double quotes in batch file 2016-08-26 13:00:51 +02:00
Nimetu
dee80dc90e Merge with develop 2016-08-25 22:18:35 +03:00
Nimetu
b08fa15377 Merge with develop
--HG--
branch : compatibility-develop
2016-08-25 22:18:35 +03:00
Nimetu
439916fae8 Changed: Make media player to play songs from music directory (issue #59)
--HG--
branch : develop
2016-08-25 22:08:05 +03:00
Nimetu
cc1a749f90 Changed: Make media player to play songs from music directory (issue #59) 2016-08-25 22:08:05 +03:00
ulukyn
e9f3fa6ba4 Added: New getGroundZ lua function 2016-08-25 18:54:35 +02:00
ulukyn
243bed54ec Added: New getGroundZ lua function
--HG--
branch : compatibility-develop
2016-08-25 18:54:35 +02:00
Nimetu
a6b9da78fc Changed: Replace icon bitmap text with a font
--HG--
branch : experimental-ui-scaling
2016-08-14 10:41:27 +03:00
Erwan GEORGET
11ca113401 Quelques corrections de merge 2016-08-09 22:32:01 +02:00
Erwan GEORGET
edf0b19c75 Merge ryzomcore into feature/merge-ryzomcore-to-develop+CI 2016-08-09 22:12:11 +02:00
Nimetu
290e7e97d1 Merge with develop
--HG--
branch : experimental-ui-scaling
2016-07-24 16:25:47 +03:00
Nimetu
85838aec19 Merge with develop 2016-07-24 16:09:25 +03:00
Nimetu
16eeb70f61 Merge with develop
--HG--
branch : compatibility-develop
2016-07-24 16:09:25 +03:00
Nimetu
9fb14c42d8 Added: Monospace font options
--HG--
branch : develop
2016-07-24 16:07:18 +03:00
Nimetu
74a4e107b6 Added: Monospace font options 2016-07-24 16:07:18 +03:00
Nimetu
5e1c6cd287 Added: Bilinear filtering option for texture atlas textures
--HG--
branch : experimental-ui-scaling
2016-07-14 20:20:55 +03:00
Nimetu
87aa86e016 Fixed: Mouse pointer location after exiting freelook
--HG--
branch : experimental-ui-scaling
2016-07-14 20:20:55 +03:00
Nimetu
6bfc777496 Fixed: Restore scaled interface from icfg
--HG--
branch : experimental-ui-scaling
2016-07-14 20:20:55 +03:00
Nimetu
2ce1a63026 Merge with develop 2016-07-07 01:01:00 +03:00
Nimetu
ec616deeb8 Merge with develop
--HG--
branch : compatibility-develop
2016-07-07 01:01:00 +03:00
Nimetu
8f1da052a2 Changed: Allow windowed mode to span over multiple desktops
--HG--
branch : develop
2016-07-07 00:47:00 +03:00
Nimetu
0d4bbaf373 Changed: Allow windowed mode to span over multiple desktops 2016-07-07 00:47:00 +03:00
Nimetu
62e5552859 Merge with develop 2016-07-01 23:38:32 +03:00
Nimetu
1f98ed86d6 Merge with develop
--HG--
branch : compatibility-develop
2016-07-01 23:38:32 +03:00
Nimetu
42a7d602af Changed: If char keys/icfg file does not exist, use shared keys/icfg file
--HG--
branch : develop
2016-07-01 21:37:26 +03:00
Nimetu
16c0314701 Changed: If char keys/icfg file does not exist, use shared keys/icfg file 2016-07-01 21:37:26 +03:00
kervala
120d2d7dba Merge with develop 2016-06-26 19:43:53 +02:00
kervala
90362c3609 Merge with develop
--HG--
branch : compatibility-develop
2016-06-26 19:43:53 +02:00
kervala
2db7ca9729 Changed: Use std::numeric_limits instead of ~0
--HG--
branch : develop
2016-06-26 19:43:08 +02:00
kervala
13ec474eff Changed: Use std::numeric_limits instead of ~0 2016-06-26 19:43:08 +02:00
kervala
4e761f69d6 Changed: Use toString instead of std::stringstream
--HG--
branch : develop
2016-06-26 14:54:28 +02:00
kervala
99f5dd2443 Changed: Use toString instead of std::stringstream 2016-06-26 14:54:28 +02:00
kervala
ad98793560 Merge with develop 2016-06-19 21:10:23 +02:00
kervala
1553937124 Merge with develop
--HG--
branch : compatibility-develop
2016-06-19 21:10:23 +02:00
kervala
83c97c6c36 Changed: Init CSystemUtils in INelContext
--HG--
branch : develop
2016-06-19 20:48:30 +02:00
kervala
ababfe0553 Changed: Init CSystemUtils in INelContext 2016-06-19 20:48:30 +02:00
Nimetu
1bff654c7b Merge with develop 2016-06-16 23:32:47 +03:00
Nimetu
a8113bfaff Merge with develop
--HG--
branch : compatibility-develop
2016-06-16 23:32:47 +03:00
Nimetu
7e488219a7 Changed: Add scrollbar to macro commands list
--HG--
branch : develop
2016-06-16 23:32:31 +03:00
Nimetu
583c540995 Changed: Add scrollbar to macro commands list 2016-06-16 23:32:31 +03:00
kervala
3ae8a19af1 Merge with develop 2016-06-12 15:44:48 +02:00
kervala
fa01980634 Merge with develop
--HG--
branch : compatibility-develop
2016-06-12 15:44:48 +02:00
kervala
389e5712df Changed: Allow to compile Ryzom Installer alone
--HG--
branch : develop
2016-06-12 14:13:42 +02:00
kervala
eccbb211e4 Changed: Allow to compile Ryzom Installer alone 2016-06-12 14:13:42 +02:00
kervala
2275e55db9 Merge with develop 2016-06-07 13:32:06 +02:00
kervala
65e48df782 Merge with develop
--HG--
branch : compatibility-develop
2016-06-07 13:32:06 +02:00
kervala
70aad8085d Changed: LZMA updated to 16.02
--HG--
branch : develop
2016-06-07 13:22:34 +02:00
kervala
06981b5483 Changed: LZMA updated to 16.02 2016-06-07 13:22:34 +02:00
kervala
e140951e56 Changed: More details on OS and machine in client.log
--HG--
branch : develop
2016-06-07 13:21:45 +02:00
kervala
abdffe85bc Changed: More details on OS and machine in client.log 2016-06-07 13:21:45 +02:00
Nimetu
34fa04644e Fixed: In scene text bubble position
--HG--
branch : experimental-ui-scaling
2016-06-06 19:48:08 +03:00
Nimetu
b474f39970 Added: Scaling options to client config
--HG--
branch : experimental-ui-scaling
2016-06-03 14:26:17 +03:00
kervala
c4f5512b24 Merge with develop 2016-05-29 20:38:55 +02:00
kervala
36ff7e50b4 Merge with develop
--HG--
branch : compatibility-develop
2016-05-29 20:38:55 +02:00
kervala
9a7bcd8613 Fixed: Create Ryzom profile folder if not already created and return 1 if unable to create it
--HG--
branch : develop
2016-05-29 20:36:53 +02:00
kervala
13ab34d174 Changed: Remove useless comments/commented code
--HG--
branch : develop
2016-05-29 20:35:56 +02:00
kervala
ac448eac18 Merge with develop 2016-05-27 22:24:20 +02:00
kervala
ec7cc189df Merge with develop
--HG--
branch : compatibility-develop
2016-05-27 22:24:20 +02:00
kervala
aeb33f9967 Fixed: Set VSync value after 3D driver initialized
--HG--
branch : develop
2016-05-27 22:17:25 +02:00
kervala
6fbf8c5326 Merge with develop 2016-05-26 19:36:25 +02:00
kervala
86084649a2 Merge with develop
--HG--
branch : compatibility-develop
2016-05-26 19:36:25 +02:00
kervala
efe00fa8bf Changed: Replace string empty assign by clear()
--HG--
branch : develop
2016-05-25 23:19:26 +02:00
kervala
4b1959a560 Changed: Replace size() comparisons by empty()
--HG--
branch : develop
2016-05-25 23:18:11 +02:00
kervala
ca585f73c0 Fixed: Create Ryzom profile folder if not already created and return 1 if unable to create it 2016-05-29 20:36:53 +02:00
kervala
4db953aa8a Changed: Remove useless comments/commented code 2016-05-29 20:35:56 +02:00
kervala
c83d7dd33e Fixed: Set VSync value after 3D driver initialized 2016-05-27 22:17:25 +02:00
kervala
7b901a8888 Changed: Replace string empty assign by clear() 2016-05-25 23:19:26 +02:00
kervala
d94941a20b Changed: Replace size() comparisons by empty() 2016-05-25 23:18:11 +02:00
kervala
ed03eb0a02 Merge with develop 2016-05-24 11:25:04 +02:00
kervala
a1994702a3 Merge with develop
--HG--
branch : compatibility-develop
2016-05-24 11:25:04 +02:00
kervala
5ad9a57ada Fixed: Append _dev suffix to ryzom_client under Linux too
--HG--
branch : develop
2016-05-24 11:19:41 +02:00
kervala
ac66527715 Fixed: Append _dev suffix to ryzom_client under Linux too 2016-05-24 11:19:41 +02:00
SIELA1915
7e3b9d56bb changed all HP, Sap, Stamina and Focus occurences 2016-05-23 11:45:43 +02:00
kervala
1656e82303 Merge with develop 2016-05-18 14:31:14 +02:00
kervala
719e6f6e85 Merge with develop
--HG--
branch : compatibility-develop
2016-05-18 14:31:14 +02:00
kervala
df1e6aa11b Changed: New command /version to display Ryzom client version
--HG--
branch : develop
2016-05-18 14:29:23 +02:00
kervala
ee8a70287a Changed: New command /version to display Ryzom client version 2016-05-18 14:29:23 +02:00
kervala
0766c4766f Merge with develop 2016-05-17 11:02:02 +02:00
kervala
81098186e3 Merge with develop
--HG--
branch : compatibility-develop
2016-05-17 11:02:02 +02:00
kervala
0c811510d5 Changed: Delete SoundMngr to avoid memory leaks
--HG--
branch : develop
2016-05-17 10:59:28 +02:00
kervala
049e35d930 Changed: Delete SoundMngr to avoid memory leaks 2016-05-17 10:59:28 +02:00
kervala
ece22ab9f3 Merge with develop 2016-05-15 12:05:19 +02:00
kervala
a22483e021 Merge with develop
--HG--
branch : compatibility-develop
2016-05-15 12:05:19 +02:00
kervala
00ccc811f6 Changed: LZMA updated to 16.00
--HG--
branch : develop
2016-05-15 12:04:31 +02:00
kervala
c57c1526a4 Changed: LZMA updated to 16.00 2016-05-15 12:04:31 +02:00
kervala
5b3683bbd3 Changed: Replace other cp=1 by cp=2
--HG--
branch : develop
2016-05-12 20:02:40 +02:00
kervala
248c7e14a7 Changed: Replace other cp=1 by cp=2 2016-05-12 20:02:40 +02:00
kervala
5bbd69cbe0 Merge with develop 2016-05-12 19:57:37 +02:00
kervala
ff5a82ec4f Merge with develop
--HG--
branch : compatibility-develop
2016-05-12 19:57:37 +02:00
kervala
c1d142b9ee Changed: Append cp=2 parameter to query when requesting salt to know that we support SHA512 crypt
--HG--
branch : develop
2016-05-12 19:53:16 +02:00
kervala
2523706447 Changed: Append cp=2 parameter to query when requesting salt to know that we support SHA512 crypt 2016-05-12 19:53:16 +02:00
kervala
011b545ac8 Changed: Minor changes
--HG--
branch : develop
2016-05-12 19:52:20 +02:00
kervala
9e1b9d8050 Changed: Minor changes 2016-05-12 19:52:20 +02:00
kervala
a885b9b557 Changed: Added new command /playedTime that displays time played with this character
--HG--
branch : develop
2016-05-12 19:51:52 +02:00
kervala
04407be1cc Changed: Added new command /playedTime that displays time played with this character 2016-05-12 19:51:52 +02:00