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

3437 commits

Author SHA1 Message Date
kervala
d6eadbf02b Merge with develop 
--HG--
branch : compatibility-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
588d50a429 Merge with develop 
--HG--
branch : compatibility-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
acfdb8d6fa Merge with develop 
--HG--
branch : compatibility-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
d5d4ba1e0c Merge with develop 
--HG--
branch : compatibility-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
177dacf100 Fixed: Compilation of Ryzom Installer 
--HG--
branch : develop
 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
552e147c76 Changed: If old installer doesn't return a version, overwrite it 
--HG--
branch : develop
 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
41fa1a938e Changed: More warnings 
--HG--
branch : develop
 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
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
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
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
kervala
064c3778f2 Merge with develop 
--HG--
branch : compatibility-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
7592d3e6c4 Fix coding guidelines + double initialized as 0.0 
--HG--
branch : fix_speed
 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
e50c1fcf98 Changed: Write warnings in log 
--HG--
branch : develop
 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
1879212116 Merge with develop 
--HG--
branch : compatibility-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
3526efb920 Fixed: 307 is a normal redirect 
--HG--
branch : develop
 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
6964d7a68e Merge with develop 
--HG--
branch : compatibility-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
d2cd7ebb1a Merge with develop 
--HG--
branch : compatibility-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
2e7af6ab0d Merge with develop 
--HG--
branch : compatibility-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
de2eba12fe Changed: Logs in Ryzom Installer 
--HG--
branch : develop
 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
3ae41bfa58 Changed: Minor changes 
--HG--
branch : develop
 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
25faa27ef5 Fixed: Compilation with VC++ 2015 (need spaces around NL_I64) 
--HG--
branch : develop
 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
kervala
2858fce968 Fixed: Trying to resume after a 206 HTTP status code 
--HG--
branch : develop
 2016-10-19 17:23:42 +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
37fe37c8ed Fixed: When incrementing version of ini file, check servers by ID not by index 
--HG--
branch : develop
 2016-10-19 17:06:25 +02:00
kervala
d100dd7823 Merge with develop 
--HG--
branch : compatibility-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
9bd254d25a Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-19 10:50:26 +02:00
kervala
b62562c896 Changed: Save default profile when clicking on Play or Configure 
--HG--
branch : develop
 2016-10-19 10:49:51 +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
4f996024d9 Fixed: Catch ESocket exceptions when disconnecting and log it 
--HG--
branch : develop
 2016-10-19 10:48:32 +02:00
kervala
c05a8d3c2e Fixed: Try to put executable permissions before to launch an executable under UNIX 
--HG--
branch : develop
 2016-10-19 10:46:56 +02:00
kervala
5517ff15f5 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-19 09:52:38 +02:00
kervala
3c5a7de588 Fixed: Also rename executable under Linux 
--HG--
branch : develop
 2016-10-19 09:52:12 +02:00
kervala
ea1522c904 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-18 20:35:14 +02:00
kervala
31f4957a40 Fixed: Display a more explicit error if NLMISC::CSystemInfo::availableHDSpace returns 0 
--HG--
branch : develop
 2016-10-18 20:34:25 +02:00
kervala
6392301ebc Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-18 17:50:19 +02:00
kervala
daf3edd056 Changed: Typo 
--HG--
branch : develop
 2016-10-18 17:49:56 +02:00
kervala
9b70baf02b Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-18 17:47:19 +02:00
kervala
f93e5458d9 Changed: Skip already uncompressed files 
--HG--
branch : develop
 2016-10-18 17:46:31 +02:00
kervala
a62e5ec380 Changed: Minor changes 
--HG--
branch : develop
 2016-10-18 17:45:55 +02:00
kervala
a656985518 Fixed: Possible SQL injection, fixes #297 
--HG--
branch : develop
 2016-10-18 17:44:47 +02:00
kervala
7b3fe00c6a Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-18 13:43:08 +02:00
kervala
d7f62326aa Fixed: Restart Installer at the end of installation/migration 
--HG--
branch : develop
 2016-10-18 13:42:19 +02:00
kervala
1162edcb46 Fixed: Case where additional files are not in source directory 
--HG--
branch : develop
 2016-10-18 13:37:43 +02:00
kervala
73368b0635 Merge with develop 
--HG--
branch : compatibility-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
0238b30489 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-18 10:27:44 +02:00
kervala
6801bf34d4 Fixed: Special case under Windows when Installer is run from TEMP directory 
--HG--
branch : develop
 2016-10-18 10:26:41 +02:00
kervala
bf8d9aef12 Changed: Check written bytes at each step and at the end 
--HG--
branch : develop
 2016-10-18 10:25:31 +02:00
kervala
508a6723a2 Changed: Use getInstallerCurrentDirPath() instead of QApplication::applicationDirPath() 
--HG--
branch : develop
 2016-10-18 10:24:10 +02:00
kervala
29aa0c1722 Changed: Restart installed Installer intead of current one 
--HG--
branch : develop
 2016-10-18 10:23:49 +02:00
kervala
35cdaab027 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-17 20:45:43 +02:00
kervala
a57a0eb0ce Fixed: Support QFile write in smaller parts 
--HG--
branch : develop
 2016-10-17 20:45:14 +02:00
