Commit graph

7597 commits

Author SHA1 Message Date
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
bbcd14cecb Removed: Empty cpp files
--HG--
branch : develop
2016-12-10 18:40:17 +01:00
kervala
cf840353ce Removed: Empty cpp files 2016-12-10 18:40:17 +01:00
kervala
fe72e1c8d3 Fixed: Compilation of World Editor in Unicode
--HG--
branch : develop
2016-12-10 18:15:01 +01:00
kervala
1ee5aa36bc Fixed: Compilation of World Editor in Unicode 2016-12-10 18:15:01 +01:00
kervala
94bf8fd54e Changed: Use TCHAR functions
--HG--
branch : develop
2016-12-10 14:21:20 +01:00
kervala
12f39043b0 Changed: Use TCHAR functions 2016-12-10 14:21:20 +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
699680ac4a Changed: Use addSlashR to replace \n by \r\n
--HG--
branch : develop
2016-12-10 13:08:39 +01:00
kervala
7a270ff9c0 Changed: Use addSlashR to replace \n by \r\n 2016-12-10 13:08:39 +01:00
kervala
5dfa19518a Changed: NeL helpers to launch an external editor
--HG--
branch : develop
2016-12-10 13:02:26 +01:00
kervala
08071b75dd Changed: NeL helpers to launch an external editor 2016-12-10 13:02:26 +01:00
kervala
5658cad02e Changed: Convert std::string <> TCHAR
--HG--
branch : develop
2016-12-10 13:01:27 +01:00
kervala
a184dd7d8f Changed: Convert std::string <> TCHAR 2016-12-10 13:01:27 +01:00
kervala
dbba511ee7 Changed: Replace a lot of const char* by std::string parameters
--HG--
branch : develop
2016-12-10 12:30:57 +01:00
kervala
a625bccce3 Changed: Replace a lot of const char* by std::string parameters 2016-12-10 12:30:57 +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
b66b85cefd Changed: Unicode MFC support
--HG--
branch : develop
2016-12-09 16:04:26 +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
d5b6609538 Correction des privileges ChaScore1 et maxChaScore1 pour les GM 2016-12-07 21:40:41 +01:00
5d93d12272 Changement du nom de shard "Open" en "Lirria" 2016-12-07 21:26:43 +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
e0cb4bbe9e Changed: Use NLMISC::openURL to open a page in browser
--HG--
branch : develop
2016-12-05 19:35:55 +01:00
kervala
7036702324 Merge with develop 2016-12-05 14:06:48 +01:00
kervala
c7f2bc6fa3 Merge with develop
--HG--
branch : compatibility-develop
2016-12-05 14:06:48 +01:00
kervala
ac79329448 Fixed: Compilation of Ryzom Installer with Qt versions older than 5.6
--HG--
branch : develop
2016-12-05 14:06:17 +01:00
kervala
b61c9d4cf8 Merge with develop 2016-12-04 20:31:56 +01:00
kervala
042eb30b6f Merge with develop
--HG--
branch : compatibility-develop
2016-12-04 20:31:56 +01:00
kervala
ede41a3091 Changed: Only compile gameshare for Ryzom servers, client or tools
--HG--
branch : develop
2016-12-04 20:31:24 +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
c3a6610f36 Changed: Don't need to use CSString
--HG--
branch : develop
2016-12-04 17:14:47 +01:00
kervala
f17bd720b1 Fixed: Warnings with GGC 6
--HG--
branch : develop
2016-12-04 17:12:58 +01:00
kervala
1a338b3462 Fixed: getMission returns a mission instead of NULL
--HG--
branch : develop
2016-12-04 17:12:39 +01:00
kervala
ec6ffe547c Fixed: Typo
--HG--
branch : develop
2016-12-04 17:11:23 +01:00
kervala
bf7b51ca6c Fixed: Only 1 parameter for forceMissionProgress
--HG--
branch : develop
2016-12-04 17:11:12 +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
f3564ed86e Fixed: Compilation with GCC 6
--HG--
branch : develop
2016-12-03 18:14:31 +01:00
ce305c7512 Merge branch 'develop' of https://git.khaganat.net/khaganat/khanat-code into develop 2016-12-03 17:57:35 +01:00
56df66454a Changement du nom du shard à la création du personnage 2016-12-03 17:56:35 +01:00
kervala
7af3a4c68c Changed: Use _T macro, TCHAR, tStrToUtf8/utf8ToTStr, etc... to support UNICODE
--HG--
branch : develop
2016-12-02 16:24:31 +01:00
kervala
25a4d6bbed Changed: Replace all path native functions by NeL methods
--HG--
branch : develop
2016-11-29 20:43:55 +01:00
kervala
e941cff0ff Fixed: Strict aliasing warnings
--HG--
branch : develop
2016-11-29 20:32:33 +01:00
kervala
d568a0eedd Changed: Use _T macro, TCHAR, tStrToUtf8/utf8ToTStr, etc... to support UNICODE
--HG--
branch : develop
2016-11-29 20:24:58 +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
dcf8b9b77c Changed: Added translation 2016-11-26 15:24:27 +02:00
Nimetu
6150489f57 Changed: Added translation
--HG--
branch : compatibility-develop
2016-11-26 15:24:27 +02: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
3b0c7e896c Changed: minor change to ui
--HG--
branch : develop
2016-11-26 15:24:05 +02:00
Nimetu
cf338681fa Changed: Add free-view mouse tablet mode option
--HG--
branch : develop
2016-11-26 14:55:38 +02:00
kervala
99ab8fba3e Merge with develop 2016-11-26 13:20:32 +01:00
kervala
f8176cedb3 Merge with develop
--HG--
branch : compatibility-develop
2016-11-26 13:20:32 +01:00
kervala
040f7c0fae Fixed: Return 0 if cancel installation
--HG--
branch : develop
2016-11-26 13:15:51 +01:00
kervala
fb21a038d9 Changed: Updated Ryzom Installer translations
--HG--
branch : develop
2016-11-26 13:15:03 +01:00
kervala
b17da91efd Changed: Minor changes
--HG--
branch : develop
2016-11-25 13:26:53 +01: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
c4b9d77eaa Changed: Added option ignore_free_disk_space_checks to ryzom_installer.ini
--HG--
branch : develop
2016-11-25 10:44:06 +01:00
kervala
033a337419 Changed: Replace all _splitpath by NeL methods
--HG--
branch : develop
2016-11-22 19:34:43 +01:00
kervala
6565603216 Changed: Convert CString and TCHAR* from/to std::string
--HG--
branch : develop
2016-11-22 13:07:52 +01:00
kervala
b7ca1d224c Changed: Use _T macro and TCHAR to support UNICODE
--HG--
branch : develop
2016-11-22 12:39:44 +01:00
kervala
a3262bb971 Fixed: Warnings
--HG--
branch : develop
2016-11-22 12:22:17 +01:00
kervala
94d3440148 Fixed: Strict aliasing warnings
--HG--
branch : develop
2016-11-22 12:14:32 +01:00
kervala
501e1d9d27 Fixed: Specify working directory for getVersionFromExecutable
--HG--
branch : develop
2016-11-21 16:36:12 +01:00
kervala
cc331d6295 Fixed: Wrong variable
--HG--
branch : develop
2016-11-21 16:35:28 +01:00
kervala
7afe10373b Fixed: Use default path for ryzom_installer.log is installation directory not defined
--HG--
branch : develop
2016-11-21 16:35:18 +01:00
kervala
88bfa8ec70 Fixed: Warnings
--HG--
branch : develop
2016-11-21 13:22:05 +01:00
kervala
fe0210690d Merge with develop
--HG--
branch : compatibility-develop
2016-11-20 16:41:28 +01:00
kervala
b8c25f7df9 Merge with develop 2016-11-20 16:41:28 +01:00
kervala
91a1f4e34b Fixed: Compilation
--HG--
branch : develop
2016-11-20 16:40:39 +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
0fb9906929 Changed: Constification of catches
--HG--
branch : develop
2016-11-20 12:31:48 +01:00
kervala
481bbae8ee Changed: Use wide versions of Win32 API
--HG--
branch : develop
2016-11-19 21:12:04 +01:00
kervala
61bb58bea3 Fixed: Typos
--HG--
branch : develop
2016-11-19 21:07:52 +01:00
kervala
791821d6d6 Changed: Use _T macro and TCHAR to support UNICODE
--HG--
branch : develop
2016-11-19 21:07:20 +01:00
kervala
8d82472586 Changed: Macros to convert to/from TCHAR* and std::string
--HG--
branch : develop
2016-11-19 19:46:40 +01:00
kervala
9941fcf82b Fixed: Typos detected by Lintian
--HG--
branch : develop
2016-11-19 19:11:12 +01:00
99543f52f3 Delete sheet_id.bin , il ne devrait pas être la c'est une erreur !!! 2016-11-17 21:20:07 +00:00
kervala
f05cab8579 Changed: liblzma 16.04
--HG--
branch : develop
2016-11-15 11:32:20 +01:00
kervala
2cbb1614d4 Changed: Use _T macro and TCHAR to support UNICODE
--HG--
branch : develop
2016-11-15 10:53:22 +01:00
kervala
556590e73a Fixed: Don't use hash to extract clauses but identifier (else there could be conflict if the same text if used several times)
--HG--
branch : develop
2016-11-15 10:47:02 +01:00
kervala
2749d40508 Changed: Minor changes
--HG--
branch : develop
2016-11-15 10:44:59 +01:00
kervala
9ce39945ce Fixed: Crash when processing comments
--HG--
branch : develop
2016-11-15 10:40:38 +01:00
kervala
4461c0de7b Merge with develop
--HG--
branch : compatibility-develop
2016-11-13 16:53:35 +01:00
kervala
0504c52eeb Merge with develop 2016-11-13 16:53:35 +01:00
kervala
e9a54a310e Changed: Resume download for 2xx HTTP status codes
--HG--
branch : develop
2016-11-13 16:53:04 +01:00
kervala
7628842931 Merge with develop
--HG--
branch : compatibility-develop
2016-11-13 11:08:14 +01:00
kervala
6a315be980 Merge with develop 2016-11-13 11:08:14 +01:00
kervala
857b60dd82 Fixed: Any 3xx HTTP status codes are redirections
--HG--
branch : develop
2016-11-13 11:07:32 +01:00
Sit Melai
ccb943b852 Merge de la v3 de Ryzom Core 2016-11-07 17:11:05 +01:00
kervala
7e2bbe1f37 Merge with develop
--HG--
branch : compatibility-develop
2016-11-07 14:12:11 +01:00
kervala
4438ab108c Merge with develop 2016-11-07 14:12:11 +01:00
Nuno Gonçalves
8b2d23109f Changed: Fix the way to load ryzhome lua/xml files
--HG--
branch : compatibility-develop
2016-11-07 13:53:41 +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
f9117d8e94 Changed: Rerun Installer from a specific directory with right arguments
--HG--
branch : develop
2016-11-05 19:46:12 +01:00
kervala
7d909da444 Changed: Rerun Installer from a specific directory with right arguments 2016-11-05 19:46:12 +01:00
kervala
a9c3982d21 Changed: Minor changes
--HG--
branch : develop
2016-11-04 20:23:01 +01:00
kervala
33580166f4 Changed: Minor changes 2016-11-04 20:23:01 +01:00
kervala
589be3bbbb Changed: Don't display an error if file doesn't exist
--HG--
branch : develop
2016-11-04 20:22:42 +01:00
kervala
59527ecc49 Changed: Don't display an error if file doesn't exist 2016-11-04 20:22:42 +01:00
kervala
9f934f7765 Changed: Discard \r and only use \n
--HG--
branch : develop
2016-11-04 20:22:10 +01:00
kervala
e50b590ad0 Changed: Discard \r and only use \n 2016-11-04 20:22:10 +01:00
kervala
a2a7dfa028 Changed: Minor changes
--HG--
branch : develop
2016-11-04 20:20:39 +01:00
kervala
e1315c28a7 Changed: Minor changes 2016-11-04 20:20:39 +01:00
kervala
9e0954fad5 Changed: ForceUtf8 parameter useless now
--HG--
branch : develop
2016-11-04 20:19:41 +01:00
kervala
01736696a8 Changed: ForceUtf8 parameter useless now 2016-11-04 20:19:41 +01:00
kervala
369a121aa1 Fixed: Wrong size of nl
--HG--
branch : develop
2016-11-04 09:17:32 +01:00
kervala
4ad536b4fb Fixed: Wrong size of nl 2016-11-04 09:17:32 +01:00
kervala
b7c008c014 Changed: Minor changes
--HG--
branch : develop
2016-11-04 09:14:08 +01:00
kervala
db95157bdb Changed: Minor changes 2016-11-04 09:14:08 +01:00
kervala
37d34a2f0f Changed: Removed trailing spaces
--HG--
branch : develop
2016-11-04 09:09:51 +01:00
kervala
2da57a4d24 Changed: Removed trailing spaces 2016-11-04 09:09:51 +01:00
kervala
235e9bdbfd Merge with develop
--HG--
branch : compatibility-develop
2016-11-03 14:46:44 +01:00
kervala
d865dc5a70 Merge with develop 2016-11-03 14:46:44 +01:00
kervala
11e9a7ea81 Changed: Sleep 1 second after copying files (because to some disk cache)
--HG--
branch : develop
2016-11-03 14:44:01 +01:00
kervala
cd9a3c35c4 Changed: Sleep 1 second after copying files (because to some disk cache) 2016-11-03 14:44:01 +01:00
kervala
ee2d17c24b Changed: Don't try to copy Installer several times (if it fails once, it'll fail forever)
--HG--
branch : develop
2016-11-03 14:43:08 +01:00
kervala
2625225120 Changed: Don't try to copy Installer several times (if it fails once, it'll fail forever) 2016-11-03 14:43:08 +01:00
kervala
469bd13a28 Changed: Use QSaveFile to be sure the file is fully written
--HG--
branch : develop
2016-11-03 14:42:07 +01:00
kervala
d90983bee3 Changed: Use QSaveFile to be sure the file is fully written 2016-11-03 14:42:07 +01:00
003480c4e9 mise a jour des bons fichiers sur le client khanat 2016-11-01 17:59:10 +01:00
Sit Melai
f75a3cdd2d Merge branch 'develop' of ssh://git.khaganat.net:1022/khaganat/khanat-code into develop
Merging local changes
2016-10-31 22:50:39 +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
814b3d003b Changed: Updated all translations in UTF-8
--HG--
branch : compatibility-develop
2016-10-31 19:02:29 +01:00
kervala
d4bbc683a7 Changed: Updated all translations in UTF-8 2016-10-31 19:02:29 +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
ef5efc0102 Changed: Don't update qtbase_*.ts files
--HG--
branch : develop
2016-10-31 18:58:07 +01:00
kervala
9ce9d9c388 Changed: Don't update qtbase_*.ts files 2016-10-31 18:58:07 +01:00
kervala
9ee427cda1 Changed: Updated some variables names in interface
--HG--
branch : develop
2016-10-31 18:57:42 +01:00
kervala
9d85a406d4 Changed: Updated some variables names in interface 2016-10-31 18:57:42 +01:00
kervala
29a3e24204 Changed: Updated translations
--HG--
branch : develop
2016-10-31 18:57:18 +01:00
kervala
647136acc8 Changed: Updated translations 2016-10-31 18:57:18 +01:00
kervala
19291f1b96 Fixed: Layout of some interfaces in Ryzom Configuration
--HG--
branch : develop
2016-10-31 18:56:55 +01:00
kervala
a92608edc4 Fixed: Layout of some interfaces in Ryzom Configuration 2016-10-31 18:56:55 +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
e3c2cb2a30 Changed: Use clear() instead of affectation
--HG--
branch : develop
2016-10-30 15:56:41 +01:00
kervala
b07db1a990 Changed: Use clear() instead of affectation 2016-10-30 15:56:41 +01:00
kervala
2fe0e84096 Changed: Simplified layout for display
--HG--
branch : develop
2016-10-30 15:35:58 +01:00
kervala
574405e5b5 Changed: Simplified layout for display 2016-10-30 15:35:58 +01:00
kervala
86415a3c2b Fixed: Add config variable if not present
--HG--
branch : develop
2016-10-30 15:35:44 +01:00
kervala
cc0ff91df5 Fixed: Add config variable if not present 2016-10-30 15:35:44 +01:00
kervala
8f6aa83a7b Fixed: Choice of sound driver
--HG--
branch : develop
2016-10-30 15:35:11 +01:00
kervala
7023fc88ac Fixed: Choice of sound driver 2016-10-30 15:35:11 +01:00
kervala
1c872d9ef9 Fixed: Translations files are all using UTF-8 by default now (and LF instead of CRLF), fixes #128
--HG--
branch : develop
2016-10-29 19:50:28 +02:00
kervala
0fa7db915e Fixed: Translations files are all using UTF-8 by default now (and LF instead of CRLF), fixes #128 2016-10-29 19:50:28 +02: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
1362e2d470 Fixed: Restore last selected profile
--HG--
branch : develop
2016-10-27 16:47:44 +02:00
kervala
4e68b3c40a Fixed: Restore last selected profile 2016-10-27 16:47:44 +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
3c8bd42335 Changed: Minor change
--HG--
branch : develop
2016-10-27 10:54:55 +02:00
kervala
da10334807 Changed: Minor change 2016-10-27 10:54:55 +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
a7531eac0d Fixed: Ryzom client patcher doesn't depend on any cfg file anymore
--HG--
branch : develop
2016-10-25 16:02:46 +02:00
kervala
ad0ba5c6b1 Fixed: Ryzom client patcher doesn't depend on any cfg file anymore 2016-10-25 16:02:46 +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
280a2b5175 Changed: Don't force PatchUrl in client_default.cfg
--HG--
branch : compatibility-develop
2016-10-25 14:10:25 +02:00
kervala
dc9c463483 Changed: Don't force PatchUrl in client_default.cfg 2016-10-25 14:10:25 +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
a4fa0ca0fe Changed: Minor change
--HG--
branch : compatibility-develop
2016-10-24 13:54:20 +02:00
kervala
c02ab44327 Changed: Minor change 2016-10-24 13:54:20 +02:00
kervala
68163157ba Merge with develop
--HG--
branch : compatibility-develop
2016-10-23 16:29:49 +02:00
kervala
627dea4a06 Merge with develop 2016-10-23 16:29:49 +02:00
kervala
0b99222330 Fixed: Clear m_srcDirectory if directory doesn't exist anymore
--HG--
branch : develop
2016-10-23 16:28:17 +02:00
kervala
3c52626be2 Fixed: Clear m_srcDirectory if directory doesn't exist anymore 2016-10-23 16:28:17 +02:00
kervala
e9ba12b931 Changed: Display filename in unsuported format warning
--HG--
branch : develop
2016-10-23 16:27:49 +02:00
kervala
bfccba236f Changed: Display filename in unsuported format warning 2016-10-23 16:27:49 +02:00
kervala
e957923ed2 Fixed: Default action tooltip text position
--HG--
branch : develop
2016-10-23 16:24:18 +02:00
kervala
070966fca1 Fixed: Default action tooltip text position 2016-10-23 16:24:18 +02:00
kervala
eedebb6833 Changed: Removed trailing spaces at EOL
--HG--
branch : develop
2016-10-23 16:16:48 +02:00
kervala
306ee45cc5 Changed: Removed trailing spaces at EOL 2016-10-23 16:16:48 +02:00
kervala
c3c3951bd0 Merge with develop
--HG--
branch : compatibility-develop
2016-10-22 19:40:34 +02:00
kervala
bb9608bcea Merge with develop 2016-10-22 19:40:34 +02:00
kervala
8db56f5671 Changed: Name edit box better aligned
--HG--
branch : develop
2016-10-22 19:38:13 +02:00
kervala
73b691df36 Changed: Name edit box better aligned 2016-10-22 19:38:13 +02:00
kervala
d52cede669 Fixed: Wrong height in action edit
--HG--
branch : develop
2016-10-22 19:38:05 +02:00
kervala
eb941d396b Fixed: Wrong height in action edit 2016-10-22 19:38:05 +02:00
kervala
c2d0a3690f Changed: Name edit box better aligned
--HG--
branch : develop
2016-10-22 19:24:20 +02:00
kervala
1e5a40a0a2 Changed: Name edit box better aligned 2016-10-22 19:24:20 +02:00
kervala
de3d3971b7 Changed: Removed trailing spaces at EOL
--HG--
branch : develop
2016-10-22 18:50:43 +02:00
kervala
b22528aac9 Changed: Removed trailing spaces at EOL 2016-10-22 18:50:43 +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
c106557bbc Changed: Force process name for Ryzom Installer
--HG--
branch : develop
2016-10-22 16:48:34 +02:00
kervala
d66e9867c0 Changed: Force process name for Ryzom Installer 2016-10-22 16:48:34 +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
76f036e802 Changed: OS X icon slightly changed
--HG--
branch : develop
2016-10-22 16:47:43 +02:00
kervala
143127d249 Changed: OS X icon slightly changed 2016-10-22 16:47:43 +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
acfdb8d6fa Merge with develop
--HG--
branch : compatibility-develop
2016-10-21 16:54:50 +02:00
kervala
bf6f28ce43 Merge with develop 2016-10-21 16:54:50 +02:00
kervala
7c9a242b66 Changed: Compile CMigrateDialog anyway even if unused
--HG--
branch : develop
2016-10-21 16:54:08 +02:00
kervala
3a0d88c07d Changed: Compile CMigrateDialog anyway even if unused 2016-10-21 16:54:08 +02:00
kervala
d5d4ba1e0c Merge with develop
--HG--
branch : compatibility-develop
2016-10-21 16:50:04 +02:00
kervala
d078103453 Merge with develop 2016-10-21 16:50:04 +02:00
kervala
70be3a6093 Changed: Merge pull request in develop too
--HG--
branch : develop
2016-10-21 16:48:42 +02:00
kervala
9a29dbced9 Changed: Merge pull request in develop too 2016-10-21 16:48:42 +02:00
kervala
177dacf100 Fixed: Compilation of Ryzom Installer
--HG--
branch : develop
2016-10-21 16:09:02 +02:00
kervala
3c3869fef5 Fixed: Compilation of Ryzom Installer 2016-10-21 16:09:02 +02:00
kervala
7363803b2c Merge with develop
--HG--
branch : compatibility-develop
2016-10-21 14:27:31 +02:00
kervala
76c27c64f8 Merge with develop 2016-10-21 14:27:31 +02:00
kervala
552e147c76 Changed: If old installer doesn't return a version, overwrite it
--HG--
branch : develop
2016-10-21 14:27:05 +02:00
kervala
1615c21909 Changed: If old installer doesn't return a version, overwrite it 2016-10-21 14:27:05 +02:00
kervala
7ad0b610ba Changed: Open in ReadOnly the process
--HG--
branch : develop
2016-10-21 14:26:46 +02:00
kervala
60e927a3a0 Changed: Open in ReadOnly the process 2016-10-21 14:26:46 +02:00
kervala
41fa1a938e Changed: More warnings
--HG--
branch : develop
2016-10-21 14:26:31 +02:00
kervala
aa42c17fed Changed: More warnings 2016-10-21 14:26:31 +02:00
kervala
0a502f64b2 Changed: More messages in log
--HG--
branch : develop
2016-10-21 12:58:23 +02:00
kervala
a45d723334 Changed: More messages in log 2016-10-21 12:58:23 +02:00
kervala
fccaee006b Changed: Only check if Ryzom is installed in current directory under Windows
--HG--
branch : develop
2016-10-21 12:57:35 +02:00
kervala
d1073593b0 Changed: Only check if Ryzom is installed in current directory under Windows 2016-10-21 12:57:35 +02:00
kervala
6b9a267abc Changed: Only enable migration under Windows when launched from 2.1 client directory
--HG--
branch : develop
2016-10-21 12:53:10 +02:00
kervala
88a87a07a0 Changed: Only enable migration under Windows when launched from 2.1 client directory 2016-10-21 12:53:10 +02:00
Cédric OCHS
33fe8d5148 Merged in Glorf/ryzomcore/fix_speed (pull request #141)
Displayed speed is now actual speed, fix #295

--HG--
branch : compatibility-develop
2016-10-21 06:15:56 +00:00
C?dric OCHS
f1840fc189 Merged in Glorf/ryzomcore/fix_speed (pull request #141)
Displayed speed is now actual speed, fix #295
2016-10-21 06:15:56 +00:00
kervala
064c3778f2 Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 17:46:58 +02:00
kervala
7e6c5c13bd Merge with develop 2016-10-20 17:46:58 +02:00
Guillaume Dupuy
b19f5e3c7e Forgot one 0.0f initialisation
--HG--
branch : fix_speed
2016-10-20 16:04:47 +02:00
Guillaume Dupuy
c584bb34b6 Forgot one 0.0f initialisation 2016-10-20 16:04:47 +02:00
Guillaume Dupuy
7592d3e6c4 Fix coding guidelines + double initialized as 0.0
--HG--
branch : fix_speed
2016-10-20 16:02:02 +02:00
Guillaume Dupuy
3e9ee0954b Fix coding guidelines + double initialized as 0.0 2016-10-20 16:02:02 +02:00
kervala
d574641c79 Changed: HTTP code 307 is not an error
--HG--
branch : develop
2016-10-20 15:30:43 +02:00
kervala
f079236f7f Changed: HTTP code 307 is not an error 2016-10-20 15:30:43 +02:00
kervala
e50c1fcf98 Changed: Write warnings in log
--HG--
branch : develop
2016-10-20 15:30:30 +02:00
kervala
6c077b671d Changed: Write warnings in log 2016-10-20 15:30:30 +02:00
kervala
efaadd4301 Changed: Real version of Ryzom Installer as user-agent
--HG--
branch : develop
2016-10-20 15:30:12 +02:00
kervala
9dc33effe6 Changed: Real version of Ryzom Installer as user-agent 2016-10-20 15:30:12 +02:00
kervala
1879212116 Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 14:48:16 +02:00
kervala
f95d95bdc5 Merge with develop 2016-10-20 14:48:16 +02:00
kervala
22ff9504a7 Changed: Log version of installed Installer
--HG--
branch : develop
2016-10-20 14:47:45 +02:00
kervala
f2a3a4e99f Changed: Log version of installed Installer 2016-10-20 14:47:45 +02:00
kervala
3526efb920 Fixed: 307 is a normal redirect
--HG--
branch : develop
2016-10-20 14:47:28 +02:00
kervala
59b4206afb Fixed: 307 is a normal redirect 2016-10-20 14:47:28 +02:00
kervala
b6fe697a5d Changed: Init log just after loading config file
--HG--
branch : develop
2016-10-20 14:47:08 +02:00
kervala
7940b17ba7 Changed: Init log just after loading config file 2016-10-20 14:47:08 +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
d2cd7ebb1a Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 13:14:19 +02:00
kervala
0111c69054 Merge with develop 2016-10-20 13:14:19 +02:00
kervala
881375c35f Added: Missing file
--HG--
branch : develop
2016-10-20 13:13:53 +02:00
kervala
68d9be0bd9 Added: Missing file 2016-10-20 13:13:53 +02:00
kervala
2e7af6ab0d Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 13:08:48 +02:00
kervala
c3bcfb42b8 Merge with develop 2016-10-20 13:08:48 +02:00
kervala
9321323ba4 Changed: Use sender() instead of member
--HG--
branch : develop
2016-10-20 13:07:56 +02:00
kervala
3f25776129 Changed: Use sender() instead of member 2016-10-20 13:07:56 +02:00
kervala
de2eba12fe Changed: Logs in Ryzom Installer
--HG--
branch : develop
2016-10-20 13:07:18 +02:00
kervala
a46bb29254 Changed: Logs in Ryzom Installer 2016-10-20 13:07:18 +02:00
kervala
661975a471 Changed: Simplify toString
--HG--
branch : develop
2016-10-20 12:35:24 +02:00
kervala
02d8b7d400 Changed: Simplify toString 2016-10-20 12:35:24 +02:00
kervala
3ae41bfa58 Changed: Minor changes
--HG--
branch : develop
2016-10-20 12:34:25 +02:00
kervala
f53ecd3687 Changed: Minor changes 2016-10-20 12:34:25 +02:00
kervala
517336923f Changed: Replace sscanf by fromString
--HG--
branch : develop
2016-10-20 12:33:37 +02:00
kervala
fd61399877 Changed: Replace sscanf by fromString 2016-10-20 12:33:37 +02:00
kervala
25faa27ef5 Fixed: Compilation with VC++ 2015 (need spaces around NL_I64)
--HG--
branch : develop
2016-10-20 12:30:24 +02:00
kervala
9ab62c5606 Fixed: Compilation with VC++ 2015 (need spaces around NL_I64) 2016-10-20 12:30:24 +02:00
kervala
1e98eeaa0b Merge with develop
--HG--
branch : compatibility-develop
2016-10-19 17:25:45 +02:00