Commit graph

837 commits

Author SHA1 Message Date
kervala
72af4052ee Changed: Add getTotalVideoMemory to IDriver to query total video memory
--HG--
branch : develop
2015-12-23 14:36:16 +01:00
Nimetu
67eee7f3dd Merge with develop
--HG--
branch : compatibility-develop
2015-12-19 20:40:05 +02:00
Nimetu
5e61995c3c Changed: Render p and div as block level elements
--HG--
branch : develop
2015-12-19 20:39:40 +02:00
Nimetu
193abf876b Merge with develop
--HG--
branch : compatibility-develop
2015-12-18 14:34:48 +02:00
Nimetu
045a6471fe Added: html OL list
--HG--
branch : develop
2015-12-18 14:29:40 +02:00
kervala
74f297f588 Merge with develop
--HG--
branch : compatibility-develop
2015-12-13 15:26:37 +01:00
kervala
8aff509f0f Fixed: Clang warnings
--HG--
branch : develop
2015-12-13 15:25:28 +01:00
kervala
15aed08533 Fixed: Removed unneeded operator for CSString (compilation fails with VC++ 2010 without STLport)
--HG--
branch : develop
2015-12-13 14:21:20 +01:00
kervala
fc951a24ce Fixed: Homogenize CFile::moveFile with other methods (use std::string instead of const char*)
--HG--
branch : develop
2015-12-13 13:03:16 +01:00
kervala
6f031728f5 Merge with develop
--HG--
branch : compatibility-develop
2015-12-11 20:21:56 +01:00
kervala
977103f9d0 Fixed: OS X uses .dylib extension instead of .so
--HG--
branch : develop
2015-12-11 20:19:10 +01:00
Nimetu
5fc50473f7 Merge with develop
--HG--
branch : compatibility-develop
2015-12-08 21:54:21 +02:00
Nimetu
612125a243 Added: Size attributes to img (width, height, max-width, max-height)
--HG--
branch : develop
2015-12-08 21:53:54 +02:00
kervala
b46dfe178f Merge with develop
--HG--
branch : compatibility-develop
2015-12-08 14:33:49 +01:00
kervala
76a8904e9a Fixed: Compilation under OS X
--HG--
branch : develop
2015-12-08 14:33:09 +01:00
Nimetu
f37758b330 Merge with develop
--HG--
branch : compatibility-develop
2015-12-06 16:38:52 +02:00
Nimetu
8f87990a1b Added: Smooth scrolling
--HG--
branch : develop
2015-12-06 16:38:29 +02:00
Nimetu
cb94cb4f9f Fixed: Scrolling in small steps not working.
--HG--
branch : develop
2015-12-06 16:26:39 +02:00
Nimetu
152200decc Merge with develop
--HG--
branch : compatibility-develop
2015-12-03 18:33:27 +02:00
Nimetu
7cbd840ce1 Added: style for html elements del, u, em, strong, small, and dl list
--HG--
branch : develop
2015-12-03 15:50:54 +02:00
Nimetu
d380ce2522 Merge with develop
--HG--
branch : compatibility-develop
2015-12-02 20:38:11 +02:00
kervala
6d1346d0cb Merge with develop
--HG--
branch : compatibility-develop
2015-12-02 19:28:44 +01:00
kervala
d4dd2b7264 Fixed: Getters for Anisotropic Filtering
--HG--
branch : develop
2015-12-02 18:56:49 +01:00
kervala
1009cc933b Merge with develop
--HG--
branch : compatibility-develop
2015-11-30 12:26:23 +01:00
kervala
2e58a0725a Changed: Forgot other ##
--HG--
branch : develop
2015-11-30 12:25:43 +01:00
kervala
e87442e582 Merge with develop
--HG--
branch : compatibility-develop
2015-11-30 10:30:14 +01:00
kervala
94f035ed8f Fixed: GCC doesn't support no arguments for __VA_ARGS__
--HG--
branch : develop
2015-11-30 10:29:24 +01:00
kervala
74196261ee Fixed: VC++ 2010 already supports ULL
--HG--
branch : develop
2015-11-30 10:28:06 +01:00
kervala
0623258189 Fixed: 64 bits constants truncated in 32 bits
--HG--
branch : develop
2015-11-30 10:27:41 +01:00
Nimetu
d4ed66d99b Added: URL #fragment navigation.
--HG--
branch : develop
2015-11-26 11:29:50 +02:00
Nimetu
f4599e183b Added: Common attributes to h1..h6 elements
--HG--
branch : develop
2015-12-02 20:37:44 +02:00
kervala
369a9efe0d Changed: Temporary disable NL_USES_DEFAULT_ARENA_OBJECT_ALLOCATOR for ITexture
--HG--
branch : compatibility-develop
2015-11-26 10:23:27 +01:00
kaetemi
6c2490090d Merge with feature-export-assimp
--HG--
branch : develop
2015-11-16 00:46:27 +01:00
kervala
9e88fa645b Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
2015-11-14 18:19:58 +01:00
kervala
53f46eb5fa Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
2015-11-14 11:46:17 +01:00
kervala
aa3d209d39 Fixed: Crash in CLuaManager
--HG--
branch : develop
2015-11-13 19:18:41 +01:00
kervala
a8d81c689b Changed: Support for integer types in Lua 5.3, fixes #253
--HG--
branch : develop
2015-11-13 18:42:50 +01:00
Nimetu
76ee797e49 Add lua function CCtrlBase::setTooltipUtf8 to set tooltip from html page
--HG--
branch : develop
2015-11-12 20:15:04 +02:00
kervala
3ac728872e Fixed: Typos (renamed restaure to restore)
--HG--
branch : develop
2015-11-08 11:53:46 +01:00
Nimetu
8a55f1b1e9 Changed: Allow to set max concurrent cURL connections per CGroupHTML instance
--HG--
branch : develop
2015-11-08 01:51:34 +02:00
kervala
9b231afa54 Fixed: Get system language code under OS X too and added method in NLMISC::CI18N
--HG--
branch : develop
2015-11-07 14:52:46 +01:00
kervala
93a03b5db0 Fixed: clang warnings
--HG--
branch : develop
2015-11-06 15:24:19 +01:00
Nimetu
4c8b2d3134 Add basic gif support to CBitmap (issue #238)
--HG--
branch : develop
2015-11-03 18:50:31 +02:00
Nimetu
f187421011 Fixed: Crash in CWidgetManager::sendClockTickEvent when element removed from _ClockMsgTargets (issue #250)
--HG--
branch : develop
2015-11-03 01:06:12 +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
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
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
8e1ada36b0 Use cURL as http transport
--HG--
branch : develop
2015-04-17 17:41:01 +03:00
Nimetu
be95880a95 Remove libwww, only keep html entitites list
--HG--
branch : develop
2015-04-17 15:10:00 +03: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
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
Nimetu
c760b1e3d9 Add embolden, oblique font styles (NL3D)
--HG--
branch : develop
2015-03-29 17:28:33 +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
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
29f42ed5ab Some practical improvements for the report handling
--HG--
branch : develop
2015-03-06 21:07:12 +01:00
kaetemi
f2f7bad4c5 Merge with feature-crashreport
--HG--
branch : feature-crashreport+develop
2015-03-06 19:08:13 +01:00
kaetemi
5a307cfa20 Replace report functionality
--HG--
branch : feature-crashreport
2015-03-06 19:06:11 +01:00
kaetemi
ea9e32f46d Merge with develop
--HG--
branch : feature-crashreport+develop
2015-02-24 17:19:27 +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
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
6a48a2d199 Merge with feature-crashreport
--HG--
branch : feature-crashreport+develop
2015-02-24 11:41:05 +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
kaetemi
e27cdc7ac2 Merge with hotfix
--HG--
branch : feature-crashreport
2015-02-22 23:50:39 +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
kaetemi
a8db3b2dda Visual Studio 2013 compilation support for Ryzom Client
--HG--
branch : develop
2015-02-20 18:10:06 +01:00
kaetemi
1879a434f7 Visual Studio 2013 compilation support for NLGUI
--HG--
branch : develop
2015-02-20 17:17:07 +01:00
kaetemi
f5335f068d Visual Studio 2013 compilation support for NLMISC
--HG--
branch : develop
2015-02-20 17:07:23 +01:00
kaetemi
6db8abf95c Visual Studio 2013 compilation support for NLMISC
--HG--
branch : develop
2015-02-20 16:24:19 +01:00
kervala
6784301afc Merge with hotfix
--HG--
branch : develop
2015-02-14 19:29:36 +01:00
kervala
1690f777a1 Fixed: Unnamed semaphores are deprecated under OS X
--HG--
branch : hotfix
2015-02-14 17:52:15 +01:00
kervala
e8b0765e7c Merge with hotfix
--HG--
branch : develop
2015-02-14 14:31:19 +01:00
kervala
3039428094 Fixed: Compilation warnings
--HG--
branch : hotfix
2015-02-14 12:41:59 +01:00
dfighter1985
225d786e7f Merged in hotfix (pull request #114)
Merging hotfix branch

--HG--
branch : develop
2015-02-13 19:48:42 +01:00
dfighter1985
79cd6bfaee Include rgba.h in libwww.h. Thanks Nimetu!
--HG--
branch : hotfix
2015-02-09 20:07:35 +01:00
dfighter1985
46cc31d0d0 Handle relative paths when loading .worldedit files in World Editor.
--HG--
branch : hotfix
2015-02-08 00:24:29 +01:00
kervala
303f7d2e79 Changed: Minor changes
--HG--
branch : develop
2015-01-13 14:11:07 +01:00