Commit graph

1929 commits

Author SHA1 Message Date
kervala
4a90702d42 Merge with develop 2015-04-22 17:58:09 +02:00
Nimetu
7966725977 Add "select_shortcut_bar_2" action handler (issue 222) 2015-04-21 18:54:08 +03:00
kervala
1baab1ba2d Merge with develop 2015-04-20 13:38:51 +02:00
Nimetu
8d86495364 Fix compiling under windows 2015-04-20 01:04:52 +03:00
Nimetu
7e54d79be2 Use cURL as http transport 2015-04-17 17:41:01 +03:00
kaetemi
d77f0c0b42 Add extra light groups for better lightmap control 2015-04-16 17:39:47 +02:00
kaetemi
d0d8155e4e Merge with develop (ryzomcore/v0.12.0) 2015-04-14 11:57:40 +02:00
kaetemi
dc7e040d94 ryzomcore/v0.12.0 2015-04-14 11:55:08 +02:00
kervala
4896487f69 Merge with develop 2015-04-05 16:45:34 +02:00
kaetemi
84f9d64872 Fixes for VS2013, ref #236 2015-03-29 16:58:07 +02:00
kaetemi
0a2d358e31 Fix CHashCode compare operator 2015-03-29 16:58:07 +02:00
kervala
5238249e61 Merge with develop 2015-03-24 15:30:58 +01:00
kervala
ed2d2a06de Fixed compilation (setReportEmailFunction doesn't exist anymore) 2015-03-24 15:26:34 +01:00
kervala
ce0ec3b912 Changed: Minor changes 2015-03-07 17:51:12 +01:00
kervala
d51e2fb861 Merge with develop 2015-03-07 17:03:34 +01:00
kaetemi
e8d8503631 Merge ryzomcore/v0.11.3 2015-03-07 00:03:48 +01:00
kaetemi
42944adf1d Merge with hotfix 2015-03-07 00:01:02 +01:00
kaetemi
9363bdc478 EOL 2015-03-06 23:56:49 +01:00
kaetemi
8d854e3e8d ryzomcore/v0.11.3 2015-03-06 23:53:34 +01:00
kaetemi
eaf44707a7 Merge with hotfix 2015-03-06 23:40:48 +01:00
kaetemi
c5a40c2616 Merge with feature-crashreport+develop 2015-03-06 21:05:31 +01:00
kervala
5cc2b16c87 Fixed: Compilation 2015-03-03 18:59:23 +01:00
kervala
4a1e0b58e5 Fixed: Compilation with GCC 2015-03-02 23:51:23 +01:00
kervala
b34e10adb4 Changed: Use NLMISC::toString instead of itoa 2015-03-02 13:09:57 +01:00
kervala
ae2ee4e0f3 Changed: Use CFile::createEmptyFile() 2015-03-02 13:09:16 +01:00
kervala
06e443abbe Fix #229 missing include in tools sources 2015-03-02 13:08:42 +01:00
Nimetu
ba1052672f Fix compilation 2015-03-01 18:41:16 +02:00
kaetemi
04cca60cac Merge with develop 2015-02-24 17:19:27 +01:00
kaetemi
7fa28fba72 Add isWindowedApplication to INeLContext 2015-02-24 17:17:45 +01:00
kaetemi
5307229afa Merge with feature-crashreport 2015-02-24 11:41:05 +01:00
kaetemi
f0a6384fbb Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 13:16:50 +01:00
kaetemi
9eae8d81ec Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 13:13:11 +01:00
kaetemi
ff175a18cb Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 13:08:03 +01:00
kaetemi
e64791ce55 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:58:43 +01:00
kaetemi
881bf2354e Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:52:01 +01:00
kaetemi
fa91a85f55 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:48:41 +01:00
kaetemi
90b63768db Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 12:38:43 +01:00
kaetemi
05020d3b2a Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:37:51 +01:00
kaetemi
4cd6fad710 Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 12:28:13 +01:00
kaetemi
ebdc7ba16b Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:25:23 +01:00
Jan Boon
ae7ee163a0 Merged in nimetu/ryzomcore/issue-221 (pull request #100)
improve chatlog file (issue #221)
2015-02-22 11:01:08 +01:00
kaetemi
891011b74c Merge with hotfix 2015-02-22 10:39:02 +01:00
kaetemi
f7fb9b2f37 Merge with hotfix 2015-02-22 10:38:36 +01:00
dfighter1985
7b89f9914b Merged in hotfix (pull request #118)
Merge hotfix branch
2015-02-21 23:10:13 +01:00
dfighter1985
4b15d60ec0 Merged in hotfix (pull request #117)
Merge hotfix branch
2015-02-21 23:09:07 +01:00
dfighter1985
218b413bd0 Removed unused references to CMsgBoxDisplayer. 2015-02-21 22:34:02 +01:00
dfighter1985
98cc1f03f8 Removed unused references to CMsgBoxDisplayer. 2015-02-21 22:34:02 +01:00
kaetemi
28a4989c17 Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 18:10:06 +01:00
kaetemi
b8586b84ec Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:57:11 +01:00
kaetemi
a5ede54ded Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:53:39 +01:00