Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
7329 commits 14 branches 1 tag 255 MiB
Commit graph

987 commits

Author SHA1 Message Date
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
kervala
3bca3f41cc Changed: Typo 
--HG--
branch : develop
 2015-01-11 14:56:51 +01:00
Nimetu
85f63b7db3 Fix html submit button value that is included with form data (issue #226) 
--HG--
branch : fix-issue-226
 2015-01-09 13:11:20 +02:00
kervala
6596af9682 Changed: Minor changes 
--HG--
branch : develop
 2014-12-26 13:38:02 +01:00
dfighter1985
4d67a41f94 CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 
--HG--
branch : hotfix
 2014-12-21 22:55:27 +01:00
dfighter1985
b6d9e3285f DBViewNumber shouldn't crash anymore. 
--HG--
branch : dfighter-tools
 2014-10-20 20:57:08 +02:00
dfighter1985
2fe2077170 When setting the Id of the decorated edit box, set the Id of the text as well. 
--HG--
branch : dfighter-tools
 2014-10-20 18:51:53 +02:00
Jan Boon
e2eb5d739c Merged in nimetu/ryzomcore/html-table-rendering (pull request #92) 
Some improvements to table rendering

--HG--
branch : develop
 2014-10-18 04:44:34 +02:00
dfighter1985
923b36f0e5 Create the viewtext of the decorated edit box when the box is created, also adjust it so the text is drawn to the right of the left texture. 
--HG--
branch : dfighter-tools
 2014-10-17 21:18:26 +02:00
dfighter1985
18866c88af Update decorated edit box decoration coords while dragging. 
--HG--
branch : dfighter-tools
 2014-10-16 20:58:47 +02:00
dfighter1985
42ebad94f6 Implemented CGroupEditBoxDecor a decorated CGroupEditBox. 
--HG--
branch : dfighter-tools
 2014-10-16 20:25:19 +02:00
dfighter1985
f91846c970 Fix parent pos and size parsing. 
--HG--
branch : dfighter-tools
 2014-10-15 19:46:43 +02:00
Nimetu
0a1a1244ae Change table defaults valign=middle, cellpadding=1, cellspacing=2 
--HG--
branch : html-table-rendering
 2014-10-15 00:02:38 +03:00
Nimetu
799705b7ed Render table with rowspan, colspan. 
Borders, if enabled, adds +1 to cell padding.

--HG--
branch : html-table-rendering
 2014-10-14 15:29:06 +03:00
Nimetu
a53b9305a2 Add rowspan and colspan attributes 
--HG--
branch : html-table-rendering
 2014-10-14 15:26:14 +03:00
dfighter1985
c5cd6990fe When creating a new GUI set the base color to white. 
--HG--
branch : dfighter-tools
 2014-10-13 17:47:42 +02:00
dfighter1985
2dd6278771 Size parent is now queried directly from the widget. 
--HG--
branch : dfighter-tools
 2014-10-13 15:26:47 +02:00
Nimetu
283cbe8092 Add bordercolor attribute to table tag 
--HG--
branch : html-table-rendering
 2014-10-13 01:10:46 +03:00
dfighter1985
b3dd26e01c Parent positions should now be saved right again. 
--HG--
branch : dfighter-tools
 2014-10-12 23:05:22 +02:00
dfighter1985
ded18b266c Implemented new action. 
--HG--
branch : dfighter-tools
 2014-10-11 21:43:28 +02:00
dfighter1985
e5d2e9293d Moved CRootGroup out of CInterfaceParser. 
--HG--
branch : dfighter-tools
 2014-10-11 19:30:30 +02:00
dfighter1985
7e16e95c35 CInterfaceParser in editor mode should look for files in the working directory first. 
--HG--
branch : dfighter-tools
 2014-10-11 16:26:38 +02:00
dfighter1985
481298b9f1 Merged develop 
--HG--
branch : dfighter-tools
 2014-10-11 02:15:07 +02:00
dfighter1985
7b45a05562 Added support for grouping widgets. 
--HG--
branch : dfighter-tools
 2014-10-11 00:42:43 +02:00
dfighter1985
aac2fd41a1 Allow multiselection. 
--HG--
branch : dfighter-tools
 2014-10-10 20:25:25 +02:00
kervala
e34ba83f26 Minor changes 
--HG--
branch : develop
 2014-10-10 13:08:14 +02:00
kaetemi
74827a1808 Handle shadow outline in gui 
--HG--
branch : develop
 2014-10-08 23:20:35 +02:00
kaetemi
3edfd56c75 Implement text shade outline 
--HG--
branch : develop
 2014-10-08 23:20:34 +02:00
dfighter1985
a1e2c5667a A little crash fix. 
--HG--
branch : dfighter-tools
 2014-10-08 21:28:20 +02:00
dfighter1985
3ffe56b862 Added support for ungrouping. 
--HG--
branch : dfighter-tools
 2014-10-08 20:36:16 +02:00
dfighter1985
d7d62e690c Make group selection optional. 
--HG--
branch : dfighter-tools
 2014-10-08 18:45:17 +02:00
dfighter1985
64571abd47 When moving a group draw it's children too. 
--HG--
branch : dfighter-tools
 2014-10-08 17:52:56 +02:00
kaetemi
ec68d2c317 Fix rendering of specially sized window highlights 
--HG--
branch : develop
 2014-10-08 09:31:13 +02:00
kaetemi
88a9a809a9 Add inset_t parameter to layer options, allows putting header graphics in top texture 
--HG--
branch : develop
 2014-10-04 01:43:27 +02:00
dfighter1985
d2587df8c1 From now on dragged widgets will be re-aligned on drop. They will find the nearest hotspot of the group they are dropped into, and calculate an offset so they will align to the hotspot and yet remain where they were dropped. 
--HG--
branch : dfighter-tools
 2014-09-29 20:29:04 +02:00
dfighter1985
2603ad3a2b Refactoring. Added CInterfaceFactory. 
--HG--
branch : dfighter-tools
 2014-09-27 21:48:51 +02:00
dfighter1985
0055e2dd91 A little refactoring. 
--HG--
branch : dfighter-tools
 2014-09-27 20:15:46 +02:00
dfighter1985
4797b150d8 Move the text too with the text button. 
--HG--
branch : dfighter-tools
 2014-09-27 19:54:19 +02:00
Nimetu
0d62650159 Add maxlength attribute to input and textarea tags 
--HG--
branch : html-maxlength-attr
 2014-09-27 15:55:57 +03:00
dfighter1985
006f87278b Refactored IWidgetAdditionWatcher, now it's called IWidgetWatcher and it also reports widget moves. 
--HG--
branch : dfighter-tools
 2014-09-24 23:32:24 +02:00
dfighter1985
a658be39b7 No need for free floating elements when we can simply reparent to the top window... 
--HG--
branch : dfighter-tools
 2014-09-24 22:59:40 +02:00
dfighter1985
bd7cb1eea3 Add widget to a new parent when the widget being dragged is dropped, otherwise add it to the orphanlist so that it's drawn anyways. NOTE: The dropped widget can be clipped. If it is clipped, it never shows up even tho it's there. 
--HG--
branch : dfighter-tools
 2014-09-24 18:45:52 +02:00
dfighter1985
62744db86d Dragged elements will no longer disappear. 
--HG--
branch : dfighter-tools
 2014-09-24 16:20:25 +02:00
dfighter1985
7a4d9e2cdc Merged the gui-editor branch. 
--HG--
branch : dfighter-tools
 2014-09-17 21:12:14 +02:00
kaetemi
d12ccf194e Merge with develop 
--HG--
branch : multipass-stereo
 2014-09-12 15:19:12 +02:00
kaetemi
0d7c9fd4bf When in Rome, do as the Romans do 2014-09-11 10:36:41 +02:00
dfighter1985
46e3242557 Merged default. 
--HG--
branch : dfighter-tools
 2014-09-05 22:28:11 +02:00
dfighter1985
ff0df2bf50 Added support for manipulating atoms. 
--HG--
branch : dfighter-tools
 2014-09-05 20:28:43 +02:00
kervala
ff370bb49f Changed: Code formatting 2014-09-05 15:42:53 +02:00
dfighter1985
c51b519845 Implemented add and remove buttons. 
--HG--
branch : dfighter-tools
 2014-09-02 19:26:02 +02:00
dfighter1985
f1a6a8d9cd Apply changes. 
--HG--
branch : dfighter-tools
 2014-09-02 14:54:07 +02:00
kervala
f57380f19b Changed: Including malloc/malloc.h is useless 2014-08-27 11:21:47 +02:00
kervala
8d3ea38ffc Fixed: Compilation under Mac OS X (malloc is already aligned on 16 bytes and memalign doesn't exist) 2014-08-27 11:16:30 +02:00
kaetemi
da5558d50a Merge with default 
--HG--
branch : multipass-stereo
 2014-08-19 15:43:49 +02:00
dfighter1985
a810b29ec7 Merged default. 
--HG--
branch : gsoc2014-dfighter
 2014-08-19 00:33:03 +02:00
kervala
41f6e70dc9 Fixed #172 XML floating point serialization not using neutral culture 2014-08-17 15:39:30 +02:00
kaetemi
38abf2193f Project client loading screens into 3D space for HMD 
--HG--
branch : multipass-stereo
 2014-08-07 18:49:05 +02:00
kaetemi
e2bfb5d542 Clean handling of display mode switching in client 
--HG--
branch : multipass-stereo
 2014-08-07 04:36:51 +02:00
kaetemi
7c39f7d33b Specify monitor when changing display mode 
--HG--
branch : multipass-stereo
 2014-08-07 01:04:58 +02:00
dfighter1985
0f7e1c022a Merge default 
--HG--
branch : gsoc2014-dfighter
 2014-08-07 00:03:09 +02:00
kaetemi
4e33e5cf2f Process some scene traversals only once when rendering in stereo 
--HG--
branch : multipass-stereo
 2014-08-06 14:36:09 +02:00
kaetemi
3fd358d69d OVR: Convert texture coordinates and setup rendering material 
--HG--
branch : multipass-stereo
 2014-08-05 03:54:19 +02:00
dfighter1985
d21aa2b678 Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes. 
--HG--
branch : gsoc2014-dfighter
 2014-08-05 02:58:31 +02:00
kaetemi
6ad1d14617 OVR: Test distortion mesh 
--HG--
branch : multipass-stereo
 2014-08-05 02:55:26 +02:00
kaetemi
339c8b8dfa 3D: Render target matrix context fix 
--HG--
branch : multipass-stereo
 2014-08-05 02:21:30 +02:00
kaetemi
33235bdf6c OVR: Testing 
--HG--
branch : multipass-stereo
 2014-08-05 01:49:45 +02:00
kaetemi
2e6893fd48 OVR: Translate camera 
--HG--
branch : multipass-stereo
 2014-08-05 00:51:53 +02:00
kaetemi
9b79a44f8a OVR: Get orientation 
--HG--
branch : multipass-stereo
 2014-08-05 00:46:04 +02:00
kaetemi
262c1f84a9 OVR: Generate distortion mesh 
--HG--
branch : multipass-stereo
 2014-08-05 00:20:21 +02:00
kaetemi
99ea2c685c OVR: Read device descriptions 
--HG--
branch : multipass-stereo
 2014-08-04 20:32:31 +02:00
kaetemi
f2274d2378 OVR: Iterate devices 
--HG--
branch : multipass-stereo
 2014-08-04 19:19:15 +02:00
kaetemi
b9e10fca72 Cleanup 
--HG--
branch : multipass-stereo
 2014-08-04 18:31:31 +02:00
kaetemi
0488b706b2 Add placeholders for LibOVR 0.4.0 support 
--HG--
branch : multipass-stereo
 2014-08-04 18:30:25 +02:00
kaetemi
ec4762f669 3D: Add FXAA 
--HG--
branch : multipass-stereo
 2014-08-04 04:44:27 +02:00
kaetemi
d98f1ede47 Move default render target handling to CDriverUser 
--HG--
branch : multipass-stereo
 2014-08-04 00:57:43 +02:00
kaetemi
e88dedf00c Adjust render target handling for effects 
--HG--
branch : multipass-stereo
 2014-08-03 22:15:44 +02:00
kaetemi
6c3bcc2439 Merge with default 
--HG--
branch : multipass-stereo
 2014-08-03 22:15:39 +02:00
dfighter1985
30bae94ac3 Started to rework tile checks, tile banks loading / saving. A tilebank will now be in the tilemodel, and it will work from there. Also moved some constants into an independent file. 
--HG--
branch : gsoc2014-dfighter
 2014-08-03 21:33:13 +02:00
kaetemi
6a21d0503c 3D: Cleanup bloom effect 
--HG--
branch : multipass-stereo
 2014-08-03 21:09:55 +02:00
kaetemi
8af686f7ef 3D: Cleanup bloom effect 
--HG--
branch : multipass-stereo
 2014-08-03 20:35:05 +02:00
kervala
7aedffce9a Changed: #172 XML floating point serialization not using neutral culture (for VC++ 2005 and up) 2014-08-02 11:18:24 +02:00
kaetemi
c11706feb8 Project GUI into space 
--HG--
branch : multipass-stereo
 2014-08-01 15:44:12 +02:00
kaetemi
caefb04928 Restore camera and scene viewport after disabling VR 
--HG--
branch : multipass-stereo
 2014-08-01 13:20:55 +02:00
kaetemi
79c6f50054 Render target format (for alpha) 
--HG--
branch : multipass-stereo
 2014-07-31 18:25:50 +02:00
kaetemi
22d03c5f79 Mode2D selection 
--HG--
branch : multipass-stereo
 2014-07-31 03:53:38 +02:00
kaetemi
dac5b2d274 Merge with game-device 
--HG--
branch : multipass-stereo
 2014-07-31 02:07:20 +02:00
kaetemi
b1e2b60381 Add render target manager, issue #47 
--HG--
branch : multipass-stereo
 2014-07-31 00:46:00 +02:00
dfighter1985
431178321f TileBank loading. 
--HG--
branch : gsoc2014-dfighter
 2014-07-30 10:54:08 +02:00
dfighter1985
8373118c7e Merged default. 
--HG--
branch : gsoc2014-dfighter
 2014-07-22 00:15:50 +02:00
KISHAN GRIMOUT
b9dc8ace7e fix windows 64-bit crash in client due to VS 64-bit compiler bug, fix #164 2014-07-16 13:47:08 +02:00
kaetemi
176c3d8a4a Add callback template class 
--HG--
branch : develop
 2014-07-12 18:19:25 +02:00
kaetemi
7487ea4135 Higher quality outline, visual difference is relevant only for black 
--HG--
branch : develop
 2014-10-16 02:00:45 +02:00
kaetemi
496f7f268c Trash DirectInput 
--HG--
branch : game-device
 2014-07-12 17:17:24 +02:00
dfighter1985
012ad96806 Texture chooser now supports atlas textures as well. 
--HG--
branch : gsoc2014-dfighter
 2014-07-09 21:07:12 +02:00
kaetemi
e729a9d035 Fix #162: Center ingame mouse cursor after login 2014-07-09 12:31:22 +02:00
kaetemi
f281622d47 Trash DirectInput 
--HG--
branch : game-device
 2014-07-08 22:21:11 +02:00
dfighter1985
fe58435bb5 CPath can now return the file list with a path filter. 
--HG--
branch : gsoc2014-dfighter
 2014-07-06 23:21:25 +02:00
dfighter1985
085c1b41b9 Added facilities for viewing the loaded actions. 
--HG--
branch : gsoc2014-dfighter
 2014-07-02 22:27:04 +02:00
dfighter1985
842ca366de Tooltip posrefs are now enums in the GUI Editor. 
--HG--
branch : gsoc2014-dfighter
 2014-06-29 01:44:06 +02:00
kaetemi
655c22e839 Fix compile 2014-06-20 23:24:54 +02:00
kaetemi
43a061bebd SSE2: Compile fix 
--HG--
branch : sse2
 2014-06-20 03:08:51 +02:00
kaetemi
6734852fa3 SSE2: Ensure correct allocator is used 
--HG--
branch : sse2
 2014-06-14 00:38:35 +02:00
kaetemi
71a598db7e SSE2: Remove dead code 
--HG--
branch : sse2
 2014-06-13 22:21:07 +02:00
kaetemi
848932f93a SSE2: Fix for MinGW 
--HG--
branch : sse2
 2014-06-19 00:05:43 +02:00
kaetemi
ac3e69b8ab Merge with default 
--HG--
branch : sse2
 2014-06-20 03:01:32 +02:00
kaetemi
b18203fc4e Fix Ryzom server compile under MinGW 2014-06-19 20:19:39 +02:00
kaetemi
43be0fd2a5 Fix D3D driver compile under MinGW 2014-06-18 16:29:02 +02:00
kaetemi
75f7b9f931 Fix Snowballs service compile under MinGW 2014-06-18 12:52:03 +02:00
kaetemi
f4fd8bb669 Fix linking of OpenGL driver under MinGW 2014-06-18 01:21:05 +02:00
kaetemi
3dd11fe157 Fix compilation of NLMISC under MinGW 2014-06-17 21:48:25 +02:00
kaetemi
f6ad306a57 SSE2: Add macro for force inline 
--HG--
branch : sse2
 2014-06-13 20:25:45 +02:00
kaetemi
d3fb390cf3 SSE2: Align CMatrix 
--HG--
branch : sse2
 2014-06-13 19:33:09 +02:00
kaetemi
556a41afee SSE2: Implement alignment for arena allocator 
--HG--
branch : sse2
 2014-06-13 19:26:22 +02:00
kaetemi
eee9ba0cae SSE2: Add aligned allocators 
--HG--
branch : sse2
 2014-06-13 19:12:31 +02:00
kaetemi
1a4a7bafab Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea 2014-04-30 12:54:20 +02:00
kaetemi
798d207d0d Fix EOL 2014-04-30 12:53:06 +02:00
dfighter1985
4abf74d6e9 We can now drag elements, they will disappear and whatnot, but at least they can be dragged! 
--HG--
branch : gui-editor
 2014-04-21 19:30:33 +02:00
dfighter1985
e12d189d51 Refactored input event handling a bit. 
--HG--
branch : gui-editor
 2014-04-20 21:41:57 +02:00
dfighter1985
41f44b2aa6 Merge default. 
--HG--
branch : gsoc2012-gui-editor
 2014-04-19 21:53:29 +02:00
kaetemi
5ed5cd5ea8 Add interface for HMD with player death support 2014-04-01 13:14:44 +02:00
kervala
62eb6347e5 Changed: Aligned methods names 2014-03-27 16:34:55 +01:00
kaetemi
40fe633dbe Fix thread lockup in zone lighter 
--HG--
branch : build_pipeline_py
 2014-02-07 02:01:23 +01:00
kaetemi
89a2a2ce99 Do not select stereo display debugger when HMD is set to Auto in Snowballs 2014-02-04 20:52:15 +01:00
kaetemi
bcb2f48940 Remove georges4cvs feature 2014-02-03 00:16:35 +01:00
kervala
c9a9839ce6 Fixed: Compilation under Mac OS X 10.9 (new libc++ tr1 namespace is std not std::tr1) 2014-01-30 16:14:25 +01:00
kervala
1c50b1f943 Fixed: Compilation under Mac OS X 10.9 2014-01-30 14:43:51 +01:00
Nimetu
4c2531474a Fix typo (issue #70) 
--HG--
branch : misc-patches
 2014-01-03 19:51:50 +02:00
kervala
b219623129 Fixed: Verbose warning 2013-11-13 22:23:57 +01:00
kervala
dda2215ed8 Fixed: Wrong algorithm 2013-11-13 21:46:42 +01:00
kervala
6695a9064e Changed: Created NELID macro to fix warning "multi-character character constant" 2013-09-22 13:10:57 +02:00
kaetemi
ce9e0a397b Fix regression from stereo branch in wind tree 2013-09-14 18:58:23 +02:00
kaetemi
3c099397d8 Update supportVertexProgram calls 2013-09-14 16:43:36 +02:00
kaetemi
e99bc7ba69 Remove old interface 2013-09-14 16:45:00 +02:00
kaetemi
256f7ff06c Cleanup unused code 2013-09-14 16:23:11 +02:00
kaetemi
6dfc8d0a00 Rename 
--HG--
branch : multipass-stereo
 2013-09-14 00:46:10 +02:00
kaetemi
973215e1d0 Cleanup 
--HG--
branch : multipass-stereo
 2013-09-14 00:36:06 +02:00
kaetemi
96dc139ddd Merge with default 
--HG--
branch : multipass-stereo
 2013-09-13 23:24:13 +02:00
kaetemi
df123d6b89 Fix compile errors caused by missing includes 2013-09-13 23:23:19 +02:00
kaetemi
f9c9c1836a Use named uniform indices for lighted vertex program 
--HG--
branch : multipass-stereo
 2013-09-13 21:31:47 +02:00
kaetemi
61af565bf9 Updated wind tree program container 
--HG--
branch : multipass-stereo
 2013-09-13 20:45:06 +02:00
kaetemi
c353121771 Use lighted vertex program container for per pixel light program 
--HG--
branch : multipass-stereo
 2013-09-13 20:00:20 +02:00
kaetemi
a72f25e763 Add container for lighted vertex program 
--HG--
branch : multipass-stereo
 2013-09-13 19:03:05 +02:00
kaetemi
5e14dc4458 Update veget implementation 
--HG--
branch : multipass-stereo
 2013-09-13 17:09:05 +02:00
kaetemi
c6139419ac Partial update of veget vp 
--HG--
branch : multipass-stereo
 2013-09-10 19:52:14 +02:00
kaetemi
88cbc2f82b Simplify 
--HG--
branch : multipass-stereo
 2013-09-10 15:59:31 +02:00
kaetemi
abafc9b1ef Adjust landscape vertex program to use new interface 
--HG--
branch : multipass-stereo
 2013-09-10 15:42:42 +02:00
kaetemi
5ad617efb6 Use new program interface for water vertex program 
--HG--
branch : multipass-stereo
 2013-09-10 02:07:16 +02:00
kaetemi
64643e564b Some fixes 
--HG--
branch : multipass-stereo
 2013-09-10 01:29:53 +02:00
kaetemi
0429e67903 Use CSmartPtr for vertex program 
--HG--
branch : multipass-stereo
 2013-09-10 00:31:26 +02:00
kaetemi
484a946c60 Fix incorrectly removed line 
--HG--
branch : multipass-stereo
 2013-09-09 23:03:52 +02:00
kaetemi
b03895f5f3 Missed file in last commit 
--HG--
branch : multipass-stereo
 2013-09-09 23:01:43 +02:00
kaetemi
e3dead19e4 Replace temporary CMaterial code 
--HG--
branch : multipass-stereo
 2013-09-09 21:44:14 +02:00
kaetemi
87b24bc4ab Add glsl pixel program for stereo distortion 
--HG--
branch : multipass-stereo
 2013-09-09 20:49:59 +02:00
kaetemi
ac2e087fbf Cleanup abstract gpu program interface 
--HG--
branch : multipass-stereo
 2013-09-09 18:33:38 +02:00
kaetemi
81876009d3 Implement new driver interface in OpenGL driver 
--HG--
branch : multipass-stereo
 2013-09-09 14:43:10 +02:00
kaetemi
d1b93ac3d6 Expand parameter interface 
--HG--
branch : multipass-stereo
 2013-09-09 12:18:20 +02:00
kaetemi
e84e08b0f6 Reduce function duplication 
--HG--
branch : multipass-stereo
 2013-09-09 02:03:40 +02:00
kaetemi
4d1b5d90c0 Builtin parameter set functions 
--HG--
branch : multipass-stereo
 2013-09-09 01:53:02 +02:00
kaetemi
afe6c16bf3 Separate count and size 
--HG--
branch : multipass-stereo
 2013-09-09 01:31:15 +02:00
kaetemi
05583d134a Cleanup driver interface 
--HG--
branch : multipass-stereo
 2013-09-08 21:57:27 +02:00
kaetemi
235bfcfd94 Add additional set functions 
--HG--
branch : multipass-stereo
 2013-09-08 01:49:34 +02:00
kaetemi
f0af3326e6 Add gpu program params storage structure 
--HG--
branch : multipass-stereo
 2013-09-08 01:36:01 +02:00
kaetemi
ee0396bd6f Implement new gpu program interface in direct3d driver 
--HG--
branch : multipass-stereo
 2013-09-07 22:00:07 +02:00
kaetemi
350b580085 Implement new gpu program interface in opengl driver 
--HG--
branch : multipass-stereo
 2013-09-07 21:30:40 +02:00
kaetemi
1fa02cae9e Make gpu programs use abstract gpu program class 
--HG--
branch : multipass-stereo
 2013-09-07 20:41:07 +02:00
kaetemi
97c9c26690 Add abstract gpu program and source classes 
--HG--
branch : multipass-stereo
 2013-09-07 18:33:18 +02:00
Thibaut Girka
ea8a845ab9 Add support for LibVR 
--HG--
branch : multipass-stereo
 2013-08-28 08:08:22 +02:00
kaetemi
96b2df8405 Merge with default 
--HG--
branch : multipass-stereo
 2013-08-01 23:02:49 +02:00
kaetemi
53bebec880 Add some basic prediction to CCDBNodeBranch::find 
--HG--
branch : kaetemi-optimize
 2013-08-01 22:47:46 +02:00
kaetemi
5a9537dfcc Avoid having to use 'set' action handler, which parses the value expression on every use, in interface links by implementing use of cdb nodes as targets 
--HG--
branch : kaetemi-optimize
 2013-07-28 05:10:07 +02:00
kaetemi
7bb8dec40c Parse action handler condition for interface link in advance 
--HG--
branch : kaetemi-optimize
 2013-07-28 03:02:07 +02:00
kaetemi
d5308215aa Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager 
--HG--
branch : kaetemi-optimize
 2013-07-28 00:48:34 +02:00
kaetemi
1e9771d054 Merge with default 
--HG--
branch : multipass-stereo
 2013-07-25 00:37:00 +02:00
kervala
296b4384a8 Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange) 2013-07-24 18:47:04 +02:00
Michael Witrant
293601e80e Fixed definition tests for optional LibOVR 
--HG--
branch : multipass-stereo
 2013-07-06 20:40:42 +02:00
Michael Witrant
a33a0e5c56 LibOVR is optional, and is disabled by default 
--HG--
branch : multipass-stereo
 2013-07-06 20:05:19 +02:00
kaetemi
b1aaf05bf6 Init/release VR interfaces in ryzom client, ref #43 
--HG--
branch : multipass-stereo
 2013-07-05 02:04:34 +02:00
kaetemi
dcd77495ca Fix particles being animated twice in stereo render, see #43 
--HG--
branch : multipass-stereo
 2013-07-04 00:42:06 +02:00
kaetemi
bf8bd64f0d Add stereo debugger for visually comparing rendered frames, ref #43 
--HG--
branch : multipass-stereo
 2013-07-04 00:09:10 +02:00
kaetemi
1fe2b62eb1 Add minimal head model and world scale, ref #43 
--HG--
branch : multipass-stereo
 2013-07-03 05:21:32 +02:00
kaetemi
0dd8764e45 Make bloom work together with render target used for the rift shader, ref #43 
--HG--
branch : multipass-stereo
 2013-07-03 03:53:32 +02:00
kaetemi
52f4a37939 Remove unnecessary user render target code from bloom, see #43 
--HG--
branch : multipass-stereo
 2013-07-03 03:21:57 +02:00
kaetemi
43f8adff79 Render left and right deformed view, re #43 
--HG--
branch : multipass-stereo
 2013-07-02 03:34:49 +02:00
kaetemi
ce92c13289 Test the barrel shader, see #43 
--HG--
branch : multipass-stereo
 2013-07-02 02:40:27 +02:00
kaetemi
c5c6f7c871 Render the scene to a target texture for the stereo rendering filter, ref #43 
--HG--
branch : multipass-stereo
 2013-07-02 00:55:13 +02:00
kaetemi
7766116494 Fix a render target issue, see #43 
--HG--
branch : multipass-stereo
 2013-07-02 00:53:45 +02:00
kaetemi
c5e1235cbb Create stereo render target, see #43 
--HG--
branch : multipass-stereo
 2013-07-01 23:23:54 +02:00
kaetemi
85109102b2 Add interface for stereo display render targets, ref #43 
--HG--
branch : multipass-stereo
 2013-07-01 21:23:47 +02:00
kaetemi
5f229667bc Create interface classes for stereo displays and head mounted displays, see #43 
--HG--
branch : multipass-stereo
 2013-06-28 23:19:32 +02:00
kaetemi
1cc5848220 Create a clipping frustum, ref #43 
--HG--
branch : multipass-stereo
 2013-06-26 21:35:36 +02:00
kaetemi
e7842982a0 Allow multiple user cameras to be calculated separately, useful for sky etc, re #43 
--HG--
branch : multipass-stereo
 2013-06-26 20:57:37 +02:00
kaetemi
4864ce7a5a Add eye distance in 2D interface shift, re #43 
--HG--
branch : multipass-stereo
 2013-06-26 17:24:23 +02:00
kaetemi
5423d4d025 Add 2D interface shifting calculations, see #43 
--HG--
branch : multipass-stereo
 2013-06-26 16:59:08 +02:00
kaetemi
d1bf069708 Add some comments, see #43 
--HG--
branch : multipass-stereo
 2013-06-26 15:55:39 +02:00
kaetemi
91be2d64bd Cleanup and make bloom work with stereo rendering, re #43 
--HG--
branch : multipass-stereo
 2013-06-26 15:49:31 +02:00
kaetemi
32a187a199 Render from multiple cameras, see #43 
--HG--
branch : multipass-stereo
 2013-06-26 08:00:19 +02:00
kaetemi
a5c9592165 Read sensor data and set camera in snowballs, ref #43 
--HG--
branch : multipass-stereo
 2013-06-26 04:57:58 +02:00
kaetemi
a79b9f7e65 Add library name to device name, re #43 
--HG--
branch : multipass-stereo
 2013-06-26 02:55:15 +02:00
kaetemi
64821ab4de List stereo devices, see #43 
--HG--
branch : multipass-stereo
 2013-06-26 02:45:49 +02:00
kaetemi
8ded099fbb Added some notes 
--HG--
branch : multipass-stereo
 2013-06-20 00:25:52 +02:00
kaetemi
78179ed809 Rename some functions to follow the same naming convention of others 
--HG--
branch : multipass-stereo
 2013-06-19 23:49:39 +02:00
kaetemi
ad5b60963f Cleanup 
--HG--
branch : multipass-stereo
 2013-06-19 23:34:40 +02:00
kaetemi
be33bbc70f Add support for fp40 with opengl 
--HG--
branch : multipass-stereo
 2013-06-19 22:41:03 +02:00
kaetemi
3e91b1a5cf Test texture with postprocessing material, seems to work with opengl 
--HG--
branch : multipass-stereo
 2013-06-19 20:47:23 +02:00
kaetemi
dfb110b387 Add function to check which pixel program profiles are available on a driver 
--HG--
branch : multipass-stereo
 2013-06-19 05:03:47 +02:00
kaetemi
9f1ddc9202 Add test for ps.1.1 pixel program in snowballs (it works too now) 
--HG--
branch : multipass-stereo
 2013-06-19 04:03:32 +02:00
kaetemi
4200483383 Removed unneeded parser related code from the opengl pixel program implementation 
--HG--
branch : multipass-stereo
 2013-06-19 02:33:19 +02:00
kaetemi
f08de2dcdc Added diff to opengl driver for old nevrax pixel program code, marked todos in comments 
--HG--
branch : multipass-stereo
 2013-06-19 02:01:12 +02:00
kaetemi
983fab378c Add rest of the diff from the old nevrax code for pixel programs to NL3D 
--HG--
branch : multipass-stereo
 2013-06-19 01:38:23 +02:00
kaetemi
ef720f764f Removed some CEffect related bit that slipped in 
--HG--
branch : multipass-stereo
 2013-06-19 01:22:26 +02:00
kaetemi
3927378399 Add diff from old nevrax pixel program code to IDriver, CEffect related code not included 
--HG--
branch : multipass-stereo
 2013-06-19 01:20:51 +02:00
kaetemi
7be5858010 Simplify CPixelProgram 
--HG--
branch : multipass-stereo
 2013-06-19 01:19:45 +02:00
kaetemi
16d47d742f Add some files from old nevrax shader code for exposing pixel programs in the drivers 
--HG--
branch : multipass-stereo
 2013-06-19 01:14:30 +02:00
kaetemi
f63a275f2b Backed out changeset ea4b76b7213a, bad approach 
--HG--
branch : multipass-stereo
 2013-06-19 01:03:20 +02:00
kaetemi
c7994bb11f Allow rendering with bloom to a user provided render target (untested) (#43) 
--HG--
branch : multipass-stereo
 2013-06-17 00:45:17 +02:00
kaetemi
87c30bceea Add info structure for multipass camera rendering effects #43 
--HG--
branch : multipass-stereo
 2013-06-16 20:48:17 +02:00
kaetemi
3b9f934b82 Fixes to compile Ryzom Client with lua 5.2 2013-06-16 03:43:45 +02:00
kaetemi
d139185b1e Compile NLGUI with lua 5.2 2013-06-16 02:33:04 +02:00
dfighter1985
337f93a233 When adding a new widget, the correct widget is now instantiated. Also added some checks. 
--HG--
branch : gsoc2012-gui-editor
 2013-05-09 23:57:48 +02:00
dfighter1985
142bc623c9 Some more work for widget adding support. Basically the system works, just need to make sure the proper widget is instantiated, and the defaults are loaded ( so it shows up ). 
--HG--
branch : gsoc2012-gui-editor
 2013-05-09 05:53:14 +02:00
dfighter1985
a0af49fd40 Merged default. 
--HG--
branch : gsoc2012-gui-editor
 2013-05-04 22:28:31 +02:00
Dzmitry Kamiahin
68fe576f01 Fixed self-comparsion in ps. 2013-05-04 01:57:53 +03:00
dfighter1985
67a24bb1b0 Merged default 
--HG--
branch : gsoc2012-gui-editor
 2013-05-03 02:07:38 +02:00
kervala
0624da9c82 Changed: Added a new event EventCloseWindowId when system reports window should be closed 2013-04-29 11:15:14 +02:00
kervala
381eeaef8a Fixed: Virtual destructor warning 2013-04-29 10:41:34 +02:00
kervala
0c2e2d3e8f fixes #32 build failure/error using clang 2013-03-26 13:56:16 +01:00
dfighter1985
d2fd01393f Merging default. 
--HG--
branch : gsoc2012-gui-editor
 2013-03-12 07:17:04 +01:00
dfighter1985
526da8ddf8 MODIFIED: no more action handler spam. 2013-03-12 07:16:16 +01:00
dfighter1985
7aee088634 FIXED: Deleting the CViewText of CCtrlTextButton should no longer lead to crashes. 
--HG--
branch : gsoc2012-gui-editor
 2013-03-10 00:56:27 +01:00
dfighter1985
df834e0584 FIXED: Widgets will no longer get stuck in the widget hierarchy tree, when deleting their parent. 
--HG--
branch : gsoc2012-gui-editor
 2013-03-09 22:02:31 +01:00
dfighter1985
363154e241 MODIFIED: Preliminary support for a little cleanup when removing a widget from it's parent group ( for example when moving the widget ). 
--HG--
branch : gsoc2012-gui-editor
 2013-03-08 06:28:52 +01:00
dfighter1985
aa2affa158 MODIFIED: Draw the highlight of the currently selected widget in editor mode. 
--HG--
branch : gsoc2012-gui-editor
 2013-03-07 06:01:33 +01:00
dfighter1985
b80c47cc10 MODIFIED: Somehow I left this here, and it prevented viewtexts from being selected. 
--HG--
branch : gsoc2012-gui-editor
 2013-03-03 00:54:22 +01:00
dfighter1985
48d50cb409 MODIFIED: Text buttons will now delete their text too when being deleted. 
--HG--
branch : gsoc2012-gui-editor
 2013-03-02 23:27:17 +01:00
dfighter1985
026ccfcd13 MODIFIED: GUI Editor can now delete widgets. 
--HG--
branch : gsoc2012-gui-editor
 2013-03-02 06:57:40 +01:00
dfighter1985
365ef61ec9 MODIFIED: Update property browser when selecting in the central widget. 
--HG--
branch : gsoc2012-gui-editor
 2013-02-23 06:55:19 +01:00
dfighter1985
3a7f25bc79 MODIFIED: Views can now be selected too from the central widget. 
--HG--
branch : gsoc2012-gui-editor
 2013-02-23 00:13:44 +01:00
dfighter1985
fe456d91b6 GUI Editor no longer depends on RTTI typename, instead it uses GetClassName() string provided by DECLARE_UI_CLASS(). 2013-02-20 22:05:09 +01:00
mattraykowski
6e309fee7a changed #20 - moved the libwww package discovery and fixed include paths in library project. 2013-02-19 10:04:40 -06:00
dfighter1985
ecbcdf388f MODIFIED: Resolved some GCC build errors. 2013-02-17 14:30:05 +01:00
mattraykowski
e7e51f01e0 merging gui editor repo. 2013-02-14 09:53:06 -06:00
dfighter1985
fcb736c387 Merged mainline default branch changes. 
--HG--
branch : gsoc2012-gui-editor
 2013-02-14 10:47:10 +01:00
kervala
4f8b62acb4 Changed: Typo fixes (Thanks to DuDraig!) 2013-02-12 17:35:51 +01:00
kervala
6e498aefad Changed: Typo fixes (thanks to Vagrant!) 2013-02-09 10:05:32 +01:00
kervala
3416ec2824 Changed: Warnings with clang 2013-02-08 18:17:42 +01:00
kervala
45c8b20f39 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
kervala
5efeb5ba62 Fixed: Compilation with VC++ 2010 and 2012 2012-12-11 12:22:41 +01:00
kervala
c8172d233c Changed: PCH optimizations 2012-12-11 11:59:54 +01:00
kervala
41f4cf2979 Fixed: Include libxml2 header 2012-12-08 13:13:00 +01:00
kervala
7f4ac72ef3 Changed: Minor typos 2012-12-08 12:07:23 +01:00
kervala
4daf3bd009 Changed: Compilation with PCH optimizations 2012-12-08 11:32:31 +01:00