kervala
f5240615b5 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-17 16:51:42 +02:00
kervala
f24346486f Fixed: Use parent directories 
--HG--
branch : develop
 2016-10-17 16:51:01 +02:00
kervala
5ed1b3a35b Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-17 15:43:33 +02:00
kervala
e43551908e Fixed: Missing variable 
--HG--
branch : develop
 2016-10-17 15:43:05 +02:00
kervala
a7b799fef0 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-17 13:53:10 +02:00
kervala
0e0ae0fde4 Fixed: Typo... 
--HG--
branch : develop
 2016-10-17 13:52:20 +02:00
kervala
a54d032093 Merge with develop 
--HG--
branch : compatibility-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
6c7059b6fe Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-17 13:14:20 +02:00
kervala
292dd3b6fb Fixed: Ryzom was the executable name in same directory 
--HG--
branch : develop
 2016-10-17 13:13:55 +02:00
kervala
1891033bc1 Merge with develop 
--HG--
branch : compatibility-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
273d5ab80d Fixed: getInstallerCurrentFilePath instead of getInstallerCurrentDirPath 
--HG--
branch : develop
 2016-10-17 13:08:14 +02:00
kervala
8f2fc49d7d Changed: Don't need arguments 
--HG--
branch : develop
 2016-10-17 13:07:32 +02:00
kervala
14ee62676f Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-17 11:49:38 +02:00
kervala
c418eb0c03 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-17 11:35:24 +02:00
kervala
4aac2d263b Fixed: Bundle name under OS X 
--HG--
branch : develop
 2016-10-17 11:24:31 +02:00
kervala
3476eeb5e9 Changed: Don't copy twice the same file under other platforms than Windows 
--HG--
branch : develop
 2016-10-17 11:23:49 +02:00
kervala
45c326a733 Changed: Keep other servers when upgrading ryzom_installer.ini 
--HG--
branch : develop
 2016-10-17 11:20:20 +02:00
kervala
ab1fb50ab5 Changed: Relaunch installed Ryzom Installer if exists 
--HG--
branch : develop
 2016-10-17 11:19:50 +02:00
kervala
d1e078aea5 Fixed: getInstallerCurrentDirPath() returns bundle parent directory under OS X 
--HG--
branch : develop
 2016-10-17 11:19:11 +02:00
kervala
f40e6deb7a Changed: Display also destination in error 
--HG--
branch : develop
 2016-10-17 11:17:35 +02:00
kervala
48f013a86e Changed: Use getInstallerCurrentFilePath() instead of QApplication::applicationFilePath() 
--HG--
branch : develop
 2016-10-17 11:16:34 +02:00
kervala
0101cdfacf Fixed: Recursive copy 
--HG--
branch : develop
 2016-10-17 11:13:49 +02:00
kervala
cb878500ad Fixed: Ryzom Installer executable under OS X 
--HG--
branch : develop
 2016-10-17 11:12:06 +02:00
kervala
702516171d Merge with develop 
--HG--
branch : compatibility-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
8e1123b9fb Changed: Upgrade scripts 
--HG--
branch : develop
 2016-10-16 17:38:37 +02:00
kervala
bf39b96792 Fixed: Compilation 
--HG--
branch : develop
 2016-10-16 17:38:00 +02:00
kervala
142a06f40d Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-16 17:31:37 +02:00
kervala
b78444490c Fixed: Infinite loop when HTTP error occurs 
--HG--
branch : develop
 2016-10-16 17:29:10 +02:00
kervala
a5a488da3e Changed: Always launch the more recent version of Installer 
--HG--
branch : develop
 2016-10-16 17:28:17 +02:00
kervala
f65883296b Changed: Use getInstallerInstalledFilePath() to get installed Installer full path 
--HG--
branch : develop
 2016-10-16 17:26:05 +02:00
kervala
34734e4fbe Fixed: Display all executables under OS X and Linux 
--HG--
branch : develop
 2016-10-16 17:22:51 +02:00
kervala
35b79a347b Changed: Updated translations 
--HG--
branch : develop
 2016-10-16 17:20:02 +02:00
kervala
cfe14a5bcd Changed: Better profiles editor under OS X 
--HG--
branch : develop
 2016-10-16 17:19:51 +02:00
kervala
f525deb1e2 Changed: Executable flags 
--HG--
branch : compatibility-develop
 2016-10-16 14:49:29 +02:00
Guillaume Dupuy
a79c371598 Fix end of function comment 
--HG--
branch : fix_speed
 2016-10-15 20:15:22 +02:00
Guillaume Dupuy
14966eef4c Remove debug message 
--HG--
branch : fix_speed
 2016-10-15 20:14:26 +02:00
Guillaume Dupuy
02316b9e8d Use double instead of float to allow big values of GameCycle (like on winchgate server) 
--HG--
branch : fix_speed
 2016-10-15 20:12:41 +02:00
Guillaume Dupuy
2818e9339d Uses float to calculate latency for sabrina phrases 
--HG--
branch : fix_speed
 2016-10-15 19:04:22 +02:00
