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

1425 commits

Author SHA1 Message Date
kervala
e8ff07fe7d Fixed: Removed raw mouse mode for OS X too 
--HG--
branch : develop
 2015-01-10 19:55:05 +01:00
kervala
5b9ac59f49 Fixed: OpenGL driver compilation 
--HG--
branch : develop
 2015-01-10 19:53:27 +01:00
kervala
418e0ee7b7 Merge 
--HG--
branch : develop
 2015-01-10 19:08:55 +01:00
kervala
99c88bd515 Changed: Minor changes 
--HG--
branch : develop
 2015-01-10 18:45:14 +01:00
kervala
2869d5f1ac Fixed: OpenGL ES driver compilation 
--HG--
branch : develop
 2015-01-10 18:41:54 +01:00
kervala
0f22ea7777 Changed: More aliases for OpenGL ES functions and defines to simplify code 
--HG--
branch : develop
 2015-01-10 18:41:18 +01:00
Jan Boon
d360f78a1c Merged in nimetu/ryzomcore/fix-issue-225 (pull request #98) 
CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225)

--HG--
branch : develop
 2015-01-09 18:09:17 +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
Nimetu
fbea1d2173 CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225) 
--HG--
branch : fix-issue-225
 2015-01-09 12:59:53 +02:00
kervala
6596af9682 Changed: Minor changes 
--HG--
branch : develop
 2014-12-26 13:38:02 +01:00
kaetemi
c03c0f532b Merge with default 
--HG--
branch : develop
 2014-12-22 14:26:26 +01:00
kaetemi
a43fb4dba8 Move to hotfix: 287c1142e5ea 
--HG--
branch : develop
 2014-12-22 14:08:29 +01:00
dfighter1985
f189a98422 Ported changeset 9878ab4: CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 
--HG--
branch : develop
 2014-12-22 01:26:04 +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
kaetemi
58590a9e7e Fix offscreen rendering mode 
--HG--
branch : develop
 2014-12-09 23:06:08 +01:00
kaetemi
fef6543e0c Fix bug causing patch painter fail to open more than once 
--HG--
branch : develop
 2014-11-19 16:30:14 +01:00
kaetemi
0a765bde8c Fix bug causing patch painter fail to open more than once 
--HG--
branch : hotfix
 2014-11-19 16:30:14 +01:00
dfighter1985
0ac94e3e72 CDBViewQuantity shouldn't crash in the editor. 
--HG--
branch : dfighter-tools
 2014-10-20 22:49:46 +02:00
dfighter1985
8c5ad81199 it's not a bad idea to store the value in the right variable... 
--HG--
branch : dfighter-tools
 2014-10-20 22:21:59 +02: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
Nimetu
78e1bb6147 Fix html img not showing on some cases, clean up addImage method 
--HG--
branch : develop
 2014-10-18 01:20:56 +03:00
Nimetu
48b346fed8 Fix crash when using textarea without form 
--HG--
branch : develop
 2014-10-18 00:15:51 +03:00
dfighter1985
67aa7a50d2 set the Id of the text properly when loading the decorated edit box. 
--HG--
branch : dfighter-tools
 2014-10-17 22:25:30 +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
ba1e3c9919 Fixed a typo that messed up the textures of decorated editbox. 
--HG--
branch : dfighter-tools
 2014-10-17 16:01:50 +02:00
dfighter1985
210f93a4f2 Save decorated edit box as such. 
--HG--
branch : dfighter-tools
 2014-10-16 21:03:58 +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
274efe6798 Allow selection of CGroupEditBox. 
--HG--
branch : dfighter-tools
 2014-10-16 20:29:36 +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
8066717aa2 Pos and Size parent setters should now use the widget directly as well. 
--HG--
branch : dfighter-tools
 2014-10-13 15:43:10 +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
11927cca93 Render table and cell borders 
--HG--
branch : html-table-rendering
 2014-10-13 01:59:20 +03:00
Nimetu
283cbe8092 Add bordercolor attribute to table tag 
--HG--
branch : html-table-rendering
 2014-10-13 01:10:46 +03:00
dfighter1985
487c6a3440 GUI Editor should show the right parent position. 
--HG--
branch : dfighter-tools
 2014-10-12 23:07:08 +02:00
