Commit graph

7330 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
6ff893421d Changed: Specify Windows XP as minimum platform (we need that if using Windows 7 SDK with VC++ 2015)
--HG--
branch : develop
2016-10-21 16:47:46 +02:00
kervala
d8048eb352 Fixed: PCH after pull merge
--HG--
branch : develop
2016-10-21 16:10:03 +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
73e9806fe7 Changed: Return error message as an UTF-8 string
--HG--
branch : develop
2016-10-21 12:55:02 +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
209e8ba078 Merged in BWGaryP/ryzomcore (pull request #138)
Avoid empty "-D" on debug builds with Qt4.

--HG--
branch : develop
2016-10-21 06:19:15 +00: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
b2f5fed3bf Changed: Replace sscanf by fromString
--HG--
branch : develop
2016-10-20 12:34:38 +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
497c488166 Fixed: Wrong syntax for NL_I64
--HG--
branch : develop
2016-10-20 12:22:57 +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