Commit graph

2606 commits

Author SHA1 Message Date
kaetemi
f8bb35c449 Adjust material import
--HG--
branch : feature-export-assimp
2015-09-21 15:53:12 +02:00
kaetemi
5fe1f2c711 Fix typo
--HG--
branch : feature-export-assimp
2015-09-20 21:47:26 +02:00
kaetemi
efccbdd3af Export shape
--HG--
branch : feature-export-assimp
2015-09-20 21:41:53 +02:00
kaetemi
c9aef7b5a4 Import basic material options
--HG--
branch : feature-export-assimp
2015-09-20 21:08:30 +02:00
kaetemi
ac5d9272f1 Adjust
--HG--
branch : feature-export-assimp
2015-09-20 19:12:33 +02:00
kaetemi
3a7b5c6a46 Note
--HG--
branch : feature-export-assimp
2015-09-20 19:06:07 +02:00
kaetemi
9e20f83e48 Shape import
--HG--
branch : feature-export-assimp
2015-09-20 19:03:05 +02:00
kaetemi
e60a9747b8 Restructure
--HG--
branch : feature-export-assimp
2015-09-20 17:22:24 +02:00
kaetemi
33dd77d516 Skeleton scan
--HG--
branch : feature-export-assimp
2015-09-20 17:03:44 +02:00
kaetemi
fec41ebda9 Scene meta data
--HG--
branch : feature-export-assimp
2015-09-20 16:44:56 +02:00
kaetemi
dec6c2d880 Centralized asset database configuration
--HG--
branch : feature-export-assimp
2015-09-20 15:23:27 +02:00
kaetemi
8036d53411 Add pipeline v3 tool logger
--HG--
branch : feature-export-assimp
2015-09-20 14:08:38 +02:00
kaetemi
875d7eaa7c Flag bones in scene for skel export
--HG--
branch : feature-export-assimp
2015-09-19 19:35:57 +02:00
kaetemi
7d502cc6bb Command line options
--HG--
branch : feature-export-assimp
2015-09-19 18:08:25 +02:00
kaetemi
d55124a6a9 Placeholder projects
--HG--
branch : feature-export-assimp
2015-09-19 17:14:35 +02:00
Nimetu
08e5345e14 Fix 'ah:' urls for untrusted domains
--HG--
branch : develop
2015-08-11 19:35:27 +03:00
kaetemi
7d53552979 Fix object viewer include issue
--HG--
branch : develop
2015-07-10 07:54:34 +02:00
kaetemi
5e428761c5 Fix freetype include order
WINSDK added a fttypes.h header...

