Commit graph

421 commits

Author SHA1 Message Date
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
kervala
cb575fb8f1 Fixed: Compilation with GCC 2015-03-02 23:27:12 +01:00
dfighter1985
a3b7496baf Some more GUI changes. 2015-03-02 21:06:01 +01:00
dfighter1985
50be8e3ba2 Added return codes as requested. 2015-03-02 20:12:09 +01:00
dfighter1985
0fcd0798ae GUI changes as per requested by Kaetemi. 2015-03-02 19:52:39 +01:00
kervala
2c154dbda8 Changed: Minor change 2015-03-02 13:13:45 +01:00
kervala
7495d3f611 Fixed: Sort files in CFileContainer::addSearchPath too 2015-03-02 13:13:26 +01:00
kervala
6fe4c728ba Changed: Use NLMISC::toString instead of itoa 2015-03-02 13:09:57 +01:00
kervala
f675848e1e Changed: Use CFile::createEmptyFile() 2015-03-02 13:09:16 +01:00
kervala
e7cdb7cde8 Fix #229 missing include in tools sources 2015-03-02 13:08:42 +01:00
kervala
b98648583d Fixed: Skip .hg directories 2015-03-02 13:07:33 +01:00
kervala
658fc3c1ad Fix #208 linking against static libX11.a 2015-03-02 13:06:51 +01:00
Nimetu
81273e4c4a Fix compilation 2015-03-01 18:41:16 +02:00
kaetemi
b63f917cde Merge with feature-crashreport 2015-02-24 17:19:41 +01:00
kaetemi
10ae0d201c Merge with develop 2015-02-24 17:19:27 +01:00
kaetemi
816d9a47e8 Qt5 compile fix for crash report tool 2015-02-24 17:18:48 +01:00
kaetemi
ddc1662b35 Fix FindLibOVR cmake script 2015-02-24 17:17:45 +01:00
kaetemi
e5fc6f9d7a Add isWindowedApplication to INeLContext 2015-02-24 17:17:45 +01:00
kaetemi
e6eaffc28b Use ULL suffix for unsigned 64bit integer constants with Visual Studio 2013 2015-02-24 17:17:45 +01:00
kaetemi
e7e7ff9746 Fix _MSC_VER typo 2015-02-24 17:17:45 +01:00
kaetemi
fe96d344df Merge with develop 2015-02-24 12:51:16 +01:00
kaetemi
976415461d Merge with feature-crashreport 2015-02-24 12:51:01 +01:00
kaetemi
f90ebc8dff Cleanup Windows includes 2015-02-24 12:47:54 +01:00
kaetemi
53b676e283 Add _WIN32_WINNT fallback define 2015-02-24 12:47:54 +01:00