Commit graph

528 commits

Author SHA1 Message Date
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
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
kaetemi
178ac7432d Remove redundant windows.h includes in NLMISC 2015-02-24 12:47:54 +01:00
kaetemi
67bdbd14a6 Categorize NLMISC project source files 2015-02-24 12:47:54 +01:00
kaetemi
83f11f3522 Fix sstream include 2015-02-24 12:47:32 +01:00
kaetemi
c19eb35c2d Merge with feature-crashreport 2015-02-24 11:41:05 +01:00
kaetemi
ce60a93d3f Branch feature-crashreport+develop (for testing only) 2015-02-24 11:40:31 +01:00
kaetemi
ab9240dcc9 Only in FINAL_VERSION 2015-02-23 20:33:31 +01:00
kaetemi
455c71dfc7 Default window title 2015-02-23 20:09:51 +01:00
kaetemi
b62bcae1c7 Move crash report web application to appropriate directory 2015-02-23 20:07:29 +01:00
kaetemi
8bcfa372ee Add function to set custom host url. Deprecate email callback function. Add some comments 2015-02-23 20:01:20 +01:00
kaetemi
28ffc449c4 GCC/Linux version of NLMISC_BREAKPOINT 2015-02-23 19:23:15 +01:00
dfighter1985
958f66a8e9 Merged in dfighter1985/ryzomcore/feature-crashreport (pull request #122)
Crash reporter changes
2015-02-23 17:55:32 +01:00
kaetemi
edc6910948 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 13:16:50 +01:00
kaetemi
603a8e6d89 Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 13:13:11 +01:00
kaetemi
ec09096b63 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 13:08:03 +01:00
kaetemi
cdbb9bd21a Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:58:43 +01:00
kaetemi
f2c78a5dd5 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:52:01 +01:00
kaetemi
0b3e58a563 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:48:41 +01:00
kaetemi
1cf671509e Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 12:38:43 +01:00
kaetemi
b4df6d77cb Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:37:51 +01:00
kaetemi
068b7bf77a Visual Studio 2013 compilation support for Ryzom Tools 2015-02-23 12:28:13 +01:00
kaetemi
8a2f4ea737 Visual Studio 2013 compilation support for Ryzom Server 2015-02-23 12:25:23 +01:00
dfighter1985
d8812f6076 Use CMsgBoxDisplayer on non-windows platforms as well. 2015-02-23 01:36:50 +01:00
kaetemi
a35625d1b1 Merge with hotfix 2015-02-22 23:50:39 +01:00
dfighter1985
8074c1b8a6 Remove generated log file when quitting the reporter. 2015-02-22 22:34:07 +01:00
dfighter1985
abeac6d56d Parametrize crash reporter. 2015-02-22 21:51:17 +01:00
dfighter1985
2b24f62e9a More renames... 2015-02-22 19:52:01 +01:00
dfighter1985
687655c086 Renames. 2015-02-22 19:33:38 +01:00
dfighter1985
151e92a37d Renames. 2015-02-22 19:33:12 +01:00
dfighter1985
6646db3d56 renamed directory. 2015-02-22 19:28:02 +01:00
dfighter1985
ffbbf7d84b Changed default title to NeL Error Report. 2015-02-22 19:26:03 +01:00
dfighter1985
a143ffc959 Moved to nel\tools\misc 2015-02-22 19:24:38 +01:00
dfighter1985
a2cd433eed Class names in Nel start with a C... 2015-02-22 19:04:11 +01:00
dfighter1985
f25c6f6103 Copyright header changed to Nel... 2015-02-22 18:59:35 +01:00
dfighter1985
059287db6a Launch the error report application instead of sending an email. 2015-02-22 18:45:41 +01:00
dfighter1985
987f140998 Backed out from fdc0d40 2015-02-22 17:38:06 +01:00
dfighter1985
917cb4aa9d Backed out from 5942903 2015-02-22 17:20:24 +01:00
dfighter1985
9ecf62b3ed Back out from 5bb3dad 2015-02-22 17:15:41 +01:00
Jan Boon
9afb02343f Merged in nimetu/ryzomcore/issue-221 (pull request #100)
improve chatlog file (issue #221)
2015-02-22 11:01:08 +01:00
kaetemi
aa3ddd3972 Merge with hotfix 2015-02-22 10:53:17 +01:00
kaetemi
12487d2e58 Merge with dfighter-tools 2015-02-22 10:45:48 +01:00
kaetemi
b5d48a8f15 Merge with hotfix 2015-02-22 10:39:02 +01:00
kaetemi
735027d3e0 Revert invalid hotfix commits 2015-02-22 10:34:27 +01:00
dfighter1985
53975d98af Merged in hotfix (pull request #117)
Merge hotfix branch
2015-02-21 23:09:07 +01:00
dfighter1985
ba02245e33 Removed unused references to CMsgBoxDisplayer. 2015-02-21 22:34:02 +01:00
dfighter1985
65366b92e1 Removed unused references to CMsgBoxDisplayer. 2015-02-21 22:34:02 +01:00
dfighter1985
5cc93c0feb A little cleanup of CMsgBoxDisplayer. 2015-02-21 22:32:11 +01:00
dfighter1985
169a41c59d A little cleanup of CMsgBoxDisplayer. 2015-02-21 22:32:11 +01:00
dfighter1985
588519b1d1 Use CMsgBoxDisplayer on platforms other than Windows as well. 2015-02-21 21:28:56 +01:00
dfighter1985
b8192c387f Use CMsgBoxDisplayer on platforms other than Windows as well. 2015-02-21 21:28:56 +01:00
dfighter1985
adf9155484 Install rcerror 2015-02-21 20:01:44 +01:00
dfighter1985
c246eb3fe2 Install rcerror 2015-02-21 20:01:44 +01:00
kaetemi
795254df36 Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 18:10:06 +01:00
kaetemi
f008ed26e7 Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:57:11 +01:00
kaetemi
a336a75f30 Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:53:39 +01:00
kaetemi
a5f6eacef1 Visual Studio 2013 compilation support for NeL Tools 2015-02-20 17:51:13 +01:00
kaetemi
90e9d48708 Visual Studio 2013 compilation support for Ryzom Client 2015-02-20 17:50:58 +01:00
kaetemi
9201b15650 Visual Studio 2013 compilation support for NLGUI 2015-02-20 17:17:07 +01:00
kaetemi
7c9b10912e Visual Studio 2013 compilation support for NL3D 2015-02-20 17:14:12 +01:00
kaetemi
c7d7b3e464 Visual Studio 2013 compilation support for NLSOUND 2015-02-20 17:14:00 +01:00
kaetemi
fb0929cfcc Visual Studio 2013 compilation support for NLMISC 2015-02-20 17:07:23 +01:00
kaetemi
f800744edd Visual Studio 2013 compilation support for NLPACS 2015-02-20 16:31:54 +01:00
kaetemi
f38b4fc5fa Visual Studio 2013 compilation support for NLNET 2015-02-20 16:29:09 +01:00
kaetemi
8fa42c1f32 Visual Studio 2013 compilation support for NLMISC 2015-02-20 16:24:19 +01:00
dfighter1985
c543f35114 Typo... 2015-02-20 03:22:02 +01:00
dfighter1985
40c6614dfc Typo... 2015-02-20 03:22:02 +01:00
dfighter1985
dc31507f12 Oups 2015-02-20 02:56:22 +01:00
dfighter1985
fdfffb32a2 Oups 2015-02-20 02:56:22 +01:00
dfighter1985
100fb11435 Tell the user if the report couldn't be sent. 2015-02-20 02:54:05 +01:00
dfighter1985
a8fe3d6c24 Tell the user if the report couldn't be sent. 2015-02-20 02:54:05 +01:00
dfighter1985
36633a7aba Override the cursor while sending the report. 2015-02-20 02:44:22 +01:00
dfighter1985
fc0cb388d8 Override the cursor while sending the report. 2015-02-20 02:44:22 +01:00
dfighter1985
7d88d84a5c Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :( 2015-02-20 02:35:11 +01:00
dfighter1985
021b034e97 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :( 2015-02-20 02:35:11 +01:00
dfighter1985
c1da7d663e Probably a good idea to look for rcerror as rcerror.exe on Windows. 2015-02-20 02:03:33 +01:00
dfighter1985
271fbb8013 Probably a good idea to look for rcerror as rcerror.exe on Windows. 2015-02-20 02:03:33 +01:00
dfighter1985
8417642596 Implemented the bug report Qt app and an example web app that takes the report. 2015-02-20 01:59:04 +01:00
dfighter1985
7f16563262 Implemented the bug report Qt app and an example web app that takes the report. 2015-02-20 01:59:04 +01:00
dfighter1985
35fe51761a Added the Ryzom Core Error Reporter's skeleton. 2015-02-19 00:20:18 +01:00
dfighter1985
439302da23 Added the Ryzom Core Error Reporter's skeleton. 2015-02-19 00:20:18 +01:00
dfighter1985
9825a77b79 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
c649dce53b 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
a5895daee0 Merge with hotfix 2015-02-15 09:54:31 +01:00
kervala
10a147bee3 Fixed: Wrong include guard for admin_modules PCH 2015-02-15 09:53:56 +01:00
kervala
ab4669a76f Merge with hotfix 2015-02-14 19:29:36 +01:00
kervala
9a97ffb211 Fixed: Warning multichars 2015-02-14 17:54:05 +01:00
kervala
4ee76e6182 Fixed: Unnamed semaphores are deprecated under OS X 2015-02-14 17:52:15 +01:00
kervala
c9fec14cef Fixed: Warning assert always false 2015-02-14 17:47:55 +01:00
kervala
bc214862df Fixed: Warning comparing an enum to an int 2015-02-14 17:47:10 +01:00
kervala
31d9db86ce Merge with hotfix 2015-02-14 16:07:04 +01:00
kervala
6c14b8f081 Fixed: Compilation 2015-02-14 16:05:45 +01:00
kervala
8da23b3fbe Merge with hotfix 2015-02-14 15:44:11 +01:00
kervala
557ff358bf Added: PCH for admin_modules 2015-02-14 15:43:05 +01:00
kervala
f7462aaf46 Merge with hotfix 2015-02-14 15:19:49 +01:00