Commit graph

2033 commits

Author SHA1 Message Date
kervala
32efe50809 Merge with develop 2015-04-25 19:49:15 +02:00
kervala
0d0023ddaa Comment translation 2015-04-25 19:17:58 +02:00
kervala
34999ce0db Save space in debug screen to display VPB and VPC 2015-04-25 19:16:06 +02:00
kervala
0a20a6b7a1 Removed dependency on libwww 2015-04-25 12:53:52 +02:00
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
kaetemi
ae1de68f3b Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:50:58 +01:00
dfighter1985
3be42babfe Oups 2015-02-20 02:56:22 +01:00
dfighter1985
7e2e2ae56b Oups 2015-02-20 02:56:22 +01:00
dfighter1985
85fe754bf2 CMsgBoxDisplayer should not present a dialog now, but write the report to a file then attempt to launch the error reporter application. Which ofc doesn't exist yet in this commit. 2015-02-17 03:12:26 +01:00
dfighter1985
cc52abcfa0 CMsgBoxDisplayer should not present a dialog now, but write the report to a file then attempt to launch the error reporter application. Which ofc doesn't exist yet in this commit. 2015-02-17 03:12:26 +01:00
kervala
d51558e8dd Merge with hotfix 2015-02-15 09:54:55 +01:00
kervala
03a3a6bd3a Merge with hotfix 2015-02-15 09:54:31 +01:00
kervala
d5b620391e Fixed: Wrong include guard for admin_modules PCH 2015-02-15 09:53:56 +01:00
kervala
9718f37ec4 Merge with hotfix 2015-02-14 19:29:36 +01:00
kervala
8de4929777 Merge with hotfix 2015-02-14 17:54:50 +01:00
kervala
f07c2f51b8 Fixed: Warning multichars 2015-02-14 17:54:05 +01:00
kervala
da7b88f052 Fixed: Warning assert always false 2015-02-14 17:47:55 +01:00
kervala
8e343db0fa Fixed: Warning comparing an enum to an int 2015-02-14 17:47:10 +01:00
kervala
8f04f658a4 Merge with hotfix 2015-02-14 16:07:04 +01:00
kervala
d228343d46 Merge with hotfix 2015-02-14 16:06:43 +01:00
kervala
c5ee1f3d95 Fixed: Compilation 2015-02-14 16:05:45 +01:00
kervala
9feac65c07 Merge with hotfix 2015-02-14 15:44:11 +01:00
kervala
eb3693229f Merge with hotfix 2015-02-14 15:43:40 +01:00
kervala
b023af51cf Added: PCH for admin_modules 2015-02-14 15:43:05 +01:00
kervala
33bfd6c72a Merge with hotfix 2015-02-14 15:20:19 +01:00
kervala
68e56e02b2 Merge with hotfix 2015-02-14 15:19:49 +01:00
kervala
f3b38eed9b Changed: Improved User Agent management 2015-02-14 15:18:53 +01:00
kervala
abc6a50c2d Changed: Added RYZOM_COMPATIBILITY_VERSION version string for compatibility branch 2015-02-14 15:09:18 +01:00
kervala
b2d7194606 Merge with develop 2015-02-14 14:36:37 +01:00
kervala
2dc4804c22 Merge with hotfix 2015-02-14 14:32:44 +01:00
kervala
5221bf199c Merge with hotfix 2015-02-14 14:31:19 +01:00
kervala
eca33bfb95 Changed: Minor changes 2015-02-14 13:34:45 +01:00
kervala
491613e7fa Changed: Use Ryzom user agent for CURL 2015-02-14 13:19:53 +01:00
kervala
d478bf56a3 Fixed: Missing namespace 2015-02-14 13:19:09 +01:00
kervala
5b1926aeb4 Changed: std::string already initialized to en empty string 2015-02-14 13:18:51 +01:00
kervala
b6637fa6fe Changed: Used INVALID_AI_INSTANCE in CUsedContinent::getInstanceForContinent 2015-02-14 13:03:27 +01:00
kervala
bb5dc2c471 Changed: Possible bug if string not found 2015-02-14 12:54:17 +01:00
kervala
df3cdfab70 Fixed: Unable to patch when Ryzom was located on a mounted FS 2015-02-14 12:52:57 +01:00
kervala
72a50960cb Changed: Used PCH for admin_modules 2015-02-14 12:48:29 +01:00
kervala
a6cd459f33 Changed: Check getSpawn() before calling its methods 2015-02-14 12:47:54 +01:00
kervala
a5d69a78d7 Changed: Minor changes 2015-02-14 12:47:03 +01:00
kervala
65fb1bc8c1 Changed: Replaced atof by NLMISC::fromString 2015-02-14 12:43:29 +01:00
kervala
1ce011be38 Fixed: Compilation warnings 2015-02-14 12:41:59 +01:00
dfighter1985
688ea1285c Merged hotfix to compatibility. 2015-02-02 02:53:15 +01:00
kervala
9981f07921 Fixed: Guilds with same characters and not same spaces 2015-01-21 13:20:56 +01:00
Nimetu
44663f0a6c Include chat message channel/type to chatlog file 2015-01-15 20:08:28 +02:00
kervala
1c543641c9 Fixed: Compilation 2015-01-13 20:35:34 +01:00
kervala
1675e7af3a Changed: Replaced atoi and atof by NLMISC::fromString 2015-01-13 19:47:14 +01:00
kervala
ef645e5421 Fixed: Compilation 2015-01-13 15:15:07 +01:00
kervala
d52a60b837 Fixed: Compilation 2015-01-13 15:08:13 +01:00
kervala
d6a2af6abd Changed: Minor changes 2015-01-13 14:11:07 +01:00
kervala
7987db85ca Changed: Replaced ~0 by corresponding std::numeric_limits<T>::max() 2015-01-13 13:47:19 +01:00
kervala
9dfc7944d7 Changed: Fixed a wrong copy-paste 2015-01-11 18:27:06 +01:00
kervala
b8b68c4ec1 Changed: Use defined directories prefixed by a default directory 2015-01-11 18:01:32 +01:00
kervala
9891de01ce Changed: Allow to use a readable and writable data path for IG patch (usefull when data are read only) 2015-01-11 15:06:02 +01:00
kervala
c90a3049c4 Changed: Append getAppBundlePath() to search paths under OS X 2015-01-11 14:59:15 +01:00
kervala
ef405c2f87 Changed: Don't use replaceApplicationDirToken anymore 2015-01-11 14:57:40 +01:00
kervala
223de1a1a4 Merge 2015-01-10 19:08:55 +01:00
kervala
ba6cbc76c9 Changed: Minor changes 2015-01-10 18:45:14 +01:00
Nimetu
e2517b8ebc Fix html submit button value that is included with form data (issue #226) 2015-01-09 13:11:20 +02:00
kervala
751d6de2eb Changed: Check for string length 2014-12-26 13:44:35 +01:00
kervala
a728ae6b36 Changed: Allow to enable UAC for Windows client 2014-12-26 13:44:03 +01:00
kervala
bdfa7a624e Changed: Minor changes 2014-12-26 13:38:02 +01:00
kervala
fe9e52931d Changed: Minor changes 2014-12-26 13:12:56 +01:00
kaetemi
5190cbf8ff Merge with hotfix 2014-12-22 16:40:12 +01:00
kaetemi
566a5b6e86 Fix mirror type sizes 2014-12-22 16:39:54 +01:00
kaetemi
6d16be808f Merge with default 2014-12-22 14:26:26 +01:00
kaetemi
bbaaa522cd Merge with default 2014-12-22 14:24:13 +01:00
kaetemi
c522248f2d ryzomcore/v0.11.2 2014-12-22 14:21:01 +01:00
kaetemi
7af4bb69d4 Move to feature-light_cycle: c5207e1f862a 2014-12-22 14:10:37 +01:00
kaetemi
936276f789 Backed out changeset: 3694176c26bf 2014-12-22 14:08:54 +01:00
kaetemi
00156b1d59 Override sun direction from sky dome [breaks packed sheets] 2014-12-12 21:17:13 +01:00
kaetemi
f7ad6e1a94 Allow different light cycle for different continents [breaks packed sheets] 2014-12-12 01:22:19 +01:00
kaetemi
a4f5c03293 Fix choppy sky animation 2014-12-12 01:22:18 +01:00
kaetemi
972611e5c0 Separate version string 2014-11-24 16:07:17 +01:00
kaetemi
39bb02454f Adjust version 2014-11-24 15:04:53 +01:00
kaetemi
c5453625b2 Merge with ryzomcore/v0.11.1 2014-11-24 15:03:07 +01:00
kaetemi
1a5f3a2875 ryzomcore/v0.11.1 2014-11-24 14:57:36 +01:00
kaetemi
899c0c441e Fix #218 erratic mouse behaviour 2014-11-24 14:53:28 +01:00
kaetemi
1704fc9853 Merge with ryzomcore/v0.11.0 2014-11-10 23:47:23 +01:00
kaetemi
6d6926a8b8 ryzomcore/v0.11.0 2014-11-10 23:34:41 +01:00
kaetemi
aee9f17acb Fix patchman scripts 2014-11-07 19:32:18 +01:00
kaetemi
feeccbdea8 Update default path 2014-11-07 19:21:05 +01:00
kaetemi
0e119941b6 Update default patchman cfg 2014-11-07 19:16:45 +01:00
kaetemi
6245a68f76 Change patchman example domain 2014-11-07 19:02:50 +01:00
kaetemi
2eabeb234e File name, fix #202 2014-09-13 10:08:44 +02:00
kaetemi
13cddfe2c7 Backed out changeset: eae58a811aa5 2014-09-12 11:20:36 +02:00
kaetemi
7e7e15ebb6 Backed out changeset: cd8e80e4b0d6 2014-09-12 11:19:33 +02:00
kaetemi
1cd4afa1b6 Merge with ryzomcore/v0.10.0 2014-09-12 11:19:09 +02:00
kaetemi
be7a55f19a Replace some hardcoded urls 2014-09-12 10:49:40 +02:00
kaetemi
6c0125086c Remove hardcoded urls 2014-09-12 10:42:42 +02:00
kaetemi
c0b5876e45 Remove dead code (CCharacterAchievements, CKnownBrickInfo) 2014-09-12 08:35:49 +02:00
kaetemi
0222ebd096 Regenerate PLR cpp and header 2014-09-11 17:40:53 +02:00
kaetemi
3cd9e658a8 Add missing leaf 2014-09-11 15:13:17 +02:00
kaetemi
5391aaf75c Remove dead code 2014-09-11 12:12:17 +02:00
nimetu
18c5c4df06 Fix #161 fix craft success rate display on client 2014-09-10 15:40:32 +02:00
nimetu
2f78b7dd68 Fix #143 /muteUniverse on dyn universe channels 2014-09-10 15:38:57 +02:00
kaetemi
9e948bbf60 Move islands entry points to data 2014-09-10 08:25:45 +02:00
kaetemi
3f9e5e5d03 Remove unused mirror dataset 2014-09-10 08:18:05 +02:00
kaetemi
3251199ef1 Use correct AES cfg 2014-09-09 18:58:05 +02:00
kaetemi
aa97b11910 Crashfix 2014-09-09 15:50:12 +02:00