Commit graph

3630 commits

Author SHA1 Message Date
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
kervala
3ab030e359 Merge with develop
--HG--
branch : compatibility-develop
2016-10-10 18:55:28 +02:00
kervala
73fd215b21 Fixed: Use exec instead of open to launch an executable under OS X
--HG--
branch : develop
2016-10-10 18:54:03 +02:00
kervala
9a402ea68c Fixed: Create directory before trying to create a client.cfg
--HG--
branch : develop
2016-10-10 18:53:39 +02:00
kervala
41d0e70064 Merge with develop
--HG--
branch : compatibility-develop
2016-10-10 16:36:38 +02:00
kervala
f279e5f726 Fixed: Missing .sh file in QRC
--HG--
branch : develop
2016-10-10 16:35:45 +02:00
kervala
5e0338d622 Fixed: Wrong modification dates of files uncompressed from 7z and ZIP archives
--HG--
branch : develop
2016-10-10 16:35:29 +02:00
kervala
aefaa8f098 Merge with develop
--HG--
branch : compatibility-develop
2016-10-09 19:53:31 +02:00
kervala
7b6a6945e5 Changed: Error 6 occurs when a 7z file is damaged and can't be uncompressed
--HG--
branch : develop
2016-10-09 19:50:35 +02:00
kervala
8caac6363f Changed: Support special bundle structure for OS X client
--HG--
branch : develop
2016-10-09 19:50:06 +02:00
kervala
a32878ab06 Merge with develop
--HG--
branch : compatibility-develop
2016-10-09 15:34:28 +02:00
kervala
1a3a0911e3 Changed: Write icon under Linux if not found
--HG--
branch : develop
2016-10-09 15:10:15 +02:00
kervala
cd618d4402 Changed: Remove whole directory if empty
--HG--
branch : develop
2016-10-09 15:09:54 +02:00
kervala
533e01ea5a Changed: Created and used isDirectoryWritable() function
--HG--
branch : develop
2016-10-09 15:09:30 +02:00
kervala
16ee68d3d3 Changed: Write shortcuts under OS X
--HG--
branch : develop
2016-10-09 15:08:37 +02:00
kervala
360907c48d Changed: Better quality icon for Linux
--HG--
branch : develop
2016-10-09 14:51:18 +02:00
kervala
e366d8cb9b Changed: Renamed ryzom_installer.png to ryzom.png
--HG--
branch : develop
2016-10-09 14:50:51 +02:00
kervala
a484a4aa53 Merge with develop
--HG--
branch : compatibility-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
7559190c29 Merge with develop
--HG--
branch : compatibility-develop
2016-10-08 14:15:15 +02:00
kervala
263665696a Changed: Don't propose to migrate in CInstallDialog
--HG--
branch : develop
2016-10-08 14:14:37 +02:00
kervala
0eeae6c652 Merge with develop
--HG--
branch : compatibility-develop
2016-10-04 19:27:56 +02:00
kervala
c348bbb3de Changed: Delete old profiles shortcuts (in case where they are renamed)
--HG--
branch : develop
2016-10-04 19:27:29 +02:00
kervala
e4d156be08 Merge with develop
--HG--
branch : compatibility-develop
2016-10-04 12:04:23 +02:00
kervala
d1575b9f58 Fixed: Don't check if directory is empty when reinstalling in same directory
--HG--
branch : develop
2016-10-04 11:58:51 +02:00
kervala
67cc549fe6 Merge with develop
--HG--
branch : compatibility-develop
2016-10-03 17:22:46 +02:00
kervala
fc6415d64b Fixed: Wrong signals
--HG--
branch : develop
2016-10-03 17:20:43 +02:00
kervala
3df8c75227 Changed: Call updateAddRemoveEntry() instead of setting details twice
--HG--
branch : develop
2016-10-03 17:20:25 +02:00
kervala
0cab55f3f9 Changed: Update product comments
--HG--
branch : develop
2016-10-03 17:19:53 +02:00
kervala
53854c88ae Fixed: EstimatedSize is in KiB
--HG--
branch : develop
2016-10-03 17:19:41 +02:00
kervala
2377b6a45d Changed: Minor changes
--HG--
branch : develop
2016-10-03 17:18:48 +02:00
kervala
983f4f81df Fixed: Create Menu directory before creating shortcuts
--HG--
branch : develop
2016-10-03 17:18:25 +02:00
kervala
72144c3131 Fixed: Wrong size for downloaded components
--HG--
branch : develop
2016-10-03 17:17:57 +02:00
kervala
7d7ce29894 Changed: Installer filename should not depend on server
--HG--
branch : develop
2016-10-03 17:17:20 +02:00
kervala
9c1a5a315f Changed: Include Installer icon in QRC
--HG--
branch : develop
2016-10-03 17:14:43 +02:00
kervala
20f0092e63 Merge with develop
--HG--
branch : compatibility-develop
2016-10-03 10:02:06 +02:00
kervala
ca9ccf5fbf Changed: Variables to debug infinite loops
--HG--
branch : develop
2016-10-03 10:01:30 +02:00
kervala
c0d4013b51 Changed: New functions to remove a shortcut and check if it exists
--HG--
branch : develop
2016-10-03 09:59:19 +02:00
kervala
9d9838a837 Changed: Updated translations
--HG--
branch : develop
2016-10-03 09:55:59 +02:00
kervala
d68dbdef7a Merge with develop
--HG--
branch : compatibility-develop
2016-10-01 14:11:10 +02:00
kervala
96378bb0b6 Fixed: Compilation under OS X
--HG--
branch : develop
2016-10-01 14:10:43 +02:00
kervala
c5881e9f11 Merge with develop
--HG--
branch : compatibility-develop
2016-10-01 13:10:05 +02:00
kervala
17052235b5 Changed: Updated translations
--HG--
branch : develop
2016-10-01 13:09:19 +02:00
kervala
89be376c1f Fixed: Use real data size when migrating
--HG--
branch : develop
2016-10-01 13:07:18 +02:00
kervala
1ebc739797 Fixed: msvcr140.dll is called vcrunrime140.dll
--HG--
branch : develop
2016-10-01 13:05:58 +02:00
kervala
f17f7954ac Fixed: Unable to find a shortcut
--HG--
branch : develop
2016-10-01 13:05:11 +02:00
kervala
320f3e6c46 Merge with develop
--HG--
branch : compatibility-develop
2016-09-29 20:47:46 +02:00
kervala
f39e135494 Fixed: Delete ryzom_installer.ini when uninstalling Installer
--HG--
branch : develop
2016-09-29 20:47:03 +02:00
kervala
b6a88ad754 Fixed: Create Installer link under Linux
--HG--
branch : develop
2016-09-29 20:46:29 +02:00
kervala
45c9b402ad Merge with develop
--HG--
branch : compatibility-develop
2016-09-29 17:08:03 +02:00
kervala
76d05750f4 Changed: Don't update Qt translations
--HG--
branch : develop
2016-09-29 17:07:28 +02:00
kervala
a5e964351d Changed: Updated translations
--HG--
branch : develop
2016-09-29 17:06:38 +02:00
kervala
7e32d9b928 Changed: New checks after selecting a directory (must be empty and write permissions)
--HG--
branch : develop
2016-09-29 17:05:20 +02:00
kervala
13aac03c04 Changed: Use default directory when choosing destination
--HG--
branch : develop
2016-09-29 17:03:59 +02:00
kervala
a9891214bd Changed: Disable texts that don't need to be translated
--HG--
branch : develop
2016-09-29 17:03:17 +02:00
kervala
f5035aa63d Changed: New button for default location
--HG--
branch : develop
2016-09-29 16:54:50 +02:00
kervala
136325930a Merge with develop
--HG--
branch : compatibility-develop
2016-09-29 00:20:47 +02:00
kervala
75faa59be4 Changed: Updated translations
--HG--
branch : develop
2016-09-29 00:20:25 +02:00
kervala
ac9dcd663d Merge with develop
--HG--
branch : compatibility-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
e7b23c958a Fixed: Connexion -> Connection typo
--HG--
branch : develop
2016-09-28 23:42:01 +02:00
kervala
9c4225d74e Fixed: Desktop files need to be executable
--HG--
branch : develop
2016-09-28 23:32:24 +02:00
kervala
9af4edf07a Changed: Increase timeout delay to 30s (just to avoid to wait forever)
--HG--
branch : develop
2016-09-28 23:31:26 +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
9557aff2cc Fixed: Remove all directories from data excepted fonts one
--HG--
branch : develop
2016-09-28 23:29:02 +02:00
kervala
5d4bdf8f60 Fixed: Don't fix height of operation dialog
--HG--
branch : develop
2016-09-28 23:27:15 +02:00
kervala
73bce1e259 Merge with develop
--HG--
branch : compatibility-develop
2016-09-28 12:25:45 +02:00
kervala
9534b01d87 Changed: Updated translations
--HG--
branch : develop
2016-09-28 12:23:25 +02:00
kervala
ad11871e7a Changed: Simplify progress texts
--HG--
branch : develop
2016-09-28 12:22:27 +02:00
kervala
e812b2ed6e Changed: Updated translations
--HG--
branch : compatibility-develop
2016-09-27 14:57:12 +02:00
kervala
0b0171b723 Merge with develop
--HG--
branch : compatibility-develop
2016-09-26 10:41:52 +02:00
kervala
c1d48c995a Changed: Updated translations
--HG--
branch : develop
2016-09-26 10:40:56 +02:00
kervala
032e46b97a Added: Ryzhome files
--HG--
branch : compatibility-develop
2016-09-25 14:21:42 +02:00
kervala
2fc39bc14d Added: Missing files from data_common.bnp
--HG--
branch : compatibility-develop
2016-09-25 14:17:30 +02:00
kervala
abdb7fca21 Merge with develop
--HG--
branch : compatibility-develop
2016-09-25 10:37:42 +02:00
kervala
4b4b321169 Changed: Allow to compile Ryzom tools even without MySQL (mysql client library has compilation problems with VC++ 2015)
--HG--
branch : develop
2016-09-25 10:24:51 +02:00
kervala
72ed8b2c61 Changed: Client directory already processed
--HG--
branch : develop
2016-09-25 10:23:57 +02:00
kervala
e6fa251d92 Changed: Moved init code in sheets_packer.cpp
Changed: Expand environment variables for other variables too
Changed: Don't create log.log
Changed: Added missing AGPL headers

--HG--
branch : develop
2016-09-25 10:23:34 +02:00
kervala
33dfd39409 Changed: Use CCmdArgs for sheets_packer, see #281
--HG--
branch : develop
2016-09-25 10:20:49 +02:00
kervala
dcf90f381f Merge with develop
--HG--
branch : compatibility-develop
2016-09-24 15:54:47 +02:00
kervala
b1f28ace36 Changed: Updated German translations
--HG--
branch : develop
2016-09-24 15:53:58 +02:00
kervala
ce576954e0 Merge with develop
--HG--
branch : compatibility-develop
2016-09-24 14:22:22 +02:00
kervala
af1f02c53f Changed: Download from "installer" directory now, see #279
--HG--
branch : develop
2016-09-24 14:18:44 +02:00
kervala
162e683803 Changed: New methods loadFromSettings and saveToSettings for CProfile and CServer, see #279
--HG--
branch : develop
2016-09-24 14:17:43 +02:00
kervala
1ce480a809 Changed: Minor change
--HG--
branch : develop
2016-09-24 14:00:01 +02:00
kervala
3c4f5bfd4c Changed: Moved Syphox mod to ryzom/data/mods to not conflict when creating gamedev.bnp
--HG--
branch : develop
2016-09-24 13:59:09 +02:00
kervala
67f1797f6d Changed: Updated German translations
--HG--
branch : develop
2016-09-24 13:26:45 +02:00
kervala
fbe367bd39 Removed: Textures shouldn't go in gamedev
--HG--
branch : compatibility-develop
2016-09-22 21:56:28 +02:00
kervala
4d0c075cc1 Merge with develop
--HG--
branch : compatibility-develop
2016-09-22 18:48:22 +02:00
kervala
ed3a5e577f Changed: Link to Version.lib, see #279
--HG--
branch : develop
2016-09-22 18:47:53 +02:00
kervala
9c4e3c36c7 Merge with develop
--HG--
branch : compatibility-develop
2016-09-22 18:12:21 +02:00
kervala
f5ba2e2ff5 Changed: Implements shouldCopyInstaller() based on version from executable, see #279
--HG--
branch : develop
2016-09-22 18:11:47 +02:00
kervala
ba8673432b Changed: Use getVersionFromExecutable in CProfilesDialog, see #279
--HG--
branch : develop
2016-09-22 18:10:13 +02:00
kervala
d6b0f49db2 Changed: One second timeout to get version, see #279
--HG--
branch : develop
2016-09-22 18:09:43 +02:00
kervala
8b2d787c77 Changed: Implement --version/-v ourself and process it before loading config, see #279
--HG--
branch : develop
2016-09-22 18:09:02 +02:00
kervala
f824bf0b48 Changed: New method to get executable version, see #279
--HG--
branch : develop
2016-09-22 17:24:41 +02:00
kervala
ff0a240d40 Merge with develop
--HG--
branch : compatibility-develop
2016-09-22 11:40:42 +02:00
kervala
eb219b0c2b Changed: Display an better text for status code 307, see #279
--HG--
branch : develop
2016-09-22 11:40:13 +02:00
kervala
6447e9794e Changed: Remove certificates in data (they should be in gamedev.bnp now), see #279
--HG--
branch : develop
2016-09-22 11:39:33 +02:00
kervala
cd9abbcaae Fixed: Stalling interface when an error occurs when downloading, see #279
--HG--
branch : develop
2016-09-22 11:38:32 +02:00
kervala
36b106e2ab Changed: German translations, see #279
--HG--
branch : develop
2016-09-22 11:37:43 +02:00
kervala
fe825a0adc Merge with develop
--HG--
branch : compatibility-develop
2016-09-21 18:04:29 +02:00
kervala
338c1883bc Fixed: Don't ask confirmation
--HG--
branch : develop
2016-09-21 18:04:07 +02:00
kervala
acd58ceb07 Merge with develop
--HG--
branch : compatibility-develop
2016-09-21 17:38:33 +02:00
kervala
0b6546244d Fixed: Missing ENDIF()
--HG--
branch : develop
2016-09-21 17:38:10 +02:00
kervala
894659bdc8 Merge with develop
--HG--
branch : compatibility-develop
2016-09-21 17:34:34 +02:00
kervala
cb92380966 Changed: Install Upgrade scripts
--HG--
branch : develop
2016-09-21 17:34:13 +02:00
kervala
abde821537 Added: upgd_nl.bat for Windows
--HG--
branch : develop
2016-09-21 17:27:29 +02:00
kervala
7eac64f18c Merge with develop
--HG--
branch : compatibility-develop
2016-09-21 17:19:31 +02:00
kervala
42021fb7b4 Fixed: Interface stalled when adding new profile, see #279
--HG--
branch : develop
2016-09-21 17:19:00 +02:00
kervala
dcec9eeee6 Merge with develop
--HG--
branch : compatibility-develop
2016-09-21 15:52:53 +02:00
kervala
7cf531c1a3 Changed: Delete ryzom_installer_uninstalling_old_client when old client is uninstalled, see #279
--HG--
branch : develop
2016-09-21 15:49:18 +02:00
kervala
f1a9a44028 Fixed: Use translated size units, see #279
--HG--
branch : develop
2016-09-21 15:44:02 +02:00
kervala
f17e0c2dc1 Changed: Moved CCOMHelper to utils.h/cpp, see #279
--HG--
branch : develop
2016-09-21 15:21:26 +02:00
kervala
1e474e9ebd Fixed: Unable to create shortcuts, see #279
--HG--
branch : develop
2016-09-21 15:20:56 +02:00
kervala
91221fd4ce Fixed: Wrong French translation (copy-paste...), see #279
--HG--
branch : develop
2016-09-21 15:19:22 +02:00
kervala
6a7f4083f3 Changed: Moved SSL certificate to gamedev
--HG--
branch : compatibility-develop
2016-09-21 12:46:04 +02:00
kervala
54134899f3 Merge with develop
--HG--
branch : compatibility-develop
2016-09-21 10:04:04 +02:00
kervala
26997cfddf Fixed: Wrong path for PCH
--HG--
branch : develop
2016-09-21 10:03:39 +02:00
kervala
6b2c4a44b1 Merge with develop
--HG--
branch : compatibility-develop
2016-09-21 09:57:47 +02:00
kervala
dc8f74ba39 Fixed: Update client.cfg after it's copied, see #279
--HG--
branch : develop
2016-09-21 09:56:16 +02:00
kervala
4acc2afd3a Changed: Move windows and dialog to foreground, see #279
--HG--
branch : develop
2016-09-21 09:55:49 +02:00
kervala
af26339d00 Fixed: Minor problems in French translations, see #279
--HG--
branch : develop
2016-09-21 09:55:04 +02:00
kervala
cd20d2e486 Fixed: Conflicts with member variables, see #279
--HG--
branch : develop
2016-09-21 09:54:31 +02:00
kervala
933bda5fbb Removed: Useless files
--HG--
branch : develop
2016-09-21 09:51:25 +02:00
kervala
3790fa413e Changed: Reorganize Ryzom Configuration structure
--HG--
branch : develop
2016-09-21 09:50:59 +02:00
kervala
ce3cb3efa4 Merge with develop
--HG--
branch : compatibility-develop
2016-09-20 21:59:11 +02:00
kervala
a8ca0de9f8 Changed: Fix some files not deleted, see #279
--HG--
branch : develop
2016-09-20 21:57:41 +02:00
kervala
2de0cd6e25 Changed: Use 7z extension for 7z files, see #279
--HG--
branch : develop
2016-09-20 21:57:11 +02:00
kervala
d1a2f27414 Changed: Reenable Debug menus in Debug, see #279
--HG--
branch : develop
2016-09-20 21:41:05 +02:00
kervala
dc2dad8c77 Changed: Removed extraneous spaces
--HG--
branch : develop
2016-09-20 21:40:17 +02:00
kervala
d95aa50bdf Merge with develop
--HG--
branch : compatibility-develop
2016-09-20 18:36:02 +02:00
kervala
e4d3407be5 Changed: Fix the temporary directory, see #279
--HG--
branch : develop
2016-09-20 18:35:31 +02:00
kervala
271999e98f Changed: Use a temporary file to check if we're uninstalling old client, see #279
--HG--
branch : develop
2016-09-20 18:34:59 +02:00
kervala
e3576787ed Merge with develop
--HG--
branch : compatibility-develop
2016-09-20 17:51:27 +02:00
kervala
afb07586d3 Changed: Delete previously copied Ryzom Installer from TEMP directory, see #279
--HG--
branch : develop
2016-09-20 17:43:08 +02:00
kervala
b4f1f0868c Changed: Launch upgrade script from 7z or ZIP archives if present, see #279
--HG--
branch : develop
2016-09-20 17:40:14 +02:00
kervala
d2e3a795d8 Changed: Create or update client.cfg, see #279
--HG--
branch : develop
2016-09-20 17:39:29 +02:00
kervala
172b506b1e Changed: Best estimation for uncompressed data size, see #279
--HG--
branch : develop
2016-09-20 17:38:22 +02:00
kervala
122066e7ee Changed: Use default Qt translations from QRC
--HG--
branch : develop
2016-09-20 17:37:02 +02:00
kervala
47654fcd9a Changed: Use 7z files for clients too, see #279
--HG--
branch : develop
2016-09-19 17:51:12 +02:00
kervala
0037b40751 Merge with develop
--HG--
branch : compatibility-develop
2016-09-19 14:52:47 +02:00
kervala
7b4ab5efa7 Changed: Call setUninstallingOldClient before, see #279
--HG--
branch : develop
2016-09-19 14:35:29 +02:00
kervala
cba648fa5a Merge with develop
--HG--
branch : compatibility-develop
2016-09-18 16:35:01 +02:00
kervala
5b5925f529 Fixed: Compilation without PCH
--HG--
branch : develop
2016-09-18 16:34:28 +02:00
kervala
6d4b9b5235 Merge with develop
--HG--
branch : compatibility-develop
2016-09-16 19:25:17 +02:00
kervala
7422334e97 Changed: Only call CoUninitialize if CoInitialize(Ex) succeeded
--HG--
branch : develop
2016-09-16 19:24:43 +02:00
kervala
914cb6af64 Merge with develop
--HG--
branch : compatibility-develop
2016-09-16 19:00:32 +02:00
kervala
98ed4382d0 Changed: Other translations placeholder, see #279
--HG--
branch : develop
2016-09-16 18:59:52 +02:00
kervala
e24e1c5957 Changed: French translations, see #279
--HG--
branch : develop
2016-09-16 18:59:22 +02:00
kervala
b214ed3d7c Changed: Put source location in .TS files, see #279
--HG--
branch : develop
2016-09-16 18:58:57 +02:00
kervala
3bf24e05f1 Changed: Improved English texts (thanks to Cerulean!), see #279
--HG--
branch : develop
2016-09-16 18:58:33 +02:00
kervala
0dc4e37194 Changed: Don't need English translation anymore, see #279
--HG--
branch : develop
2016-09-15 18:07:34 +02:00
kervala
0e3320554a Merge with develop
--HG--
branch : compatibility-develop
2016-09-14 08:18:14 +02:00
kervala
ba5574624a Fixed: Don't restart Installer if in Debug, see #279
--HG--
branch : develop
2016-09-14 08:16:00 +02:00
kervala
cf5a1a5a85 Fixed: Browse buttons were freezing the application, see #279
--HG--
branch : develop
2016-09-14 08:15:31 +02:00
kervala
75d3db65e8 Fixed: Only ask once if user want to uninstall Ryzom, see #279
--HG--
branch : develop
2016-09-14 08:14:56 +02:00
kervala
7191bf1b41 Changed: Disable Settings and Uninstall menus (only there for debugging purposes), see #279
--HG--
branch : develop
2016-09-14 08:14:34 +02:00
kervala
742f8ab2e4 Changed: Disable button if executable not found, see #279
--HG--
branch : develop
2016-09-14 08:14:00 +02:00
kervala
fb934818a7 Fixed: Only ask once if user want to uninstall Ryzom, see #279
--HG--
branch : develop
2016-09-14 08:13:20 +02:00
kervala
5050a2bfa0 Fixed: Infinite loop when clicking on OK in profiles dialog, see #279
--HG--
branch : develop
2016-09-14 08:12:49 +02:00
kervala
bf5d8a366a Merge with develop
--HG--
branch : compatibility-develop
2016-09-10 19:40:40 +02:00
kervala
dca429c0b5 Fixed: Don't put downloaded files in quarantine under OS X
--HG--
branch : develop
2016-09-10 19:39:36 +02:00
kervala
fc202e4034 Changed: Minor change
--HG--
branch : develop
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
52c150f067 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-09-08 17:38:31 +02:00
kervala
904e17475e Merge with develop
--HG--
branch : compatibility-develop
2016-09-03 10:15:39 +02:00
kervala
243f9bc9bd Changed: Wrong filename for packed sheets BNP, see #279
--HG--
branch : develop
2016-09-03 10:14:48 +02:00
kervala
508b5fdd24 Changed: QDir.cd already checks if directory exists, see #279
--HG--
branch : develop
2016-09-03 10:14:06 +02:00
kervala
400c17826e Changed: Added getGroundZ to develop branch too
--HG--
branch : develop
2016-09-03 10:05:56 +02:00
Nimetu
5848afcc6d Changed: Added mp3 player playlist translation
--HG--
branch : compatibility-develop
2016-08-30 21:31:53 +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
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
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
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
Nimetu
b08fa15377 Merge with develop
--HG--
branch : compatibility-develop
2016-08-25 22:18:35 +03:00
Nimetu
b6c03d5df8 Fixed: Save mp3 player volume to icfg
--HG--
branch : develop
2016-08-25 22:14:58 +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
ulukyn
243bed54ec Added: New getGroundZ lua function
--HG--
branch : compatibility-develop
2016-08-25 18:54:35 +02:00
kervala
f843974930 Merge with develop
--HG--
branch : compatibility-develop
2016-08-16 18:27:42 +02:00
kervala
7e1f006647 Changed: Relaunch Installer when installed/migrated, see #279
--HG--
branch : develop
2016-08-16 18:27:00 +02:00
kervala
e6f33e71c9 Merge with develop
--HG--
branch : compatibility-develop
2016-08-14 13:36:44 +02:00
kervala
373654ea46 Changed: Rerun installer from TEMP under Windows, see #279
--HG--
branch : develop
2016-08-14 13:35:46 +02:00
kervala
2bc1e26868 Changed: Check modification time of Installer to determine if it must be copied again, see #279
--HG--
branch : develop
2016-08-14 13:29:27 +02:00
kervala
78efe0a895 Changed: Try to load config file everytime, see #279
--HG--
branch : develop
2016-08-14 13:28:50 +02:00
kervala
bb58710623 Added: CProfile and CServer classes have their own sources, see #279
--HG--
branch : develop
2016-08-14 13:26:45 +02:00
kervala
0f587c079d Fixed: Save config after choosing if we should uninstall previous version, see #279
--HG--
branch : develop
2016-08-14 12:52:22 +02:00
kervala
378ae6ecbb Fixed: Missing Q_OBJECT, see #279
--HG--
branch : develop
2016-08-14 12:50:29 +02:00
kervala
fbd2c86629 Changed: Computes size of downloaded files, see #279
--HG--
branch : develop
2016-08-14 12:50:11 +02:00
kervala
29caab3ae7 Changed: Always copy installer if different, see #279
--HG--
branch : develop
2016-08-14 12:49:39 +02:00
kervala
4e70717251 Fixed: Wrong name of packed sheets BNP, see #279
--HG--
branch : develop
2016-08-14 12:48:33 +02:00
kervala
7ee609ae85 Changed: Allow to get size of a directory recursively or not, see #279
--HG--
branch : develop
2016-08-14 12:47:56 +02:00
kervala
c2b11fc1f7 Changed: Only enable Atys at first
--HG--
branch : compatibility-develop
2016-08-13 15:53:49 +02:00
kervala
13f862c8aa Merge with develop
--HG--
branch : compatibility-develop
2016-08-10 15:46:13 +02:00
kervala
8580daa0a1 Changed: Minor changes
--HG--
branch : develop
2016-08-10 15:45:37 +02:00
kervala
2c6bbb7124 Fixed: Wrong variable names
--HG--
branch : develop
2016-08-10 15:45:28 +02:00
Vinicius Arroyo
b9bc6e91bd fixes wrong initialization of max number of objects and npc spaws in egs
--HG--
branch : viniciusarroyo/fixes-wrong-initialization-of-max-number-1470835250351
2016-08-10 13:23:35 +00:00
kervala
96f7cd9f59 Merge with develop
--HG--
branch : compatibility-develop
2016-08-06 20:12:39 +02:00
kervala
a25697fbda Changed: Create a backup if version of default config is incremented, see #279
--HG--
branch : develop
2016-08-06 20:11:48 +02:00
kervala
ca02500271 Changed: Minor changes, see #279
--HG--
branch : develop
2016-08-06 20:11:15 +02:00
kervala
fd861467b6 Changed: Display directories in Settings, see #279
--HG--
branch : develop
2016-08-06 20:10:31 +02:00
kervala
388cb6445a Fixed: Include initguid.h to avoid linking against dxguid.lib
--HG--
branch : develop
2016-08-06 20:09:40 +02:00
kervala
e150d7234f Added: Translations for Ryzom Installer, see #279
--HG--
branch : develop
2016-08-06 20:05:02 +02:00
kervala
166acdf69c Merge with develop
--HG--
branch : compatibility-develop
2016-07-27 12:49:01 +02:00