Commit graph

5664 commits

Author SHA1 Message Date
kervala
5afda00594 Merge
--HG--
branch : develop
2015-12-13 20:35:21 +01:00
kervala
dcd5b3b325 Merge
--HG--
branch : compatibility-develop
2015-12-13 20:34:16 +01:00
kervala
0ff606bfe2 Merge with develop
--HG--
branch : compatibility-develop
2015-12-13 20:32:17 +01:00
kervala
7977ef5903 Changed: Minor changes
--HG--
branch : develop
2015-12-13 20:23:58 +01:00
kervala
8b9098b5d5 Fixed: Wrong copyFile and moveFile syntax
--HG--
branch : develop
2015-12-13 20:23:08 +01:00
Nimetu
5ddc59f696 Added: Translation for 12-hour clock options
--HG--
branch : compatibility-develop
2015-12-13 21:08:22 +02:00
Nimetu
6746f163bd Merge with develop
--HG--
branch : compatibility-develop
2015-12-13 21:04:37 +02:00
Nimetu
0f34e0ea91 Changed: Attach dyn chat to main chat as default.
--HG--
branch : develop
2015-12-13 21:02:25 +02:00
Nimetu
a64709552c Added: 12-hour clock in radar and chat
--HG--
branch : develop
2015-12-13 21:01:56 +02:00
Nimetu
3895644589 Changed: Display inventory bulk with two decimal places
--HG--
branch : develop
2015-12-13 21:01:13 +02:00
kervala
74f297f588 Merge with develop
--HG--
branch : compatibility-develop
2015-12-13 15:26:37 +01:00
kervala
8aff509f0f Fixed: Clang warnings
--HG--
branch : develop
2015-12-13 15:25:28 +01:00
kervala
15aed08533 Fixed: Removed unneeded operator for CSString (compilation fails with VC++ 2010 without STLport)
--HG--
branch : develop
2015-12-13 14:21:20 +01:00
kervala
57f711a41a Fixed: New LZMA syntax under Linux
--HG--
branch : develop
2015-12-13 13:19:55 +01:00
kervala
f87218e7e3 Changed: Real executable name for client_config_qt
--HG--
branch : develop
2015-12-13 13:11:02 +01:00
kervala
9d30c279e0 Fixed: Compilation of some tools with Qt 5 in static
--HG--
branch : develop
2015-12-13 13:09:25 +01:00
kervala
7ebe3088bb Fixed: Compile crash_report and ryzom_configuration if WITH_RYZOM_CLIENT is set
--HG--
branch : develop
2015-12-13 13:06:23 +01:00
kervala
fc951a24ce Fixed: Homogenize CFile::moveFile with other methods (use std::string instead of const char*)
--HG--
branch : develop
2015-12-13 13:03:16 +01:00
kervala
40d1e3407b Merge with develop
--HG--
branch : compatibility-develop
2015-12-12 15:02:07 +01:00
kervala
3baeced8c6 Fixed: Typos again
--HG--
branch : develop
2015-12-12 15:01:36 +01:00
kervala
7c37cce41e Merge with develop
--HG--
branch : compatibility-develop
2015-12-12 14:35:05 +01:00
kervala
0e62130d99 Fixed: Typo
--HG--
branch : develop
2015-12-12 14:32:08 +01:00
kervala
6e30322aba Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-12 12:16:33 +01:00
kervala
341ab98894 Merge with develop
--HG--
branch : compatibility-develop
2015-12-12 11:33:59 +01:00
kervala
fcb0963888 Fixed: Typo
--HG--
branch : develop
2015-12-12 11:26:55 +01:00
kervala
e66f15dba6 Changed: Added new variable DumpVisualSlotsIndex to choose if we need to dump all visual slots index in vs_index.txt
--HG--
branch : develop
2015-12-12 11:24:01 +01:00
kervala
c245155525 Changed: Install sheets_packer.cfg too
--HG--
branch : develop
2015-12-12 11:13:41 +01:00
kervala
e8f77eb967 Changed: Check for alternative directories
--HG--
branch : develop
2015-12-12 11:12:38 +01:00
kervala
fdbaab6a38 Changed: Don't need to write absolute directories in client_default.cfg, because everything must be relocatable
--HG--
branch : develop
2015-12-12 11:07:00 +01:00
kervala
6f031728f5 Merge with develop
--HG--
branch : compatibility-develop
2015-12-11 20:21:56 +01:00
kervala
a1a557dd1b Changed: Sort dictionary keys
--HG--
branch : develop
2015-12-11 20:21:17 +01:00
kervala
977103f9d0 Fixed: OS X uses .dylib extension instead of .so
--HG--
branch : develop
2015-12-11 20:19:10 +01:00
kervala
a75ebeffa7 Changed: Append _dev to client if compiling without FINAL_VERSION (like Nevrax did)
--HG--
branch : develop
2015-12-11 20:16:06 +01:00
kervala
f90a29004c Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-10 18:14:45 +01:00
Nimetu
5c6e2109c4 Merge with develop
--HG--
branch : compatibility-develop
2015-12-10 10:56:53 +02:00
Nimetu
dceb45e373 Fixed: Keyboard capture not reset when clicking outside GUI.
--HG--
branch : develop
2015-12-10 10:56:03 +02:00
kervala
8cbb4743e7 Merge with develop
--HG--
branch : compatibility-develop
2015-12-09 23:23:59 +01:00
Cédric OCHS
e1d24451b0 Merged in zerotacg/ryzomcore/feature-travis-ci (pull request #129)
Feature: travis-ci

--HG--
branch : develop
2015-12-09 23:22:17 +01:00
kervala
f0d76f7ea1 Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-09 22:41:58 +01:00
kervala
58506f462c Changed: Use english links for spanish and russian
--HG--
branch : compatibility-develop
2015-12-09 22:18:48 +01:00
Tobias Peters
c485f6b8b4 Merged github:zerotacg/ryzomcore/feature/travis-ci
--HG--
branch : feature-travis-ci
2015-12-09 08:10:27 +01:00
Tobias Peters
5ddf333954 Merged github:zerotacg/ryzomcore/feature/travis-ci
--HG--
branch : feature-travis-ci
2015-12-08 22:39:33 +01:00
Nimetu
5fc50473f7 Merge with develop
--HG--
branch : compatibility-develop
2015-12-08 21:54:21 +02:00
Nimetu
612125a243 Added: Size attributes to img (width, height, max-width, max-height)
--HG--
branch : develop
2015-12-08 21:53:54 +02:00
kervala
b0b7e64936 Merge with develop
--HG--
branch : compatibility-develop
2015-12-08 17:50:01 +01:00
kervala
1d00f974b6 Fixed: ryzom_client_patcher compilation
--HG--
branch : develop
2015-12-08 17:49:23 +01:00
Cédric OCHS
44a5ff53a5 Merged in zerotacg/ryzomcore/issue-remove-duplicated-ignores (pull request #128)
removed duplicated ignores

--HG--
branch : develop
2015-12-08 17:35:55 +01:00
Tobias Peters
7f955239b0 removed duplicated ignores
--HG--
branch : issue-remove-duplicated-ignores
2015-12-08 17:20:38 +01:00
kervala
b46dfe178f Merge with develop
--HG--
branch : compatibility-develop
2015-12-08 14:33:49 +01:00
kervala
76a8904e9a Fixed: Compilation under OS X
--HG--
branch : develop
2015-12-08 14:33:09 +01:00