kervala
c3c377e4a6 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-15 17:16:34 +02:00
kervala
999fd9d3aa Changed: Install shorcuts in Applications instead of /Applications 
--HG--
branch : develop
 2016-10-15 17:13:51 +02:00
kervala
43736cf523 Fixed: Wrong filename (because unallocated) 
--HG--
branch : develop
 2016-10-15 17:12:51 +02:00
kervala
f14a220e8e Changed: Use flat frames (better under Windows XP) 
--HG--
branch : develop
 2016-10-15 17:12:20 +02:00
kervala
85c2535a1f Fixed: Deadlock while calling CoUninitialize() 
--HG--
branch : develop
 2016-10-15 17:11:53 +02:00
kervala
fe9def78f0 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-15 10:37:56 +02:00
kervala
7a0a35586a Changed: Copy Ryzom Installer in parent directory if present 
--HG--
branch : develop
 2016-10-15 10:27:34 +02:00
kervala
a70b4d2613 Fixed: Also copy DLLs compatible with Ryzom Installer 
--HG--
branch : develop
 2016-10-15 10:22:50 +02:00
Guillaume Dupuy
9c5ecea867 Use speed as an int instead of float to calculate latency 
--HG--
branch : fix_speed
 2016-10-14 21:19:27 +02:00
Guillaume Dupuy
0e467cba86 Make multiples states changes in one tick (if relevant) 
--HG--
branch : fix_speed
 2016-10-14 21:03:31 +02:00
Guillaume Dupuy
1d960d91ff Fixed a rare case where float and double mixup would result in an incorrect speed 
--HG--
branch : fix_speed
 2016-10-13 20:46:10 +02:00
kervala
8324628ad4 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-13 19:51:38 +02:00
kervala
016e075fa5 Changed: Only install same client arch as Installer under Linux 
--HG--
branch : develop
 2016-10-13 19:50:11 +02:00
kervala
c3c4e56e4f Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-12 15:12:52 +02:00
kervala
4d6842495d Changed: Use a 128x128 icon for Linux 
--HG--
branch : develop
 2016-10-12 15:12:26 +02:00
kervala
a8d741882b Changed: Also set executable flag for ryzom_installer_qt 
--HG--
branch : develop
 2016-10-12 15:12:09 +02:00
kervala
2c84f4b178 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-11 20:28:25 +02:00
kervala
01fd44cdc2 Changed: Don't need to install PNG, it'll be created 
--HG--
branch : develop
 2016-10-11 20:27:55 +02:00
kervala
55d357e555 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-11 18:43:07 +02:00
kervala
ed7586656b Fixed: Wrong check for OS X 
--HG--
branch : develop
 2016-10-11 18:42:39 +02:00
kervala
2c757adbaa Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-11 18:04:35 +02:00
kervala
9744b44b6e Changed: Specify server to use (the one of default profile) 
--HG--
branch : develop
 2016-10-11 18:04:01 +02:00
kervala
cc8a200156 Changed: Better error message 
--HG--
branch : develop
 2016-10-11 18:03:26 +02:00
kervala
bc45604e46 Changed: Only return if downloading data 
--HG--
branch : develop
 2016-10-11 18:02:55 +02:00
kervala
d2edc7d418 Changed: Remove unused code 
--HG--
branch : develop
 2016-10-11 18:02:34 +02:00
kervala
0087f4aec9 Changed: Abort if operation failed 
--HG--
branch : develop
 2016-10-11 18:02:20 +02:00
kervala
27550081da Changed: Put real identifier for Ryzom Installer under OS X 
--HG--
branch : develop
 2016-10-11 17:46:05 +02:00
kervala
fdf69c006d Changed: Remove useless information in Info.plist 
--HG--
branch : develop
 2016-10-11 17:45:39 +02:00
kervala
2460943bea Fixed: Check if profiles are correct before using them 
--HG--
branch : develop
 2016-10-11 17:43:53 +02:00
kervala
f8155c116d Changed: Little optimization 
--HG--
branch : develop
 2016-10-11 17:43:03 +02:00
kervala
44ddae76b8 Changed: Escape strings that will be in XML file 
--HG--
branch : develop
 2016-10-11 17:42:46 +02:00
kervala
f0d591bca7 Changed: Remove nameToId 
--HG--
branch : develop
 2016-10-11 17:41:49 +02:00
kervala
a1fab80cad Changed: Added more comments 
--HG--
branch : develop
 2016-10-11 17:28:54 +02:00
kervala
1f95d69a81 Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-10 20:47:56 +02:00
kervala
977241a37a Changed: Use same name for executable than bundle 
--HG--
branch : develop
 2016-10-10 20:47:33 +02:00
kervala
efdbedce3e Changed: Disable architecture choice under OS X (always 64 bits) 
--HG--
branch : develop
 2016-10-10 20:47:15 +02:00
kervala
40fdaa50fa Merge with develop 
--HG--
branch : compatibility-develop
 2016-10-10 20:03:13 +02:00
kervala
4ed4c14971 Changed: Create a bundle for Ryzom Installer under OS X 
--HG--
branch : develop
 2016-10-10 20:02:38 +02:00