Commit graph

3654 commits

Author SHA1 Message Date
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
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
3265749bfe Changed: Don't need to release twice CEditor
--HG--
branch : develop
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
d8ffb10df8 Changed: Use a global C64BitsParts union to avoid strict aliasing warnings
--HG--
branch : develop
2016-12-24 14:01:21 +01:00
kervala
6927bb5849 Fixed: Steam latest client API changes
--HG--
branch : compatibility-develop
2016-12-23 13:49:49 +01:00
kervala
f069df82b3 Merge with develop
--HG--
branch : compatibility-develop
2016-12-21 15:18:59 +01:00
kervala
43195f71a5 Fixed: Servers compilation under Linux
--HG--
branch : develop
2016-12-21 15:18:26 +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
6570b26297 Fixed: Virtual methods with different parameters
--HG--
branch : develop
2016-12-19 17:46:07 +01:00
kervala
07606ffd77 Fixed: done() is a method of QDialog
--HG--
branch : develop
2016-12-19 17:43:47 +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
7aabc217b0 Fixed: Compilation under Linux
--HG--
branch : develop
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
408dbb64f6 Fixed: Uninitialized variable
--HG--
branch : develop
2016-12-19 15:44:08 +01:00
kervala
8db7d75e7e Fixed: Uninitialized variables
--HG--
branch : develop
2016-12-19 15:43:38 +01:00
kervala
929cf93b87 Merge with develop
--HG--
branch : compatibility-develop
2016-12-19 13:58:14 +01:00
kervala
89347cd6a0 Changed: Unicode
--HG--
branch : develop
2016-12-19 13:33:44 +01:00
kervala
6978dc9bee Changed: Use std::string instead of const char*
--HG--
branch : develop
2016-12-19 13:33:24 +01:00
kervala
0a4ce7e4e1 Changed: Unicode
--HG--
branch : develop
2016-12-19 13:17:07 +01:00
kervala
cbb1233ce2 Changed: Minor changes
--HG--
branch : develop
2016-12-19 13:16:48 +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
31a540b35d Changed: Replace size() comparisons by empty() ones
--HG--
branch : develop
2016-12-19 13:15:25 +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
0328f16c6c Merge with develop
--HG--
branch : compatibility-develop
2016-12-19 09:27:18 +01:00
kervala
61b76ad106 Changed: Minor changes
--HG--
branch : develop
2016-12-19 09:26:46 +01:00
kervala
bd13cabb13 Fixed: Wrong argument checked
--HG--
branch : develop
2016-12-19 09:26:28 +01:00
kervala
ede5a5a53b Fixed: Servers compilation
--HG--
branch : develop
2016-12-19 09:25:51 +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
4e99767ae2 Merge with develop
--HG--
branch : compatibility-develop
2016-12-18 14:47:16 +01:00
kervala
a0b4bb2397 Changed: Strings initialization
--HG--
branch : develop
2016-12-18 14:41:47 +01:00
kervala
cbf407f9a1 Changed: Replaced comparisons with string("") by empty() check
--HG--
branch : develop
2016-12-18 14:40:54 +01:00
kervala
1ed5dcdda9 Changed: Use %u instead of %d for uint
--HG--
branch : develop
2016-12-18 14:00:20 +01:00
kervala
32fbf8163d Fixed: Compilation
--HG--
branch : develop
2016-12-18 13:59:17 +01:00
kervala
b52daf9519 Fixed: Unicode MFC use
--HG--
branch : develop
2016-12-18 13:59:02 +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
cbf2c744f0 Changed: Replace some const char* by std::string
--HG--
branch : develop
2016-12-18 13:45:07 +01:00
Guillaume Dupuy
73191a2388 Remove duplicate code
--HG--
branch : fix_freezing
2016-12-17 14:31:27 +01:00
Guillaume Dupuy
fb280101f1 Fix a bug where a monster could be stuck after dropping aggro while rooted
--HG--
branch : fix_freezing
2016-12-17 02:47:05 +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
ulukyn@gmail.com
3f58cbd077 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
2016-12-14 22:24:49 +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@gmail.com
6238139c08 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
2016-12-14 16:14:33 +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@gmail.com
c6f10d493d Fixed: updateVector don't need return a boolean
--HG--
branch : compatibility-develop
2016-12-13 23:42:02 +01:00
ulukyn@gmail.com
68e6dbaf9a Fusion
--HG--
branch : compatibility-develop
2016-12-13 21:16:30 +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
afe3863f0f Merge with develop
--HG--
branch : compatibility-develop
2016-12-12 12:03:15 +01:00
kervala
d039598225 Fixed: Compilation
--HG--
branch : develop
2016-12-12 12:02:25 +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
e7d1710747 Chnged: Sign comparison warning
--HG--
branch : develop
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
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
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
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@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
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
d37a1e032c Fixed: Don't call CCoTask::releaseInstance() because allocated on heap
--HG--
branch : develop
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
bbcd14cecb Removed: Empty cpp files
--HG--
branch : develop
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
94bf8fd54e Changed: Use TCHAR functions
--HG--
branch : develop
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
699680ac4a Changed: Use addSlashR to replace \n by \r\n
--HG--
branch : develop
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
5658cad02e Changed: Convert std::string <> TCHAR
--HG--
branch : develop
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
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
0f6ae5e239 Changed: Release all memory when leaving in login screen
--HG--
branch : develop
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
995ea1e64f Changed: Unimplemented functions
--HG--
branch : develop
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
e2b74b77c6 Changed: Memory leaks detection
--HG--
branch : develop
2016-12-09 13:51:09 +01:00
kervala
c767e55344 Backed out changeset: 6b7af3bc4752
--HG--
branch : compatibility-develop
2016-12-08 18:20:34 +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
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
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
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
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
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
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
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
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
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
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
6150489f57 Changed: Added translation
--HG--
branch : compatibility-develop
2016-11-26 15:24:27 +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
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
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
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
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
kervala
f05cab8579 Changed: liblzma 16.04
--HG--
branch : develop
2016-11-15 11:32:20 +01:00