Commit graph

744 commits

Author SHA1 Message Date
kervala
4520020f3b Merge with develop 2016-01-05 17:12:29 +01:00
kervala
d46d1e45ad Merge with develop 2016-01-05 13:00:18 +01:00
kervala
e5a1249cb8 Merge with develop 2016-01-04 22:17:00 +01:00
kervala
b02956196d Merge with develop 2016-01-04 19:27:21 +01:00
kervala
477759217b Merge with develop 2016-01-04 16:15:03 +01:00
kervala
7de5594966 Merge with develop 2016-01-04 15:41:29 +01:00
kervala
a6694d122b Merge with develop 2016-01-04 14:03:11 +01:00
kervala
16d66c0dcc Merge with develop 2016-01-03 20:13:53 +01:00
kervala
d3d58ebe82 Merge with develop 2016-01-03 19:36:10 +01:00
kervala
f632b66274 Merge with develop 2016-01-03 19:18:32 +01:00
kervala
a046a06db3 Merge with develop 2016-01-03 18:16:07 +01:00
kervala
50b846d56c Merge with develop 2016-01-02 22:36:05 +01:00
kervala
7879ca7566 Merge with develop 2016-01-02 20:29:55 +01:00
kervala
1354d99609 Merge with develop 2016-01-02 17:11:59 +01:00
kervala
2d2c79a2b3 Merge with develop 2016-01-02 11:35:26 +01:00
kervala
83f8502b51 Merge with develop 2016-01-01 16:27:45 +01:00
kervala
7a44693ec2 Fixed: Replaced Mage and Magene (???) by Magicien and Magicienne 2015-12-30 10:12:27 +01:00
kervala
3b71e02577 Merge with develop 2015-12-30 00:46:50 +01:00
kervala
6611f6ef07 Merge with develop 2015-12-30 00:14:27 +01:00
kervala
e8c6fd67db Merge with develop 2015-12-30 00:10:51 +01:00
kervala
4f24898102 Merge with develop 2015-12-29 22:36:04 +01:00
kervala
1454a3bc67 Merge with develop 2015-12-29 18:03:21 +01:00
Nimetu
9fc64124f3 Merge with develop 2015-12-29 15:03:12 +02:00
kervala
965971a86d Merge with develop 2015-12-28 18:21:56 +01:00
kervala
de1519f50b Merge with develop 2015-12-28 16:44:35 +01:00
kervala
79df345ecc Changed: Updated translations 2015-12-28 10:32:15 +01:00
kervala
32ba03e3cc Merge with develop 2015-12-27 16:07:11 +01:00
kervala
cde1975f25 Merge with develop 2015-12-26 18:00:04 +01:00
kervala
ce91dc1cf8 Merge with develop 2015-12-26 15:13:08 +01:00
kervala
f66c15c5da Merge with develop 2015-12-26 14:38:37 +01:00
kervala
8dda998ea5 Merged with develop 2015-12-25 20:52:18 +01:00
kervala
e1ee398c0f Merge with develop 2015-12-25 18:02:13 +01:00
kervala
0a03d1c870 Merge with develop 2015-12-25 15:37:07 +01:00
kervala
2e43768bd0 Changed: Updated translations 2015-12-23 23:11:59 +01:00
kervala
d2676c3b57 Merge with develop 2015-12-23 15:31:37 +01:00
Nimetu
0f44e01d18 Merge with develop 2015-12-22 01:30:11 +02:00
kervala
5ffb6e3b89 Merge with develop 2015-12-21 18:20:39 +01:00
kervala
560a51136f Changed: Only copy installscript_osx.vdf for Steam client 2015-12-21 17:46:38 +01:00
kervala
c09d7e6884 Merge with develop 2015-12-21 17:39:49 +01:00
kervala
4308bda508 Merge with develop 2015-12-21 14:21:08 +01:00
kervala
c1ebe700aa Changed: Updated translations 2015-12-21 14:19:49 +01:00
kervala
2368805d2f Merge with develop 2015-12-20 19:26:36 +01:00
kervala
6c19bba957 Changed: Revert back PreDataPath directories 2015-12-20 18:56:23 +01:00
kervala
a7f0b854d2 Merge with develop 2015-12-20 11:21:40 +01:00
kervala
b789361919 Changed: Updated translations 2015-12-20 09:50:48 +01:00
Nimetu
03242fbc41 Merge with develop 2015-12-20 03:34:00 +02:00
Nimetu
2c94ec2e2d Merge with develop 2015-12-19 20:40:05 +02:00
kervala
031a1169ad Merge 2015-12-18 18:07:51 +01:00
kervala
fa19cb0f6d Merge with develop 2015-12-18 18:07:11 +01:00
kervala
2a2b50cab6 Changed: Updated translations 2015-12-18 18:06:28 +01:00
Nimetu
588d1ca8ce Merge with develop 2015-12-18 14:34:48 +02:00
kervala
5752e8a04b Changed: Updated translations 2015-12-18 13:02:31 +01:00
kervala
104010b201 Merge with develop 2015-12-17 14:37:24 +01:00
kervala
b8505bd7df Merge with develop 2015-12-17 13:04:56 +01:00
kervala
1d54c615f4 Changed: Updated translations 2015-12-17 08:51:45 +01:00
kervala
02942741e6 Merge with develop 2015-12-16 14:51:18 +01:00
kervala
5b4f4223c3 Merge with develop 2015-12-16 08:01:00 +01:00
kervala
335d0c00d6 Merge with develop 2015-12-16 00:07:51 +01:00
kervala
c91f9051e7 Changed: Updated translations 2015-12-15 23:16:49 +01:00
kervala
f496e379ff Merge with develop 2015-12-15 22:52:28 +01:00
kervala
58b2b69da5 Changed: Updated translations 2015-12-15 18:50:25 +01:00
kervala
8cc8e6bea0 Merge with develop 2015-12-15 18:46:51 +01:00
kervala
5f05b0db94 Merge with develop 2015-12-15 18:29:39 +01:00
kervala
47361e8d9b Changed: Updated translations 2015-12-15 15:18:11 +01:00
kervala
46b82be25e Merge with develop 2015-12-15 15:09:50 +01:00
Nimetu
56e4734e3d Added: Translation for uiRadarUseCamera option 2015-12-15 12:23:35 +02:00
Nimetu
752f45f25b Merge with develop 2015-12-15 12:27:11 +02:00
kervala
7ef20878fa Merge 2015-12-13 20:34:16 +01:00
kervala
22c9abadc7 Merge with develop 2015-12-13 20:32:17 +01:00
Nimetu
2285a4617e Added: Translation for 12-hour clock options 2015-12-13 21:08:22 +02:00
Nimetu
bf33ad683f Merge with develop 2015-12-13 21:04:37 +02:00
kervala
172e8ef65c Merge with develop 2015-12-13 15:26:37 +01:00
kervala
79ede72edd Merge with develop 2015-12-12 15:02:07 +01:00
kervala
35990215f6 Merge with develop 2015-12-12 14:35:05 +01:00
kervala
b654e1efc5 Changed: Updated translations 2015-12-12 12:16:33 +01:00
kervala
fbde617721 Merge with develop 2015-12-12 11:33:59 +01:00
kervala
e95f8ac5a3 Merge with develop 2015-12-11 20:21:56 +01:00
kervala
509dba9046 Changed: Updated translations 2015-12-10 18:14:45 +01:00
Nimetu
554dc94906 Merge with develop 2015-12-10 10:56:53 +02:00
kervala
3140e3640b Changed: Updated translations 2015-12-09 22:41:58 +01:00
kervala
cef4af281a Changed: Use english links for spanish and russian 2015-12-09 22:18:48 +01:00
Nimetu
4fee61660a Merge with develop 2015-12-08 21:54:21 +02:00
kervala
27da1e0e64 Merge with develop 2015-12-08 17:50:01 +01:00
kervala
708faee866 Merge with develop 2015-12-08 14:33:49 +01:00
kervala
78edb55cef Merge with develop 2015-12-07 21:49:21 +01:00
kervala
b7ed475b41 Merge with develop 2015-12-07 19:38:26 +01:00
kervala
2a6153235c Merge with develop 2015-12-07 19:14:55 +01:00
kervala
b89fcda4db Merge with develop 2015-12-07 13:09:07 +01:00
kervala
5231e60816 Changed: Updated translations 2015-12-07 08:42:57 +01:00
kervala
079ab7b757 Merge with develop 2015-12-06 19:46:40 +01:00
kervala
e1d0fca6e0 Merge with develop 2015-12-06 19:44:27 +01:00
kervala
482ec657ac Changed: Updated French translations 2015-12-06 19:11:21 +01:00
kervala
e6aa5562d6 Merge with develop 2015-12-06 16:56:53 +01:00
Nimetu
29e5b70825 Merge with develop 2015-12-06 16:38:52 +02:00
kervala
f81fc44305 Changed: Updated translations 2015-12-05 23:26:11 +01:00
kervala
c120568423 Merge with develop 2015-12-05 18:52:33 +01:00
kervala
beaad6d550 Changed: Updated translations 2015-12-04 17:00:43 +01:00
kervala
32938d5b15 Changed: Updated translations 2015-12-03 21:50:23 +01:00
kervala
1784e13ea3 Changed: Updated translations 2015-12-03 19:15:07 +01:00
Nimetu
f7ca1d3d14 Merge with develop 2015-12-03 18:33:27 +02:00
kervala
fd15804ee9 Merge with develop 2015-12-03 14:42:33 +01:00
kervala
1c2a0927b3 Merge with develop 2015-12-03 12:50:55 +01:00
kervala
3738d6b421 Changed: Updated translations 2015-12-03 12:25:20 +01:00
kervala
ff5930989e Changed: French translation 2015-12-02 23:08:29 +01:00
kervala
014c9af039 Changed: Updated translations 2015-12-02 20:44:34 +01:00
Nimetu
07ba14eddb Merge with develop 2015-12-02 20:38:11 +02:00
kervala
a456298812 Changed: New translations for Anisotropic Filtering 2015-12-02 19:34:17 +01:00
kervala
97c90bb567 Merge with develop 2015-12-02 19:28:44 +01:00
kervala
9c5a5639af Merge with develop 2015-12-02 09:22:19 +01:00
kervala
43f48c6215 Merge with develop 2015-12-01 15:59:53 +01:00
kervala
1a7293c697 Merge with develop 2015-11-30 14:20:16 +01:00
kervala
b19701dd78 Merge with develop 2015-11-30 12:26:23 +01:00
kervala
fc3643bee0 Merge with develop 2015-11-30 10:30:14 +01:00
kervala
56ab474832 Changed: Updated translations 2015-11-29 18:11:36 +01:00
kervala
dc7df29d2b Merge with develop 2015-11-29 17:55:33 +01:00
kervala
673a0bfaa0 Changed: Updated translations 2015-11-29 13:05:04 +01:00
kervala
2677c7a485 Changed: Updated translations 2015-11-27 19:55:40 +01:00
kervala
d851de880c Merge with develop 2015-11-27 19:38:15 +01:00
kervala
7079162492 Changed: Temporary disable NL_USES_DEFAULT_ARENA_OBJECT_ALLOCATOR for ITexture 2015-11-26 10:23:27 +01:00
kervala
fa38302b19 Changed: Updated translations 2015-11-26 10:21:30 +01:00
kervala
331959909a Merge with develop 2015-11-25 16:02:08 +01:00
kervala
b9e0d01c96 Merge with develop 2015-11-24 20:11:52 +01:00
kervala
0fdc6bdec0 Merge with develop 2015-11-24 19:02:37 +01:00
kervala
868b362c47 Changed: Updated translations 2015-11-24 19:00:13 +01:00
kervala
f90c4824e3 Added: Missing data from gamedev.bnp 2015-11-24 18:57:48 +01:00
kervala
81ab42f5e9 Changed: Updated translations 2015-11-24 10:47:54 +01:00
kervala
0f418dddbc Merge with develop 2015-11-24 10:13:18 +01:00
kervala
a2d1524b79 Merge with develop 2015-11-23 16:44:42 +01:00
kervala
4cff0cc54d Added: SSL certificate for secure.ryzom.com 2015-11-23 15:45:32 +01:00
kervala
bfe6a7735e Changed: Added spaces for EULA 2015-11-22 19:17:56 +01:00
kervala
3a85806b29 Merge with develop 2015-11-22 18:42:36 +01:00
kervala
8d394acd93 Fixed: All articles "l'" in French 2015-11-22 18:21:03 +01:00
kervala
bff3aada28 Changed: Updated translations 2015-11-22 18:09:46 +01:00
kervala
9ba694d30b Fixed: InstallStatsUrl points to a wrong URL but needs to be defined 2015-11-21 19:40:19 +01:00
kervala
b453d7d48a Merge with develop 2015-11-21 18:09:38 +01:00
kervala
48af5f85c1 Changed: Updated translations 2015-11-20 12:54:29 +01:00
kervala
d58d8e0a6a Changed: Improved alignment 2015-11-19 13:44:19 +01:00
kervala
8026a0cea9 Changed: Revert back LandscapeTileNear and LandscapeThreshold default values 2015-11-19 13:43:18 +01:00
kervala
3ecd12f21f Merge with develop 2015-11-15 18:33:50 +01:00
kervala
ae7767123b Merge with develop 2015-11-15 13:33:37 +01:00
kervala
70a06f7941 Changed: Updated translations 2015-11-15 13:08:08 +01:00
kervala
ea2eeaf167 Merge with develop 2015-11-15 12:59:01 +01:00
kervala
093728dcf9 Merge with develop 2015-11-14 19:29:43 +01:00
kervala
5acd91b8fc Merge with develop 2015-11-14 12:13:12 +01:00
kervala
88a5da82b7 Merge with develop 2015-11-13 19:52:35 +01:00
Nimetu
801335f682 Merge with develop 2015-11-12 23:48:57 +02:00
Nimetu
b0823a2bf3 Merge with develop 2015-11-12 20:15:28 +02:00
kervala
cdd85cbe57 Fixed: Bug with language in URLs 2015-11-11 16:40:42 +01:00
kervala
45fb738e8a Fixed: Wrong comparison 2015-11-09 12:48:07 +01:00
kervala
9e3db2029d Merge with develop 2015-11-09 12:47:24 +01:00
kervala
f03ad4b9cd Merge with develop 2015-11-09 10:48:04 +01:00
kervala
6409ccbe73 Changed: Frequency to 0 to enable automatic detection 2015-11-09 10:05:39 +01:00
kervala
2a2996079f Changed: Removed unused/invalid URLs and updated some of them 2015-11-09 10:04:43 +01:00
kervala
898ae96533 Merge with develop 2015-11-09 10:01:24 +01:00
kervala
d3d28c4756 Changed: Support new forums URLs 2015-11-08 14:47:56 +01:00
kervala
aa0720fb82 Changed: Remove hardcoded FAQ URLs 2015-11-08 14:21:26 +01:00
kervala
6dd1b67767 Merge with develop 2015-11-08 14:14:53 +01:00
Nimetu
2c6afe9bcc Merge with develop 2015-11-08 05:16:07 +02:00
Nimetu
151930e8cc Merge with develop 2015-11-08 03:07:14 +02:00
kervala
f78523e5d4 Merge with develop 2015-11-07 18:34:25 +01:00
kervala
0beb824dd3 Changed: Updated default settings for official client 2015-11-07 15:57:38 +01:00
kervala
96f0d175d2 Added: Steam OS X script installscript_osx.vdf 2015-11-07 15:56:47 +01:00
kervala
ee39c3d220 Fixed: Add revision in Info.plist for long version 2015-11-07 14:57:43 +01:00
kervala
10fe9697e1 Merge with develop 2015-11-07 14:55:30 +01:00
kervala
4d3aa59507 Merge with develop 2015-11-06 15:49:55 +01:00
kervala
de42e97fca Changed: Revert back to official client version (revision will be displayed in Ryzom Core client) 2015-11-05 17:42:43 +01:00
kervala
afaaa36777 Merge with develop 2015-11-05 17:30:12 +01:00
kervala
c95e136ef7 Merge with develop 2015-11-05 09:30:56 +01:00
kervala
ab4141de05 Merge with develop 2015-11-03 14:04:38 +01:00
kervala
924d3f313d Merge with develop 2015-11-03 13:42:07 +01:00
Nimetu
c3ee3168a0 Merge with develop 2015-11-03 01:13:18 +02:00
kervala
771fe024b4 Merge with develop 2015-11-01 20:13:33 +01:00
kervala
2378f4a7c0 Fixed: Use official support URL 2015-10-31 16:14:34 +01:00
kervala
aeb814932f Merge with develop 2015-10-25 15:17:26 +01:00
kervala
8514e93ff9 Merge with develop 2015-10-06 20:32:46 +02:00
kervala
fd70ff06fa Merge with develop 2015-10-01 14:54:18 +02:00
Nimetu
2aaa4df784 Merge with develop 2015-06-17 00:43:48 +03:00
kervala
79aa7ff09c Merge with develop 2015-04-25 19:49:15 +02:00
kervala
276692c155 Comment translation 2015-04-25 19:17:58 +02:00
kervala
c60a5745dd Save space in debug screen to display VPB and VPC 2015-04-25 19:16:06 +02:00
kervala
fea41e56d0 Fixed uint to bool conversion warning 2015-04-25 18:28:03 +02:00
kervala
9df7299a64 Removed dependency on libwww 2015-04-25 12:53:52 +02:00
kervala
cf793072d4 Merge with develop 2015-04-22 17:58:09 +02:00
Nimetu
d4ccb454c5 Fix compiling on 32bit linux 2015-04-22 13:44:21 +03:00
Nimetu
a6018d783a Add "select_shortcut_bar_2" action handler (issue 222) 2015-04-21 18:54:08 +03:00
Nimetu
68db74603b Fix sending and receiving cookies 2015-04-20 20:51:00 +03:00
Nimetu
61af82194c Fix possible curl handle leak 2015-04-20 20:50:56 +03:00
kervala
78eee4f222 Merge with develop 2015-04-20 13:38:51 +02:00
Nimetu
6a2a6ba6ea Fix compiling under windows 2015-04-20 01:04:52 +03:00
Nimetu
c047d7a581 Replace url parser with one less strict 2015-04-19 22:12:05 +03:00
Nimetu
bf89af5460 Make sure image src attribute matches local file or is absolute url 2015-04-19 22:01:46 +03:00
Nimetu
eb83692d34 Fix utf8 tooltips on web links 2015-04-19 20:26:38 +03:00
Nimetu
ce65cf7b1f Use cURL as http transport 2015-04-17 17:41:01 +03:00
Nimetu
5591ba919f Ensure that html is valid utf8 and that tags come in correct(ish) order 2015-04-18 23:23:23 +03:00
Nimetu
e069f7d6c9 Remove libwww, only keep html entitites list 2015-04-17 15:10:00 +03:00
kaetemi
e2a5b95560 Add extra light groups for better lightmap control 2015-04-16 17:39:47 +02:00
Jan Boon
8c006a46d4 Merged in nimetu/ryzomcore/libxml2-html-parser (pull request #127)
implement html parser using libxml2
2015-04-16 17:01:47 +02:00
kaetemi
32f74d9b39 Merge with develop (ryzomcore/v0.12.0) 2015-04-14 11:57:40 +02:00
kaetemi
342a68a529 ryzomcore/v0.12.0 2015-04-14 11:55:08 +02:00
Nimetu
e5480e213a Parse local files (ingame help) with new html parser 2015-04-13 20:53:10 +03:00
Nimetu
9ec3679780 Implement html parser using libxml2 2015-04-13 20:52:34 +03:00
Nimetu
388110a441 Remove libwww dependency from CGroupHTML::addLink() signature 2015-04-13 20:51:39 +03:00
kervala
bebc738064 Merge with develop 2015-04-05 16:45:34 +02:00
kervala
4b355a9ad8 Fixed compilation of font sample 2015-04-05 13:52:05 +02:00
Jan Boon
b11bb3c096 Merged in nimetu/ryzomcore (pull request #126)
add bold, italic, underline, strikethrough font styles
2015-04-01 06:20:41 +02:00
kaetemi
4882d3a45f Separate dither matrix per color channel 2015-03-30 12:04:35 +02:00
kaetemi
13baf03ffb Apply bayer dither to TGA16 export for smoother lightmaps 2015-03-30 11:22:25 +02:00
Nimetu
2b74943a5b Add span tag and bold, italic, underline, strikethrough styles to CGroupHTML 2015-03-29 18:24:19 +03:00
Nimetu
be3c6610b8 Add embolden, oblique, underline, strikethrough styles to CViewText 2015-03-29 18:24:16 +03:00
kaetemi
360914017d Use unordered set and map for VS2013, ref #236 2015-03-29 16:58:07 +02:00
kaetemi
879f51d9d3 Fixes for VS2013, ref #236 2015-03-29 16:58:07 +02:00
kaetemi
d05461a837 Fixup some more hashes 2015-03-29 16:58:07 +02:00
kaetemi
77375d6d7d Fix CHashCode compare operator 2015-03-29 16:58:07 +02:00
Nimetu
1c22925e63 Add embolden, oblique font styles (NL3D) 2015-03-29 17:28:33 +03:00
kaetemi
71cc7c3197 Add Wang hash functions 2015-03-29 03:14:06 +02:00
kervala
47118d7a6d Merge with hotfix 2015-03-24 15:52:41 +01:00
kervala
10aded4c42 Merge with hotfix 2015-03-24 15:52:16 +01:00
kervala
1130af71f9 Fixed compilation with GCC 2015-03-24 15:51:32 +01:00
kervala
d73b6e205b Merge with develop 2015-03-24 15:30:58 +01:00
kervala
5903f18278 Fixed compilation (setReportEmailFunction doesn't exist anymore) 2015-03-24 15:26:34 +01:00
kervala
2214e6a5f0 Changed: Minor changes 2015-03-07 17:51:12 +01:00
kervala
3712c43a17 Merge with develop 2015-03-07 17:03:34 +01:00
kervala
ab5b83347c Create compatibility-develop branch 2015-03-07 17:01:14 +01:00
kaetemi
a4f8ae738a Merge with hotfix 2015-03-07 00:01:02 +01:00
kaetemi
d7c6e8e49a Merge with default 2015-03-06 23:59:47 +01:00
kaetemi
503eb6ea5e Merge with hotfix 2015-03-06 23:40:48 +01:00
kaetemi
168a0eaa67 EOL 2015-03-06 23:39:53 +01:00
kaetemi
1168804e36 Flag max plugins as windowed 2015-03-06 21:20:01 +01:00
kaetemi
98a7831f61 Flag studio as windowed application 2015-03-06 21:17:20 +01:00
kaetemi
d6b4989a5f Flag windowed application when attempting window creation using 3D driver 2015-03-06 21:15:09 +01:00
kaetemi
1e172bcfcf Some practical improvements for the report handling 2015-03-06 21:07:12 +01:00
kaetemi
42b3791a8d Merge with feature-crashreport+develop 2015-03-06 21:05:31 +01:00
kaetemi
adc98ff45b Merge with feature-crashreport 2015-03-06 19:08:13 +01:00
kaetemi
8358197f91 Replace report functionality 2015-03-06 19:07:25 +01:00
kaetemi
176086d372 Replace report functionality 2015-03-06 19:06:11 +01:00
kaetemi
796ed46977 Extend debugging sample 2015-03-06 19:06:10 +01:00
kaetemi
df2297b818 Fix checkbox behaviour 2015-03-06 19:06:10 +01:00
kaetemi
8b4e782815 Extend debugging sample 2015-03-06 19:06:10 +01:00
kaetemi
bbac7db8c5 Adjust layout 2015-03-06 19:06:10 +01:00
kaetemi
419f51a947 Use proper style sheet for crash report under Cinnamon 2015-03-06 19:06:10 +01:00
kaetemi
cbf3394df8 Enable crash report tool in debugging sample application 2015-03-06 19:06:10 +01:00
kaetemi
870dcf6547 Merge with feature-crashreport 2015-03-06 16:01:05 +01:00
kervala
51b22a5ef0 Fixed: Compilation 2015-03-03 18:59:23 +01:00
dfighter1985
3bde65b0b0 This was left here unintentionally. 2015-03-03 03:10:59 +01:00
dfighter1985
b773b8c05a Default return value. 2015-03-03 03:10:28 +01:00
dfighter1985
275f1d3e34 Merged mainline changes.. 2015-03-03 03:05:14 +01:00
dfighter1985
dfecf4c769 Don't offer send in non-dev mode when there's no log file specified. 2015-03-03 02:37:51 +01:00
dfighter1985
001b870654 Only send email if the email CB is checked. 2015-03-03 02:33:04 +01:00
dfighter1985
9a9b2042dd Send report in dev mode if the CB is checked. 2015-03-03 02:30:39 +01:00
kervala
fb988fa7e4 Fixed: Compilation with GCC 2015-03-02 23:51:23 +01:00