Commit graph

112 commits

Author SHA1 Message Date
kervala
f3147c7616 Merge with develop 2016-12-11 12:43:05 +01:00
kervala
486a5e4638 Merge with develop 2016-12-11 12:32:05 +01:00
kervala
dab3de7a74 Merge with develop 2016-12-10 19:52:43 +01:00
kervala
75e183e637 Backed out changeset: 6b7af3bc4752 2016-12-08 18:20:34 +01:00
kervala
52301431e4 Merge with develop 2016-12-06 20:29:22 +01:00
kervala
21f31f1827 Merge with develop 2016-12-05 19:53:15 +01:00
kervala
7036702324 Merge with develop 2016-12-05 14:06:48 +01:00
kervala
b61c9d4cf8 Merge with develop 2016-12-04 20:31:56 +01:00
kervala
c53133e7f2 Merge with develop 2016-12-04 19:19:15 +01:00
kervala
061bed6635 Merge with develop 2016-12-04 18:39:21 +01:00
kervala
18ca67b199 Merge with develop 2016-12-04 17:32:34 +01:00
C?dric OCHS
916f1b008b Merged in Glorf/ryzomcore/target_sheet (pull request #142)
Update target command
2016-12-04 12:43:36 +00:00
Guillaume Dupuy
54f128ad17 Use std::string instead of ucstring 2016-12-04 13:37:04 +01:00
Guillaume Dupuy
6f1197d633 Allow target to work with sheetName and a quiet option
HG : Enter commit message.  Lines beginning with 'HG:' are removed.
2016-11-28 00:54:33 +01:00
Nimetu
dcf8b9b77c Changed: Added translation 2016-11-26 15:24:27 +02:00
Nimetu
3ab4c7d714 Merge with develop 2016-11-26 15:24:24 +02:00
kervala
99ab8fba3e Merge with develop 2016-11-26 13:20:32 +01:00
kervala
4bf0e1b0d9 Merge with develop 2016-11-25 10:44:44 +01:00
kervala
b8c25f7df9 Merge with develop 2016-11-20 16:41:28 +01:00
kervala
4d96978674 Merge with develop 2016-11-20 14:51:11 +01:00
kervala
0504c52eeb Merge with develop 2016-11-13 16:53:35 +01:00
kervala
6a315be980 Merge with develop 2016-11-13 11:08:14 +01:00
kervala
4438ab108c Merge with develop 2016-11-07 14:12:11 +01:00
Nuno Gon?alves
e157a7453e Changed: Fix the way to load ryzhome lua/xml files 2016-11-07 13:53:41 +01:00
kervala
d865dc5a70 Merge with develop 2016-11-03 14:46:44 +01:00
kervala
9f434db97b Merge with develop 2016-10-31 19:03:04 +01:00
kervala
d4bbc683a7 Changed: Updated all translations in UTF-8 2016-10-31 19:02:29 +01:00
kervala
7a1a082135 Merge with develop 2016-10-30 16:52:02 +01:00
kervala
0cfd8cb35d Merge with develop 2016-10-27 16:48:45 +02:00
kervala
c9244568eb Merge with develop 2016-10-26 14:30:17 +02:00
kervala
956da7f9da Merge with develop 2016-10-25 17:41:54 +02:00
kervala
dc9c463483 Changed: Don't force PatchUrl in client_default.cfg 2016-10-25 14:10:25 +02:00
kervala
df676ede7e Merge with develop 2016-10-25 11:50:27 +02:00
kervala
c02ab44327 Changed: Minor change 2016-10-24 13:54:20 +02:00
kervala
627dea4a06 Merge with develop 2016-10-23 16:29:49 +02:00
kervala
bb9608bcea Merge with develop 2016-10-22 19:40:34 +02:00
kervala
14917f114f Merge with develop 2016-10-22 16:55:51 +02:00
kervala
2945dbf3b9 Merge with develop 2016-10-21 20:00:50 +02:00
kervala
c26056c53a Merge with develop 2016-10-21 19:04:29 +02:00
kervala
bf6f28ce43 Merge with develop 2016-10-21 16:54:50 +02:00
kervala
d078103453 Merge with develop 2016-10-21 16:50:04 +02:00
kervala
76c27c64f8 Merge with develop 2016-10-21 14:27:31 +02:00
C?dric OCHS
f1840fc189 Merged in Glorf/ryzomcore/fix_speed (pull request #141)
Displayed speed is now actual speed, fix #295
2016-10-21 06:15:56 +00:00
kervala
7e6c5c13bd Merge with develop 2016-10-20 17:46:58 +02:00
Guillaume Dupuy
c584bb34b6 Forgot one 0.0f initialisation 2016-10-20 16:04:47 +02:00
Guillaume Dupuy
3e9ee0954b Fix coding guidelines + double initialized as 0.0 2016-10-20 16:02:02 +02:00
kervala
f95d95bdc5 Merge with develop 2016-10-20 14:48:16 +02:00
kervala
52678ea899 Merge with develop 2016-10-20 13:55:34 +02:00
kervala
0111c69054 Merge with develop 2016-10-20 13:14:19 +02:00
kervala
c3bcfb42b8 Merge with develop 2016-10-20 13:08:48 +02:00