dfighter1985
b3dd26e01c Parent positions should now be saved right again. 
--HG--
branch : dfighter-tools
 2014-10-12 23:05:22 +02:00
Nimetu
2de4315027 Fix table cellpadding 
--HG--
branch : html-table-rendering
 2014-10-12 17:43:18 +03: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
fe89e8f77c Added limits to pch, should fix Linux build. 
--HG--
branch : dfighter-tools
 2014-10-11 13:04:03 +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
dfighter1985
8cec8de3a0 Unselect selection when clicking 'nothing'. 
--HG--
branch : dfighter-tools
 2014-10-10 17:33:57 +02:00
kervala
aaa044203e Fix some warnings 
--HG--
branch : develop
 2014-10-10 13:07:54 +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
bec078af25 Sizes should remain the same when ungrouping. 
--HG--
branch : dfighter-tools
 2014-10-08 21:00:56 +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
08b6675b3d Only select a group first in editor mode. 
--HG--
branch : dfighter-tools
 2014-10-08 18:00:54 +02:00
dfighter1985
ad9e9839fb Don't try to handle the right mouse button actions in editor mode. 
--HG--
branch : dfighter-tools
 2014-10-08 17:59:39 +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
dfighter1985
97ddd3573d Select groups first. 
--HG--
branch : dfighter-tools
 2014-10-08 17:37:05 +02:00
kaetemi
ec68d2c317 Fix rendering of specially sized window highlights 
--HG--
branch : develop
 2014-10-08 09:31:13 +02:00
kaetemi
ec6ea26323 Fix when tx_b and tx_b_open have different heights 
--HG--
branch : develop
 2014-10-08 09:30:59 +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
kaetemi
25f1aa6247 Fix a bad copy paste in NLGUI 
--HG--
branch : develop
 2014-10-04 01:43:13 +02:00
kaetemi
bb9d0d91d3 Fix #207, FXAA orientation under D3D 
--HG--
branch : develop
 2014-10-01 23:24:56 +02:00
