Commit graph

1436 commits

Author SHA1 Message Date
dfighter1985
cc52abcfa0 CMsgBoxDisplayer should not present a dialog now, but write the report to a file then attempt to launch the error reporter application. Which ofc doesn't exist yet in this commit. 2015-02-17 03:12:26 +01:00
kervala
9718f37ec4 Merge with hotfix 2015-02-14 19:29:36 +01:00
kervala
f0ebd8d428 Fixed: Unnamed semaphores are deprecated under OS X 2015-02-14 17:52:15 +01:00
kervala
5221bf199c Merge with hotfix 2015-02-14 14:31:19 +01:00
kervala
44d0c95b69 Fixed: Warning with multichars to int conversion 2015-02-14 14:25:50 +01:00
kervala
539f721624 Fixed: Compilation 2015-02-14 13:57:06 +01:00
kervala
c569b03d0c Changed: Replaced atoi and atof by NLMISC::fromString 2015-02-14 13:46:21 +01:00
kervala
a5d69a78d7 Changed: Minor changes 2015-02-14 12:47:03 +01:00
kervala
1ce011be38 Fixed: Compilation warnings 2015-02-14 12:41:59 +01:00
dfighter1985
8b095f97b3 Merged in hotfix (pull request #114)
Merging hotfix branch
2015-02-13 19:48:42 +01:00
dfighter1985
eaf5d26bae Handle relative paths when loading .worldedit files in World Editor. 2015-02-08 00:24:29 +01:00
dfighter1985
ac2833e78d Merged in hotfix (pull request #111)
Merge hotfix
2015-02-06 02:32:03 +01:00
dfighter1985
23873f2e3a Erm. Initialize Nel3D on other platforms too... 2015-02-06 02:29:33 +01:00
dfighter1985
711261cb0d Merged hotfix 2015-02-02 03:54:50 +01:00
dfighter1985
41e2e8b4db Merged mainline 2015-02-02 02:03:00 +01:00
dfighter1985
44760221f2 Initialize Nel3D in the Object Viewer plugin too. 2015-02-01 20:29:26 +01:00
kervala
e3de253702 Changed: Optimize sorting of files (instead of doing it several times for each directory, do it only once) 2015-01-23 21:11:15 +01:00
kervala
1675e7af3a Changed: Replaced atoi and atof by NLMISC::fromString 2015-01-13 19:47:14 +01:00
kervala
d6a2af6abd Changed: Minor changes 2015-01-13 14:11:07 +01:00
kervala
8880047f69 Fixed: Compilation with OS X SDK 10.10 2015-01-10 20:33:02 +01:00
kervala
afac054306 Fixed: Removed raw mouse mode for OS X too 2015-01-10 19:55:05 +01:00
kervala
541fd4a25c Fixed: OpenGL driver compilation 2015-01-10 19:53:27 +01:00
kervala
223de1a1a4 Merge 2015-01-10 19:08:55 +01:00
kervala
ba6cbc76c9 Changed: Minor changes 2015-01-10 18:45:14 +01:00
kervala
741d3b6275 Fixed: OpenGL ES driver compilation 2015-01-10 18:41:54 +01:00
kervala
2a6478b505 Changed: More aliases for OpenGL ES functions and defines to simplify code 2015-01-10 18:41:18 +01:00
Jan Boon
fce776f93e Merged in nimetu/ryzomcore/fix-issue-225 (pull request #98)
CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225)
2015-01-09 18:09:17 +01:00
Nimetu
e2517b8ebc Fix html submit button value that is included with form data (issue #226) 2015-01-09 13:11:20 +02:00
Nimetu
c05b296472 CGroupEditBox: ignore enter key when ctrl is pressed (ctrl+m combo) (issue #225) 2015-01-09 12:59:53 +02:00
kervala
bdfa7a624e Changed: Minor changes 2014-12-26 13:38:02 +01:00
kaetemi
6d16be808f Merge with default 2014-12-22 14:26:26 +01:00
kaetemi
f146593561 Move to hotfix: 287c1142e5ea 2014-12-22 14:08:29 +01:00
dfighter1985
9a61380b37 Ported changeset 9878ab4: CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 2014-12-22 01:26:04 +01:00
dfighter1985
fe5c94505f CCtrlTextbutton checkcoords should call it's text's checkcoords method. Fix #219. 2014-12-21 22:55:27 +01:00
kaetemi
dbe3ee5d9e Fix offscreen rendering mode 2014-12-09 23:06:08 +01:00
kaetemi
2e94bc1d15 Fix bug causing patch painter fail to open more than once 2014-11-19 16:30:14 +01:00
dfighter1985
b6c9cc5498 CDBViewQuantity shouldn't crash in the editor. 2014-10-20 22:49:46 +02:00
dfighter1985
38d2366a71 it's not a bad idea to store the value in the right variable... 2014-10-20 22:21:59 +02:00
dfighter1985
112d137add DBViewNumber shouldn't crash anymore. 2014-10-20 20:57:08 +02:00
dfighter1985
3193ab11de When setting the Id of the decorated edit box, set the Id of the text as well. 2014-10-20 18:51:53 +02:00
Jan Boon
841f06be25 Merged in nimetu/ryzomcore/html-table-rendering (pull request #92)
Some improvements to table rendering
2014-10-18 04:44:34 +02:00
Nimetu
754a0ff04d Fix html img not showing on some cases, clean up addImage method 2014-10-18 01:20:56 +03:00
Nimetu
a24400c059 Fix crash when using textarea without form 2014-10-18 00:15:51 +03:00
dfighter1985
c96c030b25 set the Id of the text properly when loading the decorated edit box. 2014-10-17 22:25:30 +02:00
dfighter1985
68fa126867 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. 2014-10-17 21:18:26 +02:00
dfighter1985
25b5750239 Fixed a typo that messed up the textures of decorated editbox. 2014-10-17 16:01:50 +02:00
dfighter1985
2a07542bf2 Save decorated edit box as such. 2014-10-16 21:03:58 +02:00
dfighter1985
50625d3e29 Update decorated edit box decoration coords while dragging. 2014-10-16 20:58:47 +02:00
dfighter1985
9b8991038d Allow selection of CGroupEditBox. 2014-10-16 20:29:36 +02:00
dfighter1985
715fdd1ddf Implemented CGroupEditBoxDecor a decorated CGroupEditBox. 2014-10-16 20:25:19 +02:00
dfighter1985
03c6a69141 Fix parent pos and size parsing. 2014-10-15 19:46:43 +02:00
Nimetu
11442b15ae Change table defaults valign=middle, cellpadding=1, cellspacing=2 2014-10-15 00:02:38 +03:00
Nimetu
66ca072948 Render table with rowspan, colspan.
Borders, if enabled, adds +1 to cell padding.
2014-10-14 15:29:06 +03:00
Nimetu
23d51172c2 Add rowspan and colspan attributes 2014-10-14 15:26:14 +03:00
dfighter1985
284de64589 When creating a new GUI set the base color to white. 2014-10-13 17:47:42 +02:00
dfighter1985
b8d16d8b9b Pos and Size parent setters should now use the widget directly as well. 2014-10-13 15:43:10 +02:00
dfighter1985
126631020f Size parent is now queried directly from the widget. 2014-10-13 15:26:47 +02:00
Nimetu
d938a90da6 Render table and cell borders 2014-10-13 01:59:20 +03:00
Nimetu
13b947861d Add bordercolor attribute to table tag 2014-10-13 01:10:46 +03:00
dfighter1985
cc3e44ac2b GUI Editor should show the right parent position. 2014-10-12 23:07:08 +02:00
dfighter1985
a96cdafb29 Parent positions should now be saved right again. 2014-10-12 23:05:22 +02:00
Nimetu
80e2d7fa35 Fix table cellpadding 2014-10-12 17:43:18 +03:00
dfighter1985
479625968d Implemented new action. 2014-10-11 21:43:28 +02:00
dfighter1985
f5826add20 Moved CRootGroup out of CInterfaceParser. 2014-10-11 19:30:30 +02:00
dfighter1985
c47188179a CInterfaceParser in editor mode should look for files in the working directory first. 2014-10-11 16:26:38 +02:00
dfighter1985
f6d34ddb37 Added limits to pch, should fix Linux build. 2014-10-11 13:04:03 +02:00
dfighter1985
c7bfb9cf20 Merged develop 2014-10-11 02:15:07 +02:00
dfighter1985
6c05ced558 Added support for grouping widgets. 2014-10-11 00:42:43 +02:00
dfighter1985
0aead6db70 Allow multiselection. 2014-10-10 20:25:25 +02:00
dfighter1985
20ccee370b Unselect selection when clicking 'nothing'. 2014-10-10 17:33:57 +02:00
kervala
9995543f47 Fix some warnings 2014-10-10 13:07:54 +02:00
kaetemi
a1262b71b2 Handle shadow outline in gui 2014-10-08 23:20:35 +02:00
kaetemi
523761d7b7 Implement text shade outline 2014-10-08 23:20:34 +02:00
dfighter1985
733fb56703 A little crash fix. 2014-10-08 21:28:20 +02:00
dfighter1985
a4dfd8c95e Sizes should remain the same when ungrouping. 2014-10-08 21:00:56 +02:00
dfighter1985
003ddd6881 Added support for ungrouping. 2014-10-08 20:36:16 +02:00
dfighter1985
e9f5fef158 Make group selection optional. 2014-10-08 18:45:17 +02:00
dfighter1985
01cdcaa480 Only select a group first in editor mode. 2014-10-08 18:00:54 +02:00
dfighter1985
b524c9fec1 Don't try to handle the right mouse button actions in editor mode. 2014-10-08 17:59:39 +02:00
dfighter1985
1111a022af When moving a group draw it's children too. 2014-10-08 17:52:56 +02:00
dfighter1985
4d06c3c278 Select groups first. 2014-10-08 17:37:05 +02:00
kaetemi
6ec644e2ba Fix rendering of specially sized window highlights 2014-10-08 09:31:13 +02:00
kaetemi
d2e9352d4c Fix when tx_b and tx_b_open have different heights 2014-10-08 09:30:59 +02:00
kaetemi
cbe5cb66f7 Add inset_t parameter to layer options, allows putting header graphics in top texture 2014-10-04 01:43:27 +02:00
kaetemi
96ea88ac07 Fix a bad copy paste in NLGUI 2014-10-04 01:43:13 +02:00
kaetemi
0eed48b902 Fix #207, FXAA orientation under D3D 2014-10-01 23:24:56 +02:00
Jan Boon
2935767d60 Merged in nimetu/ryzomcore/html-maxlength-attr (pull request #84)
Add maxlength attribute to input and textarea tags
2014-10-01 23:18:33 +02:00
dfighter1985
7504dc1238 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. 2014-09-29 20:29:04 +02:00
dfighter1985
4d5d67fac7 Update CCtrlTextButton's CViewText's coords after updating it's own coords. 2014-09-29 17:38:24 +02:00
dfighter1985
2383e19561 Posref changes in the editor should apply... 2014-09-29 17:23:22 +02:00
dfighter1985
e87d83bccc Refactoring. Added CInterfaceFactory. 2014-09-27 21:48:51 +02:00
dfighter1985
fada6e7dcc A little refactoring. 2014-09-27 20:15:46 +02:00
dfighter1985
75047b71b4 Move the text too with the text button. 2014-09-27 19:54:19 +02:00
dfighter1985
3ca518dca2 Merged develop 2014-09-27 18:22:44 +02:00
dfighter1985
039e8a83a4 Initialize struct member before use... 2014-09-27 18:20:29 +02:00
Nimetu
2b02fd2c37 Add maxlength attribute to input and textarea tags 2014-09-27 15:55:57 +03:00
dfighter1985
3fbe51185f Merged develop. 2014-09-27 00:08:06 +02:00
dfighter1985
161c8e5edc Editbox selection should be stopped when the mouse button goes up, even if it happens outside of the box. 2014-09-26 23:29:38 +02:00
dfighter1985
e6f4801129 Refactored IWidgetAdditionWatcher, now it's called IWidgetWatcher and it also reports widget moves. 2014-09-24 23:32:24 +02:00
dfighter1985
f7825fc8b3 No need for free floating elements when we can simply reparent to the top window... 2014-09-24 22:59:40 +02:00
dfighter1985
c5b8f30bb9 Orphaned widgets won't get stuck. 2014-09-24 20:40:37 +02:00
dfighter1985
f30054a26c 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. 2014-09-24 18:45:52 +02:00
dfighter1985
49d023d273 Set dragged widgets' coordinates based on the move rather than the mouse pointer's coords. 2014-09-24 16:31:26 +02:00
dfighter1985
574d24e5e3 Dragged elements will no longer disappear. 2014-09-24 16:20:25 +02:00
kaetemi
3158f6d90e Handle GUI event only once 2014-09-23 19:47:06 +02:00
dfighter1985
d19e4ecaab 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. 2014-09-22 23:24:48 +02:00
dfighter1985
2666f19500 Merged develop 2014-09-19 20:10:00 +02:00
kaetemi
3731f28892 Backed out incomplete changes to GL driver 2014-09-18 11:31:19 +02:00
dfighter1985
e40ecbda00 Merged the gui-editor branch. 2014-09-17 21:12:14 +02:00
kaetemi
302c478af6 Merge with develop 2014-09-12 15:19:12 +02:00
kaetemi
b34c7cf12a When in Rome, do as the Romans do 2014-09-11 10:36:41 +02:00
dfighter1985
15f6ed3c37 Merged default. 2014-09-05 22:28:11 +02:00
dfighter1985
ca910cf17a Added support for manipulating atoms. 2014-09-05 20:28:43 +02:00
kervala
ad5cc68107 Changed: Code formatting 2014-09-05 15:42:53 +02:00
dfighter1985
a875e66696 Implemented add and remove buttons. 2014-09-02 19:26:02 +02:00
dfighter1985
2292fc96c4 Apply changes. 2014-09-02 14:54:07 +02:00
kervala
891e0d1bd7 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
119c931738 Link group_wheel.cpp, ref #176 2014-08-25 14:56:29 +02:00
kaetemi
0f236b800f Merge with default 2014-08-19 15:43:49 +02:00
dfighter1985
e59fb841bc Merged default. 2014-08-19 00:33:03 +02:00
kaetemi
45db7f57eb Crashfix in case pacs_prim are exported into .ig 2014-08-17 16:48:51 +02:00
kervala
74a30afcc4 Changed #172 XML floating point serialization not using neutral culture 2014-08-17 16:05:51 +02:00
kervala
4f4a3469d3 Fixed #172 XML floating point serialization not using neutral culture 2014-08-17 15:39:30 +02:00
kaetemi
f731d220d7 Project client loading screens into 3D space for HMD 2014-08-07 18:49:05 +02:00
kaetemi
b31f939f9e Non-functional direct to rift 2014-08-07 05:09:11 +02:00
kaetemi
338b9b8a7f GL: Fix switch from different resolution fullscreen to borderless display 2014-08-07 04:45:14 +02:00
kaetemi
60c4e36fec Clean handling of display mode switching in client 2014-08-07 04:36:51 +02:00
kaetemi
c2d39e8bdf GL: Handle borderless fullscreen to specified monitor internally 2014-08-07 04:18:17 +02:00
kaetemi
7bd9216a6f Specify monitor when changing display mode 2014-08-07 01:04:58 +02:00
dfighter1985
04095561cb Merge default 2014-08-07 00:03:09 +02:00
kaetemi
7db83ce7da Process some scene traversals only once when rendering in stereo 2014-08-06 14:36:09 +02:00
kaetemi
758e87e115 OVR: Chroma factor 2014-08-05 20:14:58 +02:00
kaetemi
0c7bc1240f OVR: Fix for debug devices 2014-08-05 04:03:27 +02:00
kaetemi
031f1cdcbd OVR: Convert texture coordinates and setup rendering material 2014-08-05 03:54:19 +02:00
kaetemi
c9762fbef5 3D: Ensure correct fog handling for effects 2014-08-05 02:58:55 +02:00
kaetemi
19209b8028 OVR: Test distortion mesh 2014-08-05 02:55:26 +02:00
kaetemi
537a7e7395 OVR: Test large render target 2014-08-05 02:25:14 +02:00
kaetemi
32540add2a 3D: Set matrix modes after changing render target in effect 2014-08-05 02:24:11 +02:00
kaetemi
240889b03d 3D: Render target matrix context fix 2014-08-05 02:21:30 +02:00
kaetemi
fb16438a49 OVR: Testing 2014-08-05 01:49:45 +02:00
kaetemi
4a8d07b889 OVR: Translate camera 2014-08-05 00:51:53 +02:00
kaetemi
30f98c4b62 OVR: Get orientation 2014-08-05 00:46:04 +02:00
kaetemi
2dda6cc5f0 OVR: Generate distortion mesh 2014-08-05 00:20:21 +02:00
kaetemi
c99cfed0dd OVR: Read device descriptions 2014-08-04 20:32:31 +02:00
kaetemi
05a2f91711 OVR: Iterate devices 2014-08-04 19:19:15 +02:00
kaetemi
0baada5110 Cleanup 2014-08-04 18:31:31 +02:00
kaetemi
ca165de62c Add placeholders for LibOVR 0.4.0 support 2014-08-04 18:30:25 +02:00
kaetemi
b24fa74936 3D: Fix texture coords for FXAA on D3D 2014-08-04 07:38:40 +02:00
kaetemi
925aa9c715 Remove debug 2014-08-04 06:19:03 +02:00
kaetemi
946128cdca 3D: User higher quality FXAA version 2014-08-04 06:11:47 +02:00