--HG--
branch : develop
2015-07-10 06:30:20 +02:00
kaetemi
edebe18d6c MFC now requires XP or higher
--HG--
branch : develop
2015-07-10 06:24:17 +02:00
kaetemi
9a10f1413b Fix DXSDK include order
--HG--
branch : develop
2015-07-10 06:16:19 +02:00
Nimetu
04cffc1559 Fix missing include when WITH_PCH=OFF
--HG--
branch : develop
2015-06-17 00:36:54 +03:00
Nimetu
15766d4d17 Add radio button type to CGroupHTML (issue 237)
--HG--
branch : develop
2015-03-31 18:47:46 +03:00
kervala
b4e0b46ac9 Fixed uint to bool conversion warning
--HG--
branch : develop
2015-04-25 18:28:03 +02:00
Nimetu
11ca61be54 Fix compiling on 32bit linux
--HG--
branch : develop
2015-04-22 13:44:21 +03:00
Nimetu
ce4cb9c4f1 Fix sending and receiving cookies
--HG--
branch : develop
2015-04-20 20:51:00 +03:00
Nimetu
a6cf9730be Fix possible curl handle leak
--HG--
branch : develop
2015-04-20 20:50:56 +03:00
Nimetu
26571de439 Fix compiling under windows
--HG--
branch : develop
2015-04-20 01:04:52 +03:00
Nimetu
dc082f3921 Replace url parser with one less strict
--HG--
branch : develop
2015-04-19 22:12:05 +03:00
Nimetu
ad3fac7b15 Make sure image src attribute matches local file or is absolute url
--HG--
branch : develop
2015-04-19 22:01:46 +03:00
Nimetu
2771185ef7 Fix utf8 tooltips on web links
--HG--
branch : develop
2015-04-19 20:26:38 +03:00
Nimetu
8e1ada36b0 Use cURL as http transport
--HG--
branch : develop
2015-04-17 17:41:01 +03:00
Nimetu
c6535ee2fd Ensure that html is valid utf8 and that tags come in correct(ish) order
--HG--
branch : develop
2015-04-18 23:23:23 +03:00
Nimetu
be95880a95 Remove libwww, only keep html entitites list
--HG--
branch : develop
2015-04-17 15:10:00 +03:00
kaetemi
f578f0441a Add extra light groups for better lightmap control
--HG--
branch : develop
2015-04-16 17:39:47 +02:00
Jan Boon
bc3624c42f Merged in nimetu/ryzomcore/libxml2-html-parser (pull request #127)
implement html parser using libxml2

--HG--
branch : develop
2015-04-16 17:01:47 +02:00
kaetemi
d9f3efc4e3 ryzomcore/v0.12.0
--HG--
branch : develop
2015-04-14 11:55:08 +02:00
Nimetu
d1d0c0cf50 Parse local files (ingame help) with new html parser
--HG--
branch : libxml2-html-parser
2015-04-13 20:53:10 +03:00
Nimetu
1dc48143f3 Implement html parser using libxml2
--HG--
branch : libxml2-html-parser
2015-04-13 20:52:34 +03:00
Nimetu
5d4cbdce26 Remove libwww dependency from CGroupHTML::addLink() signature
--HG--
branch : libxml2-html-parser
2015-04-13 20:51:39 +03:00
kervala
87c198efbe Fixed compilation of font sample
--HG--
branch : develop
2015-04-05 13:52:05 +02:00
Jan Boon
f36e06dfb9 Merged in nimetu/ryzomcore (pull request #126)
add bold, italic, underline, strikethrough font styles

--HG--
branch : develop
2015-04-01 06:20:41 +02:00
kaetemi
2d74de8a36 Separate dither matrix per color channel
--HG--
branch : develop
2015-03-30 12:04:35 +02:00
kaetemi
2da42040ef Apply bayer dither to TGA16 export for smoother lightmaps
--HG--
branch : develop
2015-03-30 11:22:25 +02:00
Nimetu
eeb881d49e Add span tag and bold, italic, underline, strikethrough styles to CGroupHTML
--HG--
branch : develop
2015-03-29 18:24:19 +03:00
Nimetu
55672485c9 Add embolden, oblique, underline, strikethrough styles to CViewText
--HG--
branch : develop
2015-03-29 18:24:16 +03:00
kaetemi
5bb34b12f4 Use unordered set and map for VS2013, ref #236
--HG--
branch : develop
2015-03-29 16:58:07 +02:00
kaetemi
ec30735198 Fixup some more hashes
--HG--
branch : develop
2015-03-29 16:58:07 +02:00
Nimetu
c760b1e3d9 Add embolden, oblique font styles (NL3D)
--HG--
branch : develop
2015-03-29 17:28:33 +03:00
kaetemi
e0d4aa1e7b Add Wang hash functions
--HG--
branch : develop
2015-03-29 03:14:06 +02:00
kervala
906cc01768 Merge with hotfix
--HG--
branch : develop
2015-03-24 15:52:16 +01:00
kervala
d76d8e52c9 Fixed compilation with GCC
--HG--
branch : hotfix
2015-03-24 15:51:32 +01:00
kaetemi
9d36ac8cb0 Merge with hotfix
--HG--
branch : develop
2015-03-07 00:01:02 +01:00
kaetemi
621a9e8f7c ryzomcore/v0.11.3
--HG--
branch : hotfix
2015-03-06 23:53:34 +01:00
kaetemi
2d297efc2a Merge with hotfix
--HG--
branch : develop
2015-03-06 23:40:48 +01:00
kaetemi
846abf93c9 Synchronize versions
--HG--
branch : hotfix
2015-03-06 23:37:21 +01:00
kaetemi
5a297ddbe4 Flag max plugins as windowed
--HG--
branch : develop
2015-03-06 21:20:01 +01:00
kaetemi
28bcfeb01c Flag windowed application when attempting window creation using 3D driver
--HG--
branch : develop
2015-03-06 21:15:09 +01:00
kaetemi
29f42ed5ab Some practical improvements for the report handling
--HG--
branch : develop
2015-03-06 21:07:12 +01:00
kaetemi
163abf31b8 Merge with feature-crashreport+develop
--HG--
branch : develop
2015-03-06 21:05:31 +01:00
kaetemi
f2f7bad4c5 Merge with feature-crashreport
--HG--
branch : feature-crashreport+develop
2015-03-06 19:08:13 +01:00
kaetemi
ee32b56d87 Replace report functionality
--HG--
branch : feature-crashreport
2015-03-06 19:07:25 +01:00
kaetemi
5a307cfa20 Replace report functionality
--HG--
branch : feature-crashreport
2015-03-06 19:06:11 +01:00
kaetemi
bbfc15c07a Extend debugging sample
--HG--
branch : feature-crashreport
2015-03-06 19:06:10 +01:00
kaetemi
a9dc1a4c68 Fix checkbox behaviour
--HG--
branch : feature-crashreport
2015-03-06 19:06:10 +01:00
kaetemi
230be4d64b Extend debugging sample
--HG--
branch : feature-crashreport
2015-03-06 19:06:10 +01:00
kaetemi
b896405b3d Adjust layout
--HG--
branch : feature-crashreport
2015-03-06 19:06:10 +01:00
kaetemi
699e1644e7 Use proper style sheet for crash report under Cinnamon
--HG--
branch : feature-crashreport
2015-03-06 19:06:10 +01:00
kaetemi
9d50210e6b Enable crash report tool in debugging sample application
--HG--
branch : feature-crashreport
2015-03-06 19:06:10 +01:00
kaetemi
0a567afc53 Merge with feature-crashreport
--HG--
branch : feature-crashreport+develop
2015-03-06 16:01:05 +01:00
dfighter1985
baa5273eaa Default return value.
--HG--
branch : feature-crashreport
2015-03-03 03:10:28 +01:00
dfighter1985
3714d15c60 Merged mainline changes..
--HG--
branch : feature-crashreport
2015-03-03 03:05:14 +01:00
dfighter1985
7ca008ba86 Don't offer send in non-dev mode when there's no log file specified.
--HG--
branch : feature-crashreport
2015-03-03 02:37:51 +01:00
dfighter1985
d561a7078c Only send email if the email CB is checked.
--HG--
branch : feature-crashreport
2015-03-03 02:33:04 +01:00
dfighter1985
3108e5e013 Send report in dev mode if the CB is checked.
--HG--
branch : feature-crashreport
2015-03-03 02:30:39 +01:00
kervala
c2139e95c0 Fixed: Compilation with GCC
--HG--
branch : develop
2015-03-02 23:27:12 +01:00
dfighter1985
374d966069 Some more GUI changes.
--HG--
branch : feature-crashreport
2015-03-02 21:06:01 +01:00
dfighter1985
d666240343 Added return codes as requested.
--HG--
branch : feature-crashreport
2015-03-02 20:12:09 +01:00
dfighter1985
9d92e2d0d3 GUI changes as per requested by Kaetemi.
--HG--
branch : feature-crashreport
2015-03-02 19:52:39 +01:00
kervala
5e390364de Changed: Minor change
--HG--
branch : develop
2015-03-02 13:13:45 +01:00
kervala
93a708400e Fixed: Sort files in CFileContainer::addSearchPath too
--HG--
branch : develop
2015-03-02 13:13:26 +01:00
kervala
c0e885aa6a Fixed: Skip .hg directories
--HG--
branch : develop
2015-03-02 13:07:33 +01:00
kervala
4daf4f5b5f Fix #208 linking against static libX11.a
--HG--
branch : develop
2015-03-02 13:06:51 +01:00
Nimetu
c00ba3f2c1 Fix compilation
--HG--
branch : develop
2015-03-01 18:41:16 +02:00
kaetemi
4dd5955484 Merge with feature-crashreport
--HG--
branch : feature-crashreport+develop
2015-02-24 17:19:41 +01:00
kaetemi
ea9e32f46d Merge with develop
--HG--
branch : feature-crashreport+develop
2015-02-24 17:19:27 +01:00
kaetemi
826907c8dd Qt5 compile fix for crash report tool
--HG--
branch : feature-crashreport
2015-02-24 17:18:48 +01:00
kaetemi
a66204a03a Add isWindowedApplication to INeLContext
--HG--
branch : develop
2015-02-24 17:17:45 +01:00
kaetemi
cb52c7ee7e Use ULL suffix for unsigned 64bit integer constants with Visual Studio 2013
--HG--
branch : develop
2015-02-24 17:17:45 +01:00
kaetemi
54ae2da0a6 Fix _MSC_VER typo
--HG--
branch : develop
2015-02-24 17:17:45 +01:00
kaetemi
cf79f1bb1b Merge with develop
--HG--
branch : feature-crashreport+develop
2015-02-24 12:51:16 +01:00
kaetemi
3b59bbcf69 Merge with feature-crashreport
--HG--
branch : feature-crashreport+develop
2015-02-24 12:51:01 +01:00
kaetemi
d9dd425dc6 Cleanup Windows includes
--HG--
branch : develop
2015-02-24 12:47:54 +01:00
kaetemi
50e11b0536 Add _WIN32_WINNT fallback define
--HG--
branch : develop
2015-02-24 12:47:54 +01:00
kaetemi
e201c90937 Remove redundant windows.h includes in NLMISC
--HG--
branch : develop
2015-02-24 12:47:54 +01:00
kaetemi
e2dcc3b035 Categorize NLMISC project source files
--HG--
branch : develop
2015-02-24 12:47:54 +01:00
kaetemi
02e8100ea4 Fix sstream include
--HG--
branch : feature-crashreport
2015-02-24 12:47:32 +01:00
kaetemi
6a48a2d199 Merge with feature-crashreport
--HG--
branch : feature-crashreport+develop
2015-02-24 11:41:05 +01:00
kaetemi
68120a53e7 Only in FINAL_VERSION
--HG--
branch : feature-crashreport
2015-02-23 20:33:31 +01:00
kaetemi
a548940b8c Default window title
--HG--
branch : feature-crashreport
2015-02-23 20:09:51 +01:00
kaetemi
e4e3f2019b Add function to set custom host url. Deprecate email callback function. Add some comments
--HG--
branch : feature-crashreport
2015-02-23 20:01:20 +01:00
kaetemi
6ae954326d GCC/Linux version of NLMISC_BREAKPOINT
--HG--
branch : feature-crashreport
2015-02-23 19:23:15 +01:00
dfighter1985
92d692fe69 Merged in dfighter1985/ryzomcore/feature-crashreport (pull request #122)
Crash reporter changes

--HG--
branch : feature-crashreport
2015-02-23 17:55:32 +01:00
kaetemi
77d17265eb Visual Studio 2013 compilation support for Ryzom Server
--HG--
branch : develop
2015-02-23 12:58:43 +01:00
dfighter1985
8bf372056f Use CMsgBoxDisplayer on non-windows platforms as well.
--HG--
branch : feature-crashreport
2015-02-23 01:36:50 +01:00
kaetemi
e27cdc7ac2 Merge with hotfix
--HG--
branch : feature-crashreport
2015-02-22 23:50:39 +01:00
dfighter1985
2bb5e8e9ba Remove generated log file when quitting the reporter.
--HG--
branch : feature-crashreport
2015-02-22 22:34:07 +01:00
dfighter1985
955ef48460 Parametrize crash reporter.
--HG--
branch : feature-crashreport
2015-02-22 21:51:17 +01:00
dfighter1985
cfe2d60350 More renames...
--HG--
branch : feature-crashreport
2015-02-22 19:52:01 +01:00
dfighter1985
3987971792 Renames.
--HG--
branch : feature-crashreport
2015-02-22 19:33:38 +01:00
dfighter1985
6be70dd39c Renames.
--HG--
branch : feature-crashreport
2015-02-22 19:33:12 +01:00
dfighter1985
97de06bff2 renamed directory.
--HG--
branch : feature-crashreport
2015-02-22 19:28:02 +01:00
dfighter1985
195dfcc3f3 Changed default title to NeL Error Report.
--HG--
branch : feature-crashreport
2015-02-22 19:26:03 +01:00
dfighter1985
4ec87b3d6d Moved to nel\tools\misc
--HG--
branch : feature-crashreport
2015-02-22 19:24:38 +01:00
dfighter1985
b5c72182ed Class names in Nel start with a C...
--HG--
branch : feature-crashreport
2015-02-22 19:04:11 +01:00
dfighter1985
bdb20d32dd Copyright header changed to Nel...
--HG--
branch : feature-crashreport
2015-02-22 18:59:35 +01:00
dfighter1985
24aa500d0b Launch the error report application instead of sending an email.
--HG--
branch : feature-crashreport
2015-02-22 18:45:41 +01:00
dfighter1985
3d9357637b Backed out from fdc0d40
--HG--
branch : feature-crashreport
2015-02-22 17:38:06 +01:00
dfighter1985
7efbee6d0a Backed out from 5942903
--HG--
branch : feature-crashreport
2015-02-22 17:20:24 +01:00
dfighter1985
4e00903dcc Back out from 5bb3dad
--HG--
branch : feature-crashreport
2015-02-22 17:15:41 +01:00
kaetemi
18d211f79b Merge with hotfix
--HG--
branch : develop
2015-02-22 10:53:17 +01:00
kaetemi
6e06b4e79e Merge with dfighter-tools
--HG--
branch : hotfix
2015-02-22 10:45:48 +01:00
kaetemi
b120d68a98 Merge with hotfix
--HG--
branch : develop
2015-02-22 10:39:02 +01:00
dfighter1985
36ce53b1ba Merged in hotfix (pull request #117)
Merge hotfix branch

--HG--
branch : develop
2015-02-21 23:09:07 +01:00
dfighter1985
e130625cca A little cleanup of CMsgBoxDisplayer.
--HG--
branch : feature-crashreport
2015-02-21 22:32:11 +01:00
dfighter1985
ac6bda5084 A little cleanup of CMsgBoxDisplayer.
--HG--
branch : hotfix
2015-02-21 22:32:11 +01:00
dfighter1985
1476bfe648 Use CMsgBoxDisplayer on platforms other than Windows as well.
--HG--
branch : feature-crashreport
2015-02-21 21:28:56 +01:00
dfighter1985
070dad8e53 Use CMsgBoxDisplayer on platforms other than Windows as well.
--HG--
branch : hotfix
2015-02-21 21:28:56 +01:00
dfighter1985
7efb3334fc Install rcerror
--HG--
branch : feature-crashreport
2015-02-21 20:01:44 +01:00
dfighter1985
4fd17a428d Install rcerror
--HG--
branch : hotfix
2015-02-21 20:01:44 +01:00
kaetemi
a8db3b2dda Visual Studio 2013 compilation support for Ryzom Client
--HG--
branch : develop
2015-02-20 18:10:06 +01:00
kaetemi
997722ee6b Visual Studio 2013 compilation support for NeL Tools
--HG--
branch : develop
2015-02-20 17:51:13 +01:00
kaetemi
1879a434f7 Visual Studio 2013 compilation support for NLGUI
--HG--
branch : develop
2015-02-20 17:17:07 +01:00
kaetemi
221267364d Visual Studio 2013 compilation support for NL3D
--HG--
branch : develop
2015-02-20 17:14:12 +01:00
kaetemi
a15221b00d Visual Studio 2013 compilation support for NLSOUND
--HG--
branch : develop
2015-02-20 17:14:00 +01:00
kaetemi
f5335f068d Visual Studio 2013 compilation support for NLMISC
--HG--
branch : develop
2015-02-20 17:07:23 +01:00
kaetemi
cb986cba6f Visual Studio 2013 compilation support for NLPACS
--HG--
branch : develop
2015-02-20 16:31:54 +01:00
kaetemi
7ea4cff032 Visual Studio 2013 compilation support for NLNET
--HG--
branch : develop
2015-02-20 16:29:09 +01:00
kaetemi
6db8abf95c Visual Studio 2013 compilation support for NLMISC
--HG--
branch : develop
2015-02-20 16:24:19 +01:00
dfighter1985
9b29695635 Typo...
--HG--
branch : feature-crashreport
2015-02-20 03:22:02 +01:00
dfighter1985
141dddb58c Typo...
--HG--
branch : hotfix
2015-02-20 03:22:02 +01:00
dfighter1985
72566f1a71 Tell the user if the report couldn't be sent.
--HG--
branch : feature-crashreport
2015-02-20 02:54:05 +01:00
dfighter1985
bb9f6261d7 Tell the user if the report couldn't be sent.
--HG--
branch : hotfix
2015-02-20 02:54:05 +01:00
dfighter1985
14a709449a Override the cursor while sending the report.
--HG--
branch : feature-crashreport
2015-02-20 02:44:22 +01:00
dfighter1985
3c61e39ce3 Override the cursor while sending the report.
--HG--
branch : hotfix
2015-02-20 02:44:22 +01:00
dfighter1985
f0869aa659 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :(
--HG--
branch : feature-crashreport
2015-02-20 02:35:11 +01:00
dfighter1985
469e5583c1 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :(
--HG--
branch : hotfix
2015-02-20 02:35:11 +01:00
dfighter1985
9518a80c99 Probably a good idea to look for rcerror as rcerror.exe on Windows.
--HG--
branch : feature-crashreport
2015-02-20 02:03:33 +01:00
dfighter1985
2fe77d719f Probably a good idea to look for rcerror as rcerror.exe on Windows.
--HG--
branch : hotfix
2015-02-20 02:03:33 +01:00
dfighter1985
03ce683e49 Implemented the bug report Qt app and an example web app that takes the report.
--HG--
branch : feature-crashreport
2015-02-20 01:59:04 +01:00
dfighter1985
a6ee23ebe4 Implemented the bug report Qt app and an example web app that takes the report.
--HG--
branch : hotfix
2015-02-20 01:59:04 +01:00