Commit graph

3883 commits

Author SHA1 Message Date
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
9f434db97b Merge with develop 2016-10-31 19:03:04 +01:00
kervala
d4bbc683a7 Changed: Updated all translations in UTF-8 2016-10-31 19:02:29 +01:00
kervala
ca9baf5e4c Fixed: Spaces in paths for patch under Linux and OS X 2016-10-31 18:58:49 +01:00
kervala
9ce9d9c388 Changed: Don't update qtbase_*.ts files 2016-10-31 18:58:07 +01:00
kervala
9d85a406d4 Changed: Updated some variables names in interface 2016-10-31 18:57:42 +01:00
kervala
647136acc8 Changed: Updated translations 2016-10-31 18:57:18 +01:00
kervala
a92608edc4 Fixed: Layout of some interfaces in Ryzom Configuration 2016-10-31 18:56:55 +01:00
kervala
7a1a082135 Merge with develop 2016-10-30 16:52:02 +01:00
kervala
ff11c8b8fb Changed: std::string already empty 2016-10-30 16:00:04 +01:00
kervala
b785a5114b Changed: Use empty() instead of comparison with "" 2016-10-30 15:59:20 +01:00
kervala
b07db1a990 Changed: Use clear() instead of affectation 2016-10-30 15:56:41 +01:00
kervala
574405e5b5 Changed: Simplified layout for display 2016-10-30 15:35:58 +01:00
kervala
cc0ff91df5 Fixed: Add config variable if not present 2016-10-30 15:35:44 +01:00
kervala
7023fc88ac Fixed: Choice of sound driver 2016-10-30 15:35:11 +01: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
0cfd8cb35d Merge with develop 2016-10-27 16:48:45 +02:00
kervala
afddb37b73 Changed: Minor changes 2016-10-27 16:48:07 +02:00
kervala
4e68b3c40a Fixed: Restore last selected profile 2016-10-27 16:47:44 +02:00
kervala
8a6a8765ac Changed: Typo 2016-10-27 10:55:20 +02:00
kervala
da10334807 Changed: Minor change 2016-10-27 10:54:55 +02:00
kervala
a53ec84c73 Changed: Simplified all ENDIF and ELSE 2016-10-27 10:54:09 +02:00
kervala
c9244568eb Merge with develop 2016-10-26 14:30:17 +02:00
kervala
d7782f758f Fixed: Crash when calling runAH in Lua scripts too soon 2016-10-26 14:29:49 +02:00
kervala
956da7f9da Merge with develop 2016-10-25 17:41:54 +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
56b8a61b16 Changed: Use empty() to check if a string is empty 2016-10-25 15:52:14 +02:00
kervala
dc9c463483 Changed: Don't force PatchUrl in client_default.cfg 2016-10-25 14:10:25 +02:00
kervala
df676ede7e Merge with develop 2016-10-25 11:50:27 +02:00
kervala
f11527442c Changed: Display a warning when SetWindowTextW fails 2016-10-25 11:49:46 +02:00
kervala
c02ab44327 Changed: Minor change 2016-10-24 13:54:20 +02:00
kervala
627dea4a06 Merge with develop 2016-10-23 16:29:49 +02:00
kervala
3c52626be2 Fixed: Clear m_srcDirectory if directory doesn't exist anymore 2016-10-23 16:28:17 +02:00
kervala
bfccba236f Changed: Display filename in unsuported format warning 2016-10-23 16:27:49 +02:00
kervala
070966fca1 Fixed: Default action tooltip text position 2016-10-23 16:24:18 +02:00
kervala
306ee45cc5 Changed: Removed trailing spaces at EOL 2016-10-23 16:16:48 +02:00
kervala
bb9608bcea Merge with develop 2016-10-22 19:40:34 +02:00
kervala
73b691df36 Changed: Name edit box better aligned 2016-10-22 19:38:13 +02:00
kervala
eb941d396b Fixed: Wrong height in action edit 2016-10-22 19:38:05 +02:00
kervala
1e5a40a0a2 Changed: Name edit box better aligned 2016-10-22 19:24:20 +02:00
kervala
b22528aac9 Changed: Removed trailing spaces at EOL 2016-10-22 18:50:43 +02:00
kervala
14917f114f Merge with develop 2016-10-22 16:55:51 +02:00
kervala
d66e9867c0 Changed: Force process name for Ryzom Installer 2016-10-22 16:48:34 +02:00
kervala
b9ce644e15 Changed: Support RYZOM_BUILD CMake option to force Bundle version 2016-10-22 16:48:15 +02:00
kervala
143127d249 Changed: OS X icon slightly changed 2016-10-22 16:47:43 +02:00
kervala
2945dbf3b9 Merge with develop 2016-10-21 20:00:50 +02:00
kervala
3b00a6a2e0 Changed: MACOSX_BUNDLE_BUNDLE_VERSION must a short version 2016-10-21 20:00:23 +02:00
kervala
c26056c53a Merge with develop 2016-10-21 19:04:29 +02:00
kervala
162e4c6912 Fixed: Use real Ryzom version instead of 1.0 2016-10-21 19:03:40 +02:00
kervala
bf6f28ce43 Merge with develop 2016-10-21 16:54:50 +02:00
kervala
3a0d88c07d Changed: Compile CMigrateDialog anyway even if unused 2016-10-21 16:54:08 +02:00
kervala
d078103453 Merge with develop 2016-10-21 16:50:04 +02:00
kervala
9a29dbced9 Changed: Merge pull request in develop too 2016-10-21 16:48:42 +02:00
kervala
3c3869fef5 Fixed: Compilation of Ryzom Installer 2016-10-21 16:09:02 +02:00
kervala
76c27c64f8 Merge with develop 2016-10-21 14:27:31 +02:00
kervala
1615c21909 Changed: If old installer doesn't return a version, overwrite it 2016-10-21 14:27:05 +02:00
kervala
60e927a3a0 Changed: Open in ReadOnly the process 2016-10-21 14:26:46 +02:00
kervala
aa42c17fed Changed: More warnings 2016-10-21 14:26:31 +02:00
kervala
a45d723334 Changed: More messages in log 2016-10-21 12:58:23 +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
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
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
7e6c5c13bd Merge with develop 2016-10-20 17:46:58 +02:00
Guillaume Dupuy
c584bb34b6 Forgot one 0.0f initialisation 2016-10-20 16:04:47 +02:00
Guillaume Dupuy
3e9ee0954b Fix coding guidelines + double initialized as 0.0 2016-10-20 16:02:02 +02:00
kervala
f079236f7f Changed: HTTP code 307 is not an error 2016-10-20 15:30:43 +02:00
kervala
6c077b671d Changed: Write warnings in log 2016-10-20 15:30:30 +02:00
kervala
9dc33effe6 Changed: Real version of Ryzom Installer as user-agent 2016-10-20 15:30:12 +02:00
kervala
f95d95bdc5 Merge with develop 2016-10-20 14:48:16 +02:00
kervala
f2a3a4e99f Changed: Log version of installed Installer 2016-10-20 14:47:45 +02:00
kervala
59b4206afb Fixed: 307 is a normal redirect 2016-10-20 14:47:28 +02:00
kervala
7940b17ba7 Changed: Init log just after loading config file 2016-10-20 14:47:08 +02:00
kervala
52678ea899 Merge with develop 2016-10-20 13:55:34 +02:00
kervala
6f1bb45f47 Changed: Allow to enable Sandbox under OS X 2016-10-20 13:53:23 +02:00
kervala
0111c69054 Merge with develop 2016-10-20 13:14:19 +02:00
kervala
68d9be0bd9 Added: Missing file 2016-10-20 13:13:53 +02:00
kervala
c3bcfb42b8 Merge with develop 2016-10-20 13:08:48 +02:00
kervala
3f25776129 Changed: Use sender() instead of member 2016-10-20 13:07:56 +02:00
kervala
a46bb29254 Changed: Logs in Ryzom Installer 2016-10-20 13:07:18 +02:00
kervala
02d8b7d400 Changed: Simplify toString 2016-10-20 12:35:24 +02:00
kervala
f53ecd3687 Changed: Minor changes 2016-10-20 12:34:25 +02:00
kervala
fd61399877 Changed: Replace sscanf by fromString 2016-10-20 12:33:37 +02:00
kervala
9ab62c5606 Fixed: Compilation with VC++ 2015 (need spaces around NL_I64) 2016-10-20 12:30:24 +02:00
kervala
afc03e63ee Merge with develop 2016-10-19 17:25:45 +02:00
kervala
a99cb3c992 Fixed: Trying to resume after a 206 HTTP status code 2016-10-19 17:23:42 +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
e3291f999c Fixed: When incrementing version of ini file, check servers by ID not by index 2016-10-19 17:06:25 +02:00
kervala
6fc090d4c1 Merge with develop 2016-10-19 13:32:14 +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
a388c89fd5 Merge with develop 2016-10-19 10:50:26 +02:00
kervala
3534ca411b Changed: Save default profile when clicking on Play or Configure 2016-10-19 10:49:51 +02:00
kervala
752f5e3cdb Fixed: Use & to not wait until client exits in bash script 2016-10-19 10:49:20 +02:00
kervala
2a407b8c00 Fixed: Catch ESocket exceptions when disconnecting and log it 2016-10-19 10:48:32 +02:00
kervala
9666ed648b Fixed: Try to put executable permissions before to launch an executable under UNIX 2016-10-19 10:46:56 +02:00
kervala
33e1dedbf1 Merge with develop 2016-10-19 09:52:38 +02:00
kervala
cd2a7f0efc Fixed: Also rename executable under Linux 2016-10-19 09:52:12 +02:00
kervala
f2907587c4 Merge with develop 2016-10-18 20:35:14 +02:00
kervala
8837ac7831 Fixed: Display a more explicit error if NLMISC::CSystemInfo::availableHDSpace returns 0 2016-10-18 20:34:25 +02:00
kervala
e5d8439a1d Merge with develop 2016-10-18 17:50:19 +02:00
kervala
34a3f05b98 Changed: Typo 2016-10-18 17:49:56 +02:00
kervala
54c7e89e05 Merge with develop 2016-10-18 17:47:19 +02:00
kervala
98cd2c5e02 Changed: Skip already uncompressed files 2016-10-18 17:46:31 +02:00
kervala
44c61c03e5 Changed: Minor changes 2016-10-18 17:45:55 +02:00
kervala
535f5b8bde Fixed: Possible SQL injection, fixes #297 2016-10-18 17:44:47 +02:00
kervala
0c63da38f1 Merge with develop 2016-10-18 13:43:08 +02:00
kervala
2f98e52dbf Fixed: Restart Installer at the end of installation/migration 2016-10-18 13:42:19 +02:00
kervala
ae71ce0f89 Fixed: Case where additional files are not in source directory 2016-10-18 13:37:43 +02:00
kervala
ff2bb04474 Merge with develop 2016-10-18 10:33:11 +02:00
kervala
c7a5ee9e24 Changed: Use exec command under OS X to relaunch client 2016-10-18 10:32:45 +02:00
kervala
80cbda23e5 Merge with develop 2016-10-18 10:27:44 +02:00
kervala
3b7f35efcc Fixed: Special case under Windows when Installer is run from TEMP directory 2016-10-18 10:26:41 +02:00
kervala
f225b26b76 Changed: Check written bytes at each step and at the end 2016-10-18 10:25:31 +02:00
kervala
f413f6e488 Changed: Use getInstallerCurrentDirPath() instead of QApplication::applicationDirPath() 2016-10-18 10:24:10 +02:00
kervala
746336f249 Changed: Restart installed Installer intead of current one 2016-10-18 10:23:49 +02:00
kervala
a31e0b8d25 Merge with develop 2016-10-17 20:45:43 +02:00
kervala
9ed1ce8f7c Fixed: Support QFile write in smaller parts 2016-10-17 20:45:14 +02:00
kervala
bbb97b7b5b Merge with develop 2016-10-17 16:51:42 +02:00
kervala
bedc55578d Fixed: Use parent directories 2016-10-17 16:51:01 +02:00
kervala
4d36b39ebc Merge with develop 2016-10-17 15:43:33 +02:00
kervala
30160d3f15 Fixed: Missing variable 2016-10-17 15:43:05 +02:00
kervala
b5a9e81b83 Merge with develop 2016-10-17 13:53:10 +02:00
kervala
9807be9534 Fixed: Typo... 2016-10-17 13:52:20 +02:00
kervala
eaa19cdfd2 Merge with develop 2016-10-17 13:30:00 +02:00
kervala
caafb52698 Fixed: Check exact filename with pgrep 2016-10-17 13:29:37 +02:00
kervala
98a2f3740c Merge with develop 2016-10-17 13:14:20 +02:00
kervala
1c941a69f2 Fixed: Ryzom was the executable name in same directory 2016-10-17 13:13:55 +02:00
kervala
25d66dafa2 Merge with develop 2016-10-17 13:09:17 +02:00
kervala
4780450e41 Fixed: Escape path (it can contains spaces) 2016-10-17 13:08:44 +02:00
kervala
c0678ac664 Fixed: getInstallerCurrentFilePath instead of getInstallerCurrentDirPath 2016-10-17 13:08:14 +02:00
kervala
887eee427d Changed: Don't need arguments 2016-10-17 13:07:32 +02:00
kervala
8a52b34e09 Merge with develop 2016-10-17 11:49:38 +02:00
kervala
364efba09d Merge with develop 2016-10-17 11:35:24 +02:00
kervala
51aeaf44fa Fixed: Bundle name under OS X 2016-10-17 11:24:31 +02:00
kervala
31efed9b17 Changed: Don't copy twice the same file under other platforms than Windows 2016-10-17 11:23:49 +02:00
kervala
b860ae4428 Changed: Keep other servers when upgrading ryzom_installer.ini 2016-10-17 11:20:20 +02:00
kervala
377b122772 Changed: Relaunch installed Ryzom Installer if exists 2016-10-17 11:19:50 +02:00
kervala
a307601382 Fixed: getInstallerCurrentDirPath() returns bundle parent directory under OS X 2016-10-17 11:19:11 +02:00
kervala
681d3b5c73 Changed: Display also destination in error 2016-10-17 11:17:35 +02:00
kervala
ae56643f3a Changed: Use getInstallerCurrentFilePath() instead of QApplication::applicationFilePath() 2016-10-17 11:16:34 +02:00
kervala
18b7697a23 Fixed: Recursive copy 2016-10-17 11:13:49 +02:00
kervala
23b9105803 Fixed: Ryzom Installer executable under OS X 2016-10-17 11:12:06 +02:00
kervala
2379918a3e Merge with develop 2016-10-16 17:39:37 +02:00
kervala
f0c464f4d3 Changed: Disable FXAA checkbox if bloom not supported 2016-10-16 17:39:07 +02:00
kervala
77af1636aa Changed: Upgrade scripts 2016-10-16 17:38:37 +02:00
kervala
997b4b9e00 Fixed: Compilation 2016-10-16 17:38:00 +02:00
kervala
f358ae1c9a Merge with develop 2016-10-16 17:31:37 +02:00
kervala
9ab3b7f253 Fixed: Infinite loop when HTTP error occurs 2016-10-16 17:29:10 +02:00
kervala
fe890b3728 Changed: Always launch the more recent version of Installer 2016-10-16 17:28:17 +02:00
kervala
a2f67bf469 Changed: Use getInstallerInstalledFilePath() to get installed Installer full path 2016-10-16 17:26:05 +02:00
kervala
7a61907a41 Fixed: Display all executables under OS X and Linux 2016-10-16 17:22:51 +02:00
kervala
be26e83637 Changed: Updated translations 2016-10-16 17:20:02 +02:00
kervala
bff7557fb9 Changed: Better profiles editor under OS X 2016-10-16 17:19:51 +02:00
kervala
b8114b2cd6 Changed: Executable flags 2016-10-16 14:49:29 +02:00
Guillaume Dupuy
ad48baa3b1 Fix end of function comment 2016-10-15 20:15:22 +02:00
Guillaume Dupuy
de00d262c1 Remove debug message 2016-10-15 20:14:26 +02:00
Guillaume Dupuy
bf8677131b Use double instead of float to allow big values of GameCycle (like on winchgate server) 2016-10-15 20:12:41 +02:00
Guillaume Dupuy
1020c758b9 Uses float to calculate latency for sabrina phrases 2016-10-15 19:04:22 +02:00
kervala
6fc8853d51 Merge with develop 2016-10-15 17:16:34 +02:00
kervala
dd0f1ab72b Changed: Install shorcuts in Applications instead of /Applications 2016-10-15 17:13:51 +02:00
kervala
f11cc79b02 Fixed: Wrong filename (because unallocated) 2016-10-15 17:12:51 +02:00
kervala
23ba7e265b Changed: Use flat frames (better under Windows XP) 2016-10-15 17:12:20 +02:00
kervala
fd5c22af05 Fixed: Deadlock while calling CoUninitialize() 2016-10-15 17:11:53 +02:00
kervala
913b43f243 Merge with develop 2016-10-15 10:37:56 +02:00
kervala
0c2ff9d8ee Changed: Copy Ryzom Installer in parent directory if present 2016-10-15 10:27:34 +02:00
kervala
927d66ed5d Fixed: Also copy DLLs compatible with Ryzom Installer 2016-10-15 10:22:50 +02:00
Guillaume Dupuy
0cfefb65f7 Use speed as an int instead of float to calculate latency 2016-10-14 21:19:27 +02:00
Guillaume Dupuy
480218b4c8 Make multiples states changes in one tick (if relevant) 2016-10-14 21:03:31 +02:00
Guillaume Dupuy
9ec5a6e693 Fixed a rare case where float and double mixup would result in an incorrect speed 2016-10-13 20:46:10 +02:00
kervala
4b6e360e22 Merge with develop 2016-10-13 19:51:38 +02:00
kervala
dfba29c457 Changed: Only install same client arch as Installer under Linux 2016-10-13 19:50:11 +02:00
kervala
e67d86eeda Merge with develop 2016-10-12 15:12:52 +02:00
kervala
d3e43081f3 Changed: Use a 128x128 icon for Linux 2016-10-12 15:12:26 +02:00
kervala
a3ebdb8594 Changed: Also set executable flag for ryzom_installer_qt 2016-10-12 15:12:09 +02:00
kervala
8f33264131 Merge with develop 2016-10-11 20:28:25 +02:00
kervala
e7acc8f8ef Changed: Don't need to install PNG, it'll be created 2016-10-11 20:27:55 +02:00
kervala
975a8f2d53 Merge with develop 2016-10-11 18:43:07 +02:00
kervala
aab52e2d72 Fixed: Wrong check for OS X 2016-10-11 18:42:39 +02:00
kervala
ad26721df6 Merge with develop 2016-10-11 18:04:35 +02:00
kervala
bb8acc7134 Changed: Specify server to use (the one of default profile) 2016-10-11 18:04:01 +02:00
kervala
c9a1346d76 Changed: Better error message 2016-10-11 18:03:26 +02:00
kervala
3d965a2071 Changed: Only return if downloading data 2016-10-11 18:02:55 +02:00
kervala
db6fcdf39d Changed: Remove unused code 2016-10-11 18:02:34 +02:00
kervala
3d3c1d50c3 Changed: Abort if operation failed 2016-10-11 18:02:20 +02:00
kervala
04c4a675af Changed: Put real identifier for Ryzom Installer under OS X 2016-10-11 17:46:05 +02:00
kervala
47bc75eb42 Changed: Remove useless information in Info.plist 2016-10-11 17:45:39 +02:00
kervala
2b19bbe241 Fixed: Check if profiles are correct before using them 2016-10-11 17:43:53 +02:00
kervala
f77f8249f1 Changed: Little optimization 2016-10-11 17:43:03 +02:00
kervala
06f08b1128 Changed: Escape strings that will be in XML file 2016-10-11 17:42:46 +02:00
kervala
3f2b4f3a22 Changed: Remove nameToId 2016-10-11 17:41:49 +02:00
kervala
32e71c4b97 Changed: Added more comments 2016-10-11 17:28:54 +02:00
kervala
2b4058ed95 Merge with develop 2016-10-10 20:47:56 +02:00
kervala
1d70d9c21a Changed: Use same name for executable than bundle 2016-10-10 20:47:33 +02:00
kervala
1598a7a30f Changed: Disable architecture choice under OS X (always 64 bits) 2016-10-10 20:47:15 +02:00
kervala
e668405115 Merge with develop 2016-10-10 20:03:13 +02:00
kervala
09d682a7a3 Changed: Create a bundle for Ryzom Installer under OS X 2016-10-10 20:02:38 +02:00
kervala
35b59843cf Merge with develop 2016-10-10 18:55:28 +02:00
kervala
353458b28a Fixed: Use exec instead of open to launch an executable under OS X 2016-10-10 18:54:03 +02:00
kervala
aaf1b2baf3 Fixed: Create directory before trying to create a client.cfg 2016-10-10 18:53:39 +02:00
kervala
2715eecda7 Merge with develop 2016-10-10 16:36:38 +02:00