Commit graph

2759 commits

Author SHA1 Message Date
kervala
2cf73a9c21 Fixed: Typos 2015-12-17 12:51:26 +01:00
kervala
ad3e425e3e Changed: Minor changes 2015-12-17 12:48:57 +01:00
kervala
a2a2fa7877 Merge with develop 2015-12-16 14:51:18 +01:00
kervala
39f838a1fd Fixed: loadPNG with RGB images was returning 32 2015-12-16 14:50:40 +01:00
kervala
7c5222ec52 Merge with develop 2015-12-15 15:09:50 +01:00
kervala
3b07ad440d Changed: Minor changes 2015-12-15 14:07:32 +01:00
kervala
c20346238a Fixed: Implement launch of executables under OS X 2015-12-15 14:06:49 +01:00
kervala
c938092faf Merge with develop 2015-12-13 15:26:37 +01:00
kervala
542c29ded7 Fixed: Clang warnings 2015-12-13 15:25:28 +01:00
kervala
ae5457d717 Fixed: Removed unneeded operator for CSString (compilation fails with VC++ 2010 without STLport) 2015-12-13 14:21:20 +01:00
kervala
c744716973 Fixed: Compilation of some tools with Qt 5 in static 2015-12-13 13:09:25 +01:00
kervala
451823bda9 Fixed: Compile crash_report and ryzom_configuration if WITH_RYZOM_CLIENT is set 2015-12-13 13:06:23 +01:00
kervala
bf73907da1 Fixed: Homogenize CFile::moveFile with other methods (use std::string instead of const char*) 2015-12-13 13:03:16 +01:00
kervala
c2fa7e4137 Merge with develop 2015-12-11 20:21:56 +01:00
kervala
ab584867f5 Fixed: OS X uses .dylib extension instead of .so 2015-12-11 20:19:10 +01:00
Nimetu
ed90e506d1 Merge with develop 2015-12-10 10:56:53 +02:00
Nimetu
a5ede6e08a Fixed: Keyboard capture not reset when clicking outside GUI. 2015-12-10 10:56:03 +02:00
Nimetu
228b15d24e Merge with develop 2015-12-08 21:54:21 +02:00
Nimetu
c13e885561 Added: Size attributes to img (width, height, max-width, max-height) 2015-12-08 21:53:54 +02:00
kervala
741af6b5b8 Merge with develop 2015-12-08 14:33:49 +01:00
kervala
2052b19d85 Fixed: Compilation under OS X 2015-12-08 14:33:09 +01:00
kervala
6c54c82b0b Merge with develop 2015-12-07 21:49:21 +01:00
kervala
c4235f7b1e Changed: Let dependencies propagate to other targets 2015-12-07 21:48:32 +01:00
kervala
a9af2aff2c Merge with develop 2015-12-06 19:46:40 +01:00
kervala
ad654a0d31 Backed out changeset: 0e65571cbfd1 (doesn't fix anything) 2015-12-06 19:46:02 +01:00
kervala
d294563f6a Merge with develop 2015-12-06 16:56:53 +01:00
kervala
8a43c01e52 Fixed: Remove \SystemRoot\ from path returned from Registry 2015-12-06 16:42:49 +01:00
Nimetu
f1c73c665b Merge with develop 2015-12-06 16:38:52 +02:00
Nimetu
4827dcd60e Added: Smooth scrolling 2015-12-06 16:38:29 +02:00
Nimetu
2b11880d9f Fixed: Scrolling in small steps not working. 2015-12-06 16:26:39 +02:00
kervala
9de35e4e43 Merge with develop 2015-12-05 18:52:33 +01:00
kervala
797c48a592 Changed: Port some tools to Qt 5 2015-12-05 18:48:59 +01:00
Nimetu
a299f4ccd3 Merge with develop 2015-12-03 18:33:27 +02:00
Nimetu
737d068147 Added: style for html elements del, u, em, strong, small, and dl list 2015-12-03 15:50:54 +02:00
Nimetu
d8735be24e Changed: Ignore text from <script> element 2015-12-03 15:50:46 +02:00
Nimetu
1bc70c76bd Merge with develop 2015-12-02 20:38:11 +02:00
kervala
1197c50201 Merge with develop 2015-12-02 19:28:44 +01:00
kervala
7e7deb34e2 Fixed: Bug when CURLMOPT_MAX_HOST_CONNECTIONS is not supported 2015-12-02 18:57:21 +01:00
kervala
f720072e7b Fixed: Getters for Anisotropic Filtering 2015-12-02 18:56:49 +01:00
kervala
359d8ec138 Merge with develop 2015-11-30 14:20:16 +01:00
kervala
46543242db Fixed: Link error under Debian Squeeze 2015-11-30 14:19:05 +01:00
kervala
d381ee8965 Fixed: Warning filePath not being a const char* 2015-11-30 14:18:04 +01:00
kervala
384eb939aa Merge with develop 2015-11-30 12:26:23 +01:00
kervala
2c9e305322 Changed: Forgot other ## 2015-11-30 12:25:43 +01:00
kervala
f67d79de61 Merge with develop 2015-11-30 10:30:14 +01:00
kervala
d18021f6c9 Fixed: GCC doesn't support no arguments for __VA_ARGS__ 2015-11-30 10:29:24 +01:00
kervala
7ecfbd701a Fixed: VC++ 2010 already supports ULL 2015-11-30 10:28:06 +01:00
kervala
7dbf4bd3d2 Fixed: 64 bits constants truncated in 32 bits 2015-11-30 10:27:41 +01:00
kervala
9d7b953a12 Fixed: Warning string after #endif 2015-11-30 10:27:03 +01:00
kervala
590b72e05f Merge with develop 2015-11-29 17:55:33 +01:00
kervala
a6ed27598f Changed: Add and use more constants in config.h 2015-11-29 14:19:02 +01:00
kervala
532aaa1078 Changed: Simplified CMake ELSE and ENDIF 2015-11-29 14:06:05 +01:00
kervala
647fe665f1 Added: RC files for NeL drivers 2015-11-29 13:58:12 +01:00
Nimetu
d3625364c6 Added: URL #fragment navigation. 2015-11-26 11:29:50 +02:00
Nimetu
9014aa6fad Added: Common attributes to h1..h6 elements 2015-12-02 20:37:44 +02:00
kervala
0df4ac2750 Changed: Temporary disable NL_USES_DEFAULT_ARENA_OBJECT_ALLOCATOR for ITexture 2015-11-26 10:23:27 +01:00
kishan_grimout
eef81cf802 fix crash when a shader fails to build 2015-05-23 16:50:24 +02:00
kervala
f895b6a713 Fixed: Open web pages in background under OS X and don't close client 2015-11-24 10:02:09 +01:00
kervala
2d348c7f13 Fixed: Crash under Linux saying you can't use X in multi-threaded environment 2015-11-22 18:37:29 +01:00
kervala
b3f294759e Fixed: Unable to open URLs under Linux while using Steam Runtime 2015-11-21 17:39:49 +01:00
kervala
70c47de7c8 Fixed: Typo 2015-11-21 17:37:45 +01:00
kervala
4d99b9d3bc Changed: Give priority to xdg-open (if present) to open URLs under Linux 2015-11-21 17:36:44 +01:00
kaetemi
df382464d8 Merge with feature-export-assimp 2015-11-16 00:46:27 +01:00
kervala
9ca49a8d0f Fixed: Revert back TrapCrashInDebugger to false else VC++ can't intercept exceptions and we'll be unable to debug :( 2015-11-15 18:33:09 +01:00
kervala
f9125741c4 Changed: Display basic information for OpenAL driver 2015-11-15 18:31:56 +01:00
kervala
0267264cdd Changed: Temporary comment the line because XAudio2 returns an error if used 2015-11-15 18:31:20 +01:00
kervala
9aa47b4836 Changed: Minor changes 2015-11-15 13:29:34 +01:00
kervala
c210bb0e88 Fixed: Display title and artist name from ogg files in music player 2015-11-15 13:13:44 +01:00
kervala
2bad77c5fa Fixed: Only open supported music formats in music player 2015-11-15 13:12:54 +01:00
kaetemi
0289b22db0 This seems like a good idea as well, ref #254 2015-11-15 12:27:58 +01:00
kaetemi
fc8e07c791 Add some extra checks, ref #254 2015-11-15 12:21:14 +01:00
kervala
2ad5f18f71 Changed: Minor changes 2015-11-14 18:33:13 +01:00
kervala
9f2b505b49 Changed: Support for integer types in Lua 5.3, fixes #253 2015-11-14 18:19:58 +01:00
kervala
3ea4340ce6 Changed: Support for integer types in Lua 5.3, fixes #253 2015-11-14 11:46:17 +01:00
kervala
5ea4193018 Changed: Don't try to convert string to CRGBA if less than 3 integers 2015-11-13 19:38:46 +01:00
kervala
74fd0ba557 Changed: Minor changes 2015-11-13 19:37:32 +01:00
kervala
75a28a149b Fixed: Crash in CLuaManager 2015-11-13 19:18:41 +01:00
kervala
c27e1062e4 Changed: Support for integer types in Lua 5.3, fixes #253 2015-11-13 18:42:50 +01:00
kervala
380bac5728 Changed: Replaced some NLMISC::strlwr by NLMISC::toLower 2015-11-13 16:22:49 +01:00
Nimetu
ef50655b79 Add lua function CCtrlBase::setTooltipUtf8 to set tooltip from html page 2015-11-12 20:15:04 +02:00
Nimetu
bba1523d37 Fixed displaying utf8 string on <img> alt attr. 2015-11-12 16:01:57 +02:00
kervala
95f7448dd2 Fixed: Include AvailabilityMacros.h before using macro MAC_OS_X_VERSION_10_6 2015-11-09 12:45:34 +01:00
kervala
d4d12f2c81 Fixed: Compilation with old libcurl versions 2015-11-09 10:47:28 +01:00
kervala
826b729411 Changed: Display OpenGL version and GPU used in logs 2015-11-09 10:00:51 +01:00
kervala
5babd5ab59 Changed: Support for WGL_NV_gpu_affinity extension 2015-11-09 10:00:05 +01:00
kervala
ffbf1e8804 Changed: Updated OpenGL headers 2015-11-09 09:56:13 +01:00
kervala
13665eec9d Fixed: Missing #endif 2015-11-09 09:55:58 +01:00
kervala
c3a6787196 Changed: Release modes list under OS X 2015-11-08 13:42:31 +01:00
kervala
76436616ea Changed: Centralize OS X 10.6 check in NL_MAC_VERSION_10_6_UP 2015-11-08 13:35:16 +01:00
kervala
cccc2c47b8 Changed: Replace int 3 asm by __debugbreak() 2015-11-08 13:25:36 +01:00
kervala
bc50742bfe Changed: Minor changes 2015-11-08 13:22:33 +01:00
kervala
3fa369e73c Fixed: Typos (renamed restaure to restore) 2015-11-08 11:53:46 +01:00
Nimetu
f1e4fa9739 Fixed: CViewText not updating visible text when used by CCtrlTextButton 2015-11-08 05:15:40 +02:00
Nimetu
356cc7c3df Changed: Allow to set max concurrent cURL connections per CGroupHTML instance 2015-11-08 01:51:34 +02:00
kervala
0afd605acc Fixed: Clang warnings 2015-11-07 18:33:43 +01:00
kervala
4a268da708 Changed: Minor changes (spaces replaced by tabs) 2015-11-07 18:33:16 +01:00
kervala
02633263d0 Fixed: Use ShellExecute to open a document or URL as primary method, because second one doesn't work everytime 2015-11-07 18:31:58 +01:00
kervala
2de3fc3384 Changed: Add support for Spanish 2015-11-07 14:53:07 +01:00
kervala
c4c465b6c7 Fixed: Get system language code under OS X too and added method in NLMISC::CI18N 2015-11-07 14:52:46 +01:00
kervala
2184d13ef4 Fixed: Compilation errors when constant not defined 2015-11-06 15:48:48 +01:00
kervala
72e707bbe0 Changed: Minor changes 2015-11-06 15:48:23 +01:00
kervala
63366b4c9b Fixed: clang warnings 2015-11-06 15:24:19 +01:00
kervala
dc86aa8459 Fixed: Unable to debug Ryzom while client is in fullscreen (bug with Windows 10?) 2015-11-05 16:48:07 +01:00
Nimetu
5f89a64d39 Add basic gif support to CBitmap (issue #238) 2015-11-03 18:50:31 +02:00
kervala
32a82cc7a0 Fixed: Crash when cursor is over WebPage, Outpost or WebIG at first frame, patch by kishan_grimout (issue #245) 2015-11-03 13:40:49 +01:00
Nimetu
97754b7af1 Fixed: Crash in CWidgetManager::sendClockTickEvent when element removed from _ClockMsgTargets (issue #250) 2015-11-03 01:06:12 +02:00
kervala
5db6c42975 Fixed: Avoid warnings of conflicts between Debug and Release DLLs 2015-11-01 16:47:39 +01:00
kaetemi
f54a5e1b8e Be helpful 2015-09-22 16:18:00 +02:00
kaetemi
b7a4075f90 Apply uv channel and transform 2015-09-22 16:00:07 +02:00
kervala
59b97a82ef Fixed: GetVersionEx deprecated under Windows 8.1+ and returns wrong version, replace it by RtlGetVersion from kernel 2015-09-22 09:43:24 +02:00
kaetemi
6e76e869a3 Initial work on UV 2015-09-21 23:47:19 +02:00
kaetemi
6c8a8d7b48 Import material texture 2015-09-21 18:11:35 +02:00
kaetemi
a3c8b2f89c Adjust material import 2015-09-21 15:53:12 +02:00
kaetemi
ad5d1d3ca9 Fix typo 2015-09-20 21:47:26 +02:00
kaetemi
0553734334 Export shape 2015-09-20 21:41:53 +02:00
kaetemi
50f4afda07 Import basic material options 2015-09-20 21:08:30 +02:00
kaetemi
a021dc9eb5 Adjust 2015-09-20 19:12:33 +02:00
kaetemi
f5db005931 Note 2015-09-20 19:06:07 +02:00
kaetemi
9f03654267 Shape import 2015-09-20 19:03:05 +02:00
kaetemi
215237c8c5 Restructure 2015-09-20 17:22:24 +02:00
kaetemi
39e4fc7f23 Skeleton scan 2015-09-20 17:03:44 +02:00
kaetemi
334e154743 Scene meta data 2015-09-20 16:44:56 +02:00
kaetemi
bb016974b7 Centralized asset database configuration 2015-09-20 15:23:27 +02:00
kaetemi
f135f11887 Add pipeline v3 tool logger 2015-09-20 14:08:38 +02:00
kaetemi
607ecda469 Flag bones in scene for skel export 2015-09-19 19:35:57 +02:00
kaetemi
d08d09b341 Command line options 2015-09-19 18:08:25 +02:00
kaetemi
8fc6c08aa6 Placeholder projects 2015-09-19 17:14:35 +02:00
Nimetu
79c101b4a2 Fix 'ah:' urls for untrusted domains 2015-08-11 19:35:27 +03:00
kaetemi
04ce449901 Fix object viewer include issue 2015-07-10 07:54:34 +02:00
kaetemi
5a297fd58d Fix freetype include order
WINSDK added a fttypes.h header...
2015-07-10 06:30:20 +02:00
kaetemi
8602783c96 MFC now requires XP or higher 2015-07-10 06:24:17 +02:00
kaetemi
ab0aed948a Fix DXSDK include order 2015-07-10 06:16:19 +02:00
Nimetu
a62a049f46 Fix missing include when WITH_PCH=OFF 2015-06-17 00:36:54 +03:00
Nimetu
746a0b9f24 Add radio button type to CGroupHTML (issue 237) 2015-03-31 18:47:46 +03:00
kervala
08451bad7d Fixed uint to bool conversion warning 2015-04-25 18:28:03 +02:00
Nimetu
1ae44aecdd Fix compiling on 32bit linux 2015-04-22 13:44:21 +03:00
Nimetu
e14c131332 Fix sending and receiving cookies 2015-04-20 20:51:00 +03:00
Nimetu
db2cee5b84 Fix possible curl handle leak 2015-04-20 20:50:56 +03:00
Nimetu
8d86495364 Fix compiling under windows 2015-04-20 01:04:52 +03:00
Nimetu
f8813e4d2e Replace url parser with one less strict 2015-04-19 22:12:05 +03:00
Nimetu
d7da85970d Make sure image src attribute matches local file or is absolute url 2015-04-19 22:01:46 +03:00
Nimetu
918d2c70fe Fix utf8 tooltips on web links 2015-04-19 20:26:38 +03:00
Nimetu
7e54d79be2 Use cURL as http transport 2015-04-17 17:41:01 +03:00
Nimetu
0933ffc9d2 Ensure that html is valid utf8 and that tags come in correct(ish) order 2015-04-18 23:23:23 +03:00
Nimetu
f3c99aa589 Remove libwww, only keep html entitites list 2015-04-17 15:10:00 +03:00
kaetemi
d77f0c0b42 Add extra light groups for better lightmap control 2015-04-16 17:39:47 +02:00
Jan Boon
14b39953ac Merged in nimetu/ryzomcore/libxml2-html-parser (pull request #127)
implement html parser using libxml2
2015-04-16 17:01:47 +02:00
kaetemi
dc7e040d94 ryzomcore/v0.12.0 2015-04-14 11:55:08 +02:00
Nimetu
6198b7f496 Parse local files (ingame help) with new html parser 2015-04-13 20:53:10 +03:00
Nimetu
55a3c66c78 Implement html parser using libxml2 2015-04-13 20:52:34 +03:00
Nimetu
1f08e3ac94 Remove libwww dependency from CGroupHTML::addLink() signature 2015-04-13 20:51:39 +03:00
kervala
de78560bdd Fixed compilation of font sample 2015-04-05 13:52:05 +02:00
Jan Boon
dd4c90785e Merged in nimetu/ryzomcore (pull request #126)
add bold, italic, underline, strikethrough font styles
2015-04-01 06:20:41 +02:00
kaetemi
4c91c4a7d9 Separate dither matrix per color channel 2015-03-30 12:04:35 +02:00
kaetemi
76a1deb882 Apply bayer dither to TGA16 export for smoother lightmaps 2015-03-30 11:22:25 +02:00
Nimetu
c1670e1318 Add span tag and bold, italic, underline, strikethrough styles to CGroupHTML 2015-03-29 18:24:19 +03:00
Nimetu
a1c11a07ba Add embolden, oblique, underline, strikethrough styles to CViewText 2015-03-29 18:24:16 +03:00
kaetemi
25a399ae9e Use unordered set and map for VS2013, ref #236 2015-03-29 16:58:07 +02:00
kaetemi
63df17a63c Fixup some more hashes 2015-03-29 16:58:07 +02:00
Nimetu
b5b5dcd031 Add embolden, oblique font styles (NL3D) 2015-03-29 17:28:33 +03:00
kaetemi
9cd1a4528c Add Wang hash functions 2015-03-29 03:14:06 +02:00
kervala
c72c040589 Merge with hotfix 2015-03-24 15:52:16 +01:00
kervala
0d83cea719 Fixed compilation with GCC 2015-03-24 15:51:32 +01:00
kaetemi
42944adf1d Merge with hotfix 2015-03-07 00:01:02 +01:00
kaetemi
8d854e3e8d ryzomcore/v0.11.3 2015-03-06 23:53:34 +01:00
kaetemi
eaf44707a7 Merge with hotfix 2015-03-06 23:40:48 +01:00
kaetemi
08dfa4e628 Synchronize versions 2015-03-06 23:37:21 +01:00
kaetemi
a77c5d540b Flag max plugins as windowed 2015-03-06 21:20:01 +01:00
kaetemi
28a7017c00 Flag windowed application when attempting window creation using 3D driver 2015-03-06 21:15:09 +01:00
kaetemi
4afe23c6e3 Some practical improvements for the report handling 2015-03-06 21:07:12 +01:00
kaetemi
c5a40c2616 Merge with feature-crashreport+develop 2015-03-06 21:05:31 +01:00
kaetemi
ac7dcc4ed0 Merge with feature-crashreport 2015-03-06 19:08:13 +01:00
kaetemi
7078fdb064 Replace report functionality 2015-03-06 19:07:25 +01:00
kaetemi
14c10db490 Replace report functionality 2015-03-06 19:06:11 +01:00
kaetemi
f7055db542 Extend debugging sample 2015-03-06 19:06:10 +01:00
kaetemi
4bcb8811d6 Fix checkbox behaviour 2015-03-06 19:06:10 +01:00
kaetemi
0a2c891c75 Extend debugging sample 2015-03-06 19:06:10 +01:00
kaetemi
0c1bba4540 Adjust layout 2015-03-06 19:06:10 +01:00
kaetemi
9523abfe92 Use proper style sheet for crash report under Cinnamon 2015-03-06 19:06:10 +01:00
kaetemi
ea5a53ddc4 Enable crash report tool in debugging sample application 2015-03-06 19:06:10 +01:00
kaetemi
98ff7c1535 Merge with feature-crashreport 2015-03-06 16:01:05 +01:00
dfighter1985
5157e7a137 Default return value. 2015-03-03 03:10:28 +01:00
dfighter1985
2eb7a6648a Merged mainline changes.. 2015-03-03 03:05:14 +01:00
dfighter1985
de5c888318 Don't offer send in non-dev mode when there's no log file specified. 2015-03-03 02:37:51 +01:00
dfighter1985
2d7784aad4 Only send email if the email CB is checked. 2015-03-03 02:33:04 +01:00
dfighter1985
a761910a78 Send report in dev mode if the CB is checked. 2015-03-03 02:30:39 +01:00
kervala
a9f2459f35 Fixed: Compilation with GCC 2015-03-02 23:27:12 +01:00
dfighter1985
a579fbc924 Some more GUI changes. 2015-03-02 21:06:01 +01:00
dfighter1985
da6391ec1e Added return codes as requested. 2015-03-02 20:12:09 +01:00
dfighter1985
3080717012 GUI changes as per requested by Kaetemi. 2015-03-02 19:52:39 +01:00
kervala
29e95e59d3 Changed: Minor change 2015-03-02 13:13:45 +01:00
kervala
2e7e46b8f9 Fixed: Sort files in CFileContainer::addSearchPath too 2015-03-02 13:13:26 +01:00
kervala
d820233d21 Fixed: Skip .hg directories 2015-03-02 13:07:33 +01:00
kervala
619f33fffc Fix #208 linking against static libX11.a 2015-03-02 13:06:51 +01:00
Nimetu
ba1052672f Fix compilation 2015-03-01 18:41:16 +02:00
kaetemi
a84290983f Merge with feature-crashreport 2015-02-24 17:19:41 +01:00
kaetemi
04cca60cac Merge with develop 2015-02-24 17:19:27 +01:00
kaetemi
c60344217a Qt5 compile fix for crash report tool 2015-02-24 17:18:48 +01:00
kaetemi
7fa28fba72 Add isWindowedApplication to INeLContext 2015-02-24 17:17:45 +01:00
kaetemi
1f93a1024f Use ULL suffix for unsigned 64bit integer constants with Visual Studio 2013 2015-02-24 17:17:45 +01:00