Jan Boon
980b855de9 Merged in nimetu/ryzomcore/html-maxlength-attr (pull request #84) 
Add maxlength attribute to input and textarea tags

--HG--
branch : develop
 2014-10-01 23:18:33 +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
4571038fa6 Update CCtrlTextButton's CViewText's coords after updating it's own coords. 
--HG--
branch : dfighter-tools
 2014-09-29 17:38:24 +02:00
dfighter1985
86007c9156 Posref changes in the editor should apply... 
--HG--
branch : dfighter-tools
 2014-09-29 17:23:22 +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
dfighter1985
d053bb51c2 Merged develop 
--HG--
branch : dfighter-tools
 2014-09-27 18:22:44 +02:00
dfighter1985
c6df57adf1 Initialize struct member before use... 
--HG--
branch : develop
 2014-09-27 18:20:29 +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
c92d084600 Merged develop. 
--HG--
branch : dfighter-tools
 2014-09-27 00:08:06 +02:00
dfighter1985
938c36027d Editbox selection should be stopped when the mouse button goes up, even if it happens outside of the box. 
--HG--
branch : develop
 2014-09-26 23:29:38 +02: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
e7ab56beea Orphaned widgets won't get stuck. 
--HG--
branch : dfighter-tools
 2014-09-24 20:40:37 +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
f9dbef7df7 Set dragged widgets' coordinates based on the move rather than the mouse pointer's coords. 
--HG--
branch : dfighter-tools
 2014-09-24 16:31:26 +02:00
dfighter1985
62744db86d Dragged elements will no longer disappear. 
--HG--
branch : dfighter-tools
 2014-09-24 16:20:25 +02:00
kaetemi
6551881171 Handle GUI event only once 
--HG--
branch : develop
 2014-09-23 19:47:06 +02:00
dfighter1985
f61438d7d9 Studio should no longer crash when multiple plugins that use LIGO are loaded. LIGO classes are now guarded against multiple registrations. If it's tried log messages are generated. Mission Compiler and World Editor will now apply their own LIGO configs when the user switches to their tab. 
--HG--
branch : dfighter-tools
 2014-09-22 23:24:48 +02:00
dfighter1985
447aac5821 Merged develop 
--HG--
branch : dfighter-tools
 2014-09-19 20:10:00 +02:00
kaetemi
c1b8ea9bd0 Backed out incomplete changes to GL driver 
--HG--
branch : develop
 2014-09-18 11:31:19 +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
bb324e80b4 Fixed: Use ...ARBPROC declarations for ARB_occlusion_query (to fix a conflict with official OpenGL headers under Mac OS X) 2014-08-27 11:19:20 +02:00
kaetemi
573fb44088 Link group_wheel.cpp, ref #176 2014-08-25 14:56:29 +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
kaetemi
d4b7a3cf8a Crashfix in case pacs_prim are exported into .ig 2014-08-17 16:48:51 +02:00
kervala
31e9934ba7 Changed #172 XML floating point serialization not using neutral culture 2014-08-17 16:05:51 +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
38a418503d Non-functional direct to rift 
--HG--
branch : multipass-stereo
 2014-08-07 05:09:11 +02:00
kaetemi
aff0cab54e GL: Fix switch from different resolution fullscreen to borderless display 
--HG--
branch : multipass-stereo
 2014-08-07 04:45:14 +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
400f479fe1 GL: Handle borderless fullscreen to specified monitor internally 
--HG--
branch : multipass-stereo
 2014-08-07 04:18:17 +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
e8a245a133 OVR: Chroma factor 
--HG--
branch : multipass-stereo
 2014-08-05 20:14:58 +02:00
kaetemi
e61eb57fd9 OVR: Fix for debug devices 
--HG--
branch : multipass-stereo
 2014-08-05 04:03:27 +02:00
kaetemi
3fd358d69d OVR: Convert texture coordinates and setup rendering material 
--HG--
branch : multipass-stereo
 2014-08-05 03:54:19 +02:00
kaetemi
102d3653d7 3D: Ensure correct fog handling for effects 
--HG--
branch : multipass-stereo
 2014-08-05 02:58:55 +02:00
kaetemi
6ad1d14617 OVR: Test distortion mesh 
--HG--
branch : multipass-stereo
 2014-08-05 02:55:26 +02:00
kaetemi
65578ce498 OVR: Test large render target 
--HG--
branch : multipass-stereo
 2014-08-05 02:25:14 +02:00
kaetemi
2fbf1cb06d 3D: Set matrix modes after changing render target in effect 
--HG--
branch : multipass-stereo
 2014-08-05 02:24:11 +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
96bd17ae63 3D: Fix texture coords for FXAA on D3D 
--HG--
branch : multipass-stereo
 2014-08-04 07:38:40 +02:00
kaetemi
d56047bde6 Remove debug 
--HG--
branch : multipass-stereo
 2014-08-04 06:19:03 +02:00
kaetemi
8a283ea518 3D: User higher quality FXAA version 
--HG--
branch : multipass-stereo
 2014-08-04 06:11:47 +02:00
kaetemi
ec4762f669 3D: Add FXAA 
--HG--
branch : multipass-stereo
 2014-08-04 04:44:27 +02:00
kaetemi
f59de199cf Fix crash on AMD with legacy clouds 
--HG--
branch : multipass-stereo
 2014-08-04 01:05:53 +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
kaetemi
1c67d6ec0f GL: Occlusion query bugfix 2014-08-03 22:15:12 +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
kaetemi
78ce8f4f25 GL: Share depth and stencil to get similar behaviour to D3D driver 
--HG--
branch : multipass-stereo
 2014-08-03 18:59:19 +02:00
kaetemi
503292065c Simplify GUI projection settings 
--HG--
branch : multipass-stereo
 2014-08-03 00:56:26 +02:00
kaetemi
1965d46dce Off-center GUI cylinder 
--HG--
branch : multipass-stereo
 2014-08-02 20:11:28 +02:00
kaetemi
f2dd6083fa Cylindrical GUI 
--HG--
branch : multipass-stereo
 2014-08-02 19:50:26 +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
f32c3bf6b0 Temporary crashfix, ref #68 
--HG--
branch : multipass-stereo
 2014-08-01 15:23:13 +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
c70d8597b2 Merge with default 
--HG--
branch : multipass-stereo
 2014-08-01 11:50:40 +02:00
kaetemi
79c6f50054 Render target format (for alpha) 
--HG--
branch : multipass-stereo
 2014-07-31 18:25:50 +02:00
kaetemi
61f97fae40 Fix issue with render target in OpenGL when size not specified 
--HG--
branch : multipass-stereo
 2014-07-31 17:41:56 +02:00