Commit graph

5558 commits

Author SHA1 Message Date
Nimetu
fbd70a924f Merge with develop 2015-12-13 21:04:37 +02:00
Nimetu
8fe317727b Changed: Attach dyn chat to main chat as default. 2015-12-13 21:02:25 +02:00
Nimetu
02b5c3e4ed Added: 12-hour clock in radar and chat 2015-12-13 21:01:56 +02:00
Nimetu
e98bc5daee Changed: Display inventory bulk with two decimal places 2015-12-13 21:01:13 +02:00
kervala
c938092faf Merge with develop 2015-12-13 15:26:37 +01:00
kervala
542c29ded7 Fixed: Clang warnings 2015-12-13 15:25:28 +01:00
kervala
ae5457d717 Fixed: Removed unneeded operator for CSString (compilation fails with VC++ 2010 without STLport) 2015-12-13 14:21:20 +01:00
kervala
0bfc783142 Fixed: New LZMA syntax under Linux 2015-12-13 13:19:55 +01:00
kervala
fd3e147574 Changed: Real executable name for client_config_qt 2015-12-13 13:11:02 +01:00
kervala
c744716973 Fixed: Compilation of some tools with Qt 5 in static 2015-12-13 13:09:25 +01:00
kervala
451823bda9 Fixed: Compile crash_report and ryzom_configuration if WITH_RYZOM_CLIENT is set 2015-12-13 13:06:23 +01:00
kervala
bf73907da1 Fixed: Homogenize CFile::moveFile with other methods (use std::string instead of const char*) 2015-12-13 13:03:16 +01:00
kervala
b6310c8c26 Merge with develop 2015-12-12 15:02:07 +01:00
kervala
4c122318f4 Fixed: Typos again 2015-12-12 15:01:36 +01:00
kervala
b6969005e6 Merge with develop 2015-12-12 14:35:05 +01:00
kervala
3bbf7cb564 Fixed: Typo 2015-12-12 14:32:08 +01:00
kervala
67e968705d Changed: Updated translations 2015-12-12 12:16:33 +01:00
kervala
e3076519a4 Merge with develop 2015-12-12 11:33:59 +01:00
kervala
a276481492 Fixed: Typo 2015-12-12 11:26:55 +01:00
kervala
a2d32e684a Changed: Added new variable DumpVisualSlotsIndex to choose if we need to dump all visual slots index in vs_index.txt 2015-12-12 11:24:01 +01:00
kervala
17bf199157 Changed: Install sheets_packer.cfg too 2015-12-12 11:13:41 +01:00
kervala
728eecc08b Changed: Check for alternative directories 2015-12-12 11:12:38 +01:00
kervala
7e6f04c343 Changed: Don't need to write absolute directories in client_default.cfg, because everything must be relocatable 2015-12-12 11:07:00 +01:00
kervala
c2fa7e4137 Merge with develop 2015-12-11 20:21:56 +01:00
kervala
0f9bd76e63 Changed: Sort dictionary keys 2015-12-11 20:21:17 +01:00
kervala
ab584867f5 Fixed: OS X uses .dylib extension instead of .so 2015-12-11 20:19:10 +01:00
kervala
82e835cd59 Changed: Append _dev to client if compiling without FINAL_VERSION (like Nevrax did) 2015-12-11 20:16:06 +01:00
kervala
a4453170e1 Changed: Updated translations 2015-12-10 18:14:45 +01:00
Nimetu
ed90e506d1 Merge with develop 2015-12-10 10:56:53 +02:00
Nimetu
a5ede6e08a Fixed: Keyboard capture not reset when clicking outside GUI. 2015-12-10 10:56:03 +02:00
kervala
7240621548 Merge with develop 2015-12-09 23:23:59 +01:00
Cédric OCHS
46cd6bbb8e Merged in zerotacg/ryzomcore/feature-travis-ci (pull request #129)
Feature: travis-ci
2015-12-09 23:22:17 +01:00
kervala
1843406354 Changed: Updated translations 2015-12-09 22:41:58 +01:00
kervala
78c623065f Changed: Use english links for spanish and russian 2015-12-09 22:18:48 +01:00
Tobias Peters
4896120720 Merged github:zerotacg/ryzomcore/feature/travis-ci 2015-12-09 08:10:27 +01:00
Tobias Peters
5c15372011 Merged github:zerotacg/ryzomcore/feature/travis-ci 2015-12-08 22:39:33 +01:00
Nimetu
228b15d24e Merge with develop 2015-12-08 21:54:21 +02:00
Nimetu
c13e885561 Added: Size attributes to img (width, height, max-width, max-height) 2015-12-08 21:53:54 +02:00
kervala
1cd9981139 Merge with develop 2015-12-08 17:50:01 +01:00
kervala
583035ff3d Fixed: ryzom_client_patcher compilation 2015-12-08 17:49:23 +01:00
Cédric OCHS
a72191840d Merged in zerotacg/ryzomcore/issue-remove-duplicated-ignores (pull request #128)
removed duplicated ignores
2015-12-08 17:35:55 +01:00
Tobias Peters
ad7cd9f23b removed duplicated ignores 2015-12-08 17:20:38 +01:00
kervala
741af6b5b8 Merge with develop 2015-12-08 14:33:49 +01:00
kervala
2052b19d85 Fixed: Compilation under OS X 2015-12-08 14:33:09 +01:00
kervala
6c54c82b0b Merge with develop 2015-12-07 21:49:21 +01:00
kervala
c4235f7b1e Changed: Let dependencies propagate to other targets 2015-12-07 21:48:32 +01:00
kervala
b162b85b3e Merge with develop 2015-12-07 19:38:26 +01:00
kervala
160650d556 Changed: Replace RYZOM_SHARE_PREFIX by getRyzomSharePrefix() 2015-12-07 19:37:50 +01:00
kervala
bd50af4a6c Fixed: Wrong copy-paste 2015-12-07 19:37:03 +01:00
kervala
5a8b6a7993 Merge with develop 2015-12-07 19:14:55 +01:00