Commit graph

4781 commits

Author SHA1 Message Date
kaetemi
ea25449029 Fix crash with patch mesh attach 2014-12-04 13:21:12 +01:00
kaetemi
b7dbbcac54 Add script to orient zone patches automatically 2014-12-03 15:16:39 +01:00
kaetemi
c7e0627bb5 Increase patch painter distance 2014-12-03 15:16:39 +01:00
kaetemi
972611e5c0 Separate version string 2014-11-24 16:07:17 +01:00
kaetemi
39bb02454f Adjust version 2014-11-24 15:04:53 +01:00
kaetemi
c02d285b4d Merge with hotfix 2014-11-24 15:04:16 +01:00
kaetemi
1a5f3a2875 ryzomcore/v0.11.1 2014-11-24 14:57:36 +01:00
kaetemi
899c0c441e Fix #218 erratic mouse behaviour 2014-11-24 14:53:28 +01:00
kaetemi
9fba7eff72 Fix bug causing patch painter fail to open more than once 2014-11-19 16:30:14 +01:00
kaetemi
2e94bc1d15 Fix bug causing patch painter fail to open more than once 2014-11-19 16:30:14 +01:00
kaetemi
fb44ccb82d Remove PIC library 2014-11-19 16:20:14 +01:00
kaetemi
6d6926a8b8 ryzomcore/v0.11.0 2014-11-10 23:34:41 +01:00
kaetemi
d76c9c5018 Fix PHP error "Only variables should be passed by reference" 2014-11-08 00:29:50 +01:00
kaetemi
04c57350d9 Fix PHP error "Only variables should be passed by reference" 2014-11-07 23:51:42 +01:00
kaetemi
80105b365c Print callstack 2014-11-07 23:37:39 +01:00
kaetemi
aee9f17acb Fix patchman scripts 2014-11-07 19:32:18 +01:00
kaetemi
feeccbdea8 Update default path 2014-11-07 19:21:05 +01:00
kaetemi
a2457910c4 Backed out merge changeset: 361eb082ec5e
Does not compile. FindLibLZMA missing on Ubunty 12.04 LTS
2014-11-07 19:17:43 +01:00
kaetemi
0e119941b6 Update default patchman cfg 2014-11-07 19:16:45 +01:00
kaetemi
6245a68f76 Change patchman example domain 2014-11-07 19:02:50 +01:00
dfighter1985
b6c9cc5498 CDBViewQuantity shouldn't crash in the editor. 2014-10-20 22:49:46 +02:00
dfighter1985
173bf9e773 Default text for DBViewNumber. 2014-10-20 22:27:33 +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
50486109df Don't add non-selectable widgets to the hierarchy tree. 2014-10-17 21:23:00 +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
42a0a7d443 Render every 25ms instead of 200ms 2014-10-15 23:30:36 +02:00
dfighter1985
f7d0f496c4 A Kami will be the default texture for Bitmaps. 2014-10-15 20:20:44 +02:00
dfighter1985
ab3a68a647 CtrlButton textures should be selectable in the texture chooser! 2014-10-15 20:07:13 +02:00
dfighter1985
090502f105 Default texture for CtrlButton. 2014-10-15 20:03:46 +02:00
dfighter1985
7d831ac5aa TEMPORARILY add the login texture map to new project by default. 2014-10-15 19:54:35 +02:00
dfighter1985
03c6a69141 Fix parent pos and size parsing. 2014-10-15 19:46:43 +02:00
dfighter1985
c91be5a563 Don't drop the texture property just because there's no texture assigned... 2014-10-15 12:09:57 +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
6ecd9bc5ae Don't disable the active group before serializing. 2014-10-13 20:15:41 +02:00
dfighter1985
898f399730 It's not a bad idea to actually retrieve the version if we load it... 2014-10-13 19:15:59 +02:00
dfighter1985
7af967cc7b Don't reject an action property just because it's empty... 2014-10-13 18:55:17 +02:00
dfighter1985
3511589f2f Map files can now be specified when creating a new GUI project. 2014-10-13 18:53:26 +02: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
dfighter1985
f27f391724 Some refactoring regarding saving. 2014-10-12 21:15:13 +02:00
dfighter1985
bc3a6b83e5 When creating a new project, save it right away. 2014-10-12 20:09:42 +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
983c9febc9 Added dialog for the new GUI action. 2014-10-11 18:56:24 +02:00
dfighter1985
174655dad9 Some defaults. 2014-10-11 16:47:39 +02:00
dfighter1985
559b4b4a6f Another classname. 2014-10-11 16:40:41 +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
9a5d082583 Restored lost class names 2014-10-11 14:44:16 +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
e4ab2467c1 Minor changes 2014-10-10 13:08:14 +02:00
kervala
9995543f47 Fix some warnings 2014-10-10 13:07:54 +02:00
kaetemi
d6586fa42a Configure shadow outline in applications 2014-10-08 23:20:35 +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
d06ed834b6 Reparent items in widget hierarchy instead of deleting and creating a new item... 2014-10-08 17:42:18 +02:00
dfighter1985
4d06c3c278 Select groups first. 2014-10-08 17:37:05 +02:00
kaetemi
da982ab0ca Disable dumb loading strings 2014-10-08 09:31:45 +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
961669ef5c Fix crypt 2014-10-07 03:00:34 +02:00
kaetemi
8d550ca356 Compile fixes 2014-10-07 01:44:43 +02:00
kaetemi
ef0bc5a367 Require setup upgrade 2014-10-07 01:20:57 +02:00
kaetemi
499155b9d5 Merge with develop 2014-10-07 01:15:35 +02:00
Jan Boon
9fdb341faa Merged in rodolphe_breard/ryzomcore/sha512-auth (pull request #89)
ref #206 : windows compilation stuff
2014-10-07 01:14:31 +02:00
kaetemi
bf1f843f16 Set version 2014-10-07 01:14:03 +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
Rodolphe Breard
a0ec4645cc ref #206 : hacking the types so it may compile on windows 2014-10-02 19:14:25 +02:00
Rodolphe Breard
1f54bf31e6 ref #206 : removing unused crypt lib reference 2014-10-02 18:21:56 +02:00
kaetemi
0eed48b902 Fix #207, FXAA orientation under D3D 2014-10-01 23:24:56 +02:00
kaetemi
9709a5da6a Merge with develop 2014-10-01 23:23:06 +02:00
Jan Boon
7feab0e5cf Merged in rodolphe_breard/ryzomcore/sha512-auth (pull request #88)
rolling back to include a crypt(3) implementation and adding sha512 support
2014-10-01 23:20:52 +02:00
Jan Boon
185c7ba4ac Merged in nimetu/ryzomcore-2/nimetu/find-lua-version-for-luabind-under-fedor-1412076128442 (pull request #87)
find lua version for luabind under fedora
2014-10-01 23:19:21 +02:00
Jan Boon
98b0192352 Merged in nimetu/ryzomcore-1/nimetu/static-libxml2-under-linux-requires-lzma-1412075714030 (pull request #86)
static libxml2 under linux requires lzma (tested on fedora/debian)
2014-10-01 23:19:04 +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
nimetu
adf5cb28b5 find lua version for luabind under fedora 2014-09-30 11:23:16 +00:00
nimetu
e0151ffa17 static libxml2 under linux requires lzma (tested on fedora/debian) 2014-09-30 11:16:28 +00: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
59011fe726 When moving a widget, save the reference to the hierarchy lookup map... 2014-09-27 20:54:44 +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
6e162e7edb A little bit of refactoring. 2014-09-27 01:04:49 +02:00
dfighter1985
1f4553f39c Update coords when changing something. 2014-09-27 01:00:52 +02: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
Rodolphe Breard
31a08ab8d7 rolling back to include a crypt(3) implementation and adding sha512 support 2014-09-26 22:30:56 +02:00
dfighter1985
6eb4cf9c3f Collapse the tree, and only expand the items that are needed to get to the selected items. 2014-09-25 00:37:25 +02:00
dfighter1985
b46483a2a6 When repareting a widget, remove the old item from the hierarchy and add a new one at the right place. 2014-09-24 23:56:11 +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
a943c939ef Add useful default config variables to dev client 2014-09-24 12:34:40 +02:00
kaetemi
cdfbcfe1d8 Add some more practical data build batch scripts 2014-09-24 01:07:12 +02:00
kaetemi
3158f6d90e Handle GUI event only once 2014-09-23 19:47:06 +02:00
kaetemi
f6a5adb597 Remove debug message 2014-09-23 18:18:14 +02:00
kaetemi
32c0f2d7f7 Fix EGS sheet rebuild crashes 2014-09-23 13:54:02 +02:00
dfighter1985
17dcb2acf9 Instantiate the Wold Editor window after the LIGO setup. 2014-09-23 00:16:57 +02:00
dfighter1985
10c340e29a Merged develop. 2014-09-22 23:58:48 +02:00
dfighter1985
23d28dff8d Call the onActivate method of the current context after all plugins are initialized. 2014-09-22 23:41:55 +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
kaetemi
f051c5d156 Add an assert 2014-09-21 13:24:33 +02:00
kaetemi
d9819abd11 Fix double delete 2014-09-21 12:31:02 +02:00
dfighter1985
8a1821aba4 oups 2014-09-20 20:55:30 +02:00
dfighter1985
a05057bf7e GUI Editor should no longer crash on Linux 2014-09-20 20:51:08 +02:00
dfighter1985
2666f19500 Merged develop 2014-09-19 20:10:00 +02:00
kaetemi
e8799f08aa Add extra search paths 2014-09-19 19:48:17 +02:00
kaetemi
2d6fd2fff9 Increment web version 2014-09-18 21:55:34 +02:00
kaetemi
d9b1ba33a3 Merge with develop 2014-09-18 21:54:34 +02:00
kaetemi
5165f74aae It works on my machine 2014-09-18 21:02:14 +02:00
kaetemi
9d161fddf5 Add resave scripts 2014-09-18 17:40:07 +02:00
kaetemi
b9b58bd7dc Add particle system path fixing script 2014-09-18 14:10:03 +02:00
kaetemi
7fdcf203c5 Fix missing include 2014-09-18 13:02:32 +02:00
kaetemi
3731f28892 Backed out incomplete changes to GL driver 2014-09-18 11:31:19 +02:00
dfighter1985
ca250bab9b Fixed Object Viewer build. 2014-09-17 22:36:58 +02:00
dfighter1985
e40ecbda00 Merged the gui-editor branch. 2014-09-17 21:12:14 +02:00
dfighter1985
516d5c9a47 don't evaluate the child-nodes when there are none, directly just return () 2014-09-17 20:54:16 +02:00
dfighter1985
d6251c2a1a When removing the root node, don't retain the pointer to it... 2014-09-17 20:51:45 +02:00
dfighter1985
5578b791f3 Added the rest of the expression files. 2014-09-17 20:49:26 +02:00
dfighter1985
c2eb8e16ae Merged develop. 2014-09-17 19:51:14 +02:00
dfighter1985
6badbe5112 Added support for clearing the Expression Editor scene. 2014-09-17 19:27:06 +02:00
dfighter1985
49e8343345 Texture Chooser shouldn't have been left in the main menu... 2014-09-17 19:21:39 +02:00
dfighter1985
8ca98c91e9 Moved the Expression Editor to it's right place. 2014-09-17 19:19:43 +02:00
dfighter1985
e7f9487800 Instead of mouse move event, use the itemChange handler to move the links. 2014-09-17 16:17:41 +02:00
dfighter1985
e18e3ac358 ExpressionNode flags are now set in it's constructor. 2014-09-17 16:02:28 +02:00
dfighter1985
55264978ad Links shouldn't be selectable. 2014-09-17 16:01:23 +02:00
dfighter1985
a7b3b0f985 This is the GUI Editor not Georges... 2014-09-17 15:50:12 +02:00
dfighter1985
814fedbc4a Save expression. 2014-09-17 15:47:49 +02:00
dfighter1985
f3fbfdcb83 Expression can now be built. 2014-09-17 15:31:54 +02:00
dfighter1985
aa1ac95aae A root node can now be set. The root node is where the evaluation will start. 2014-09-17 14:41:57 +02:00
Rodolphe Breard
45d09504b1 Fixing the database migration system for issue #206 2014-09-16 22:43:36 +02:00
Rodolphe Breard
16bc8449c1 fixing #206 : passwords are now stored using SHA-512 instead of traditional DES 2014-09-16 20:34:26 +02:00
dfighter1985
4fe0b030f5 Added sample expression files. 2014-09-16 15:54:53 +02:00
dfighter1985
1e91e006c4 When changing the value of a node, change the size the node if needed. 2014-09-16 15:31:06 +02:00
dfighter1985
535e0474ad Allow to set and change values of value nodes. 2014-09-16 15:15:31 +02:00
dfighter1985
52fa0b4fa9 Only allow variable nodes to have their number of slots changed. 2014-09-16 03:45:26 +02:00
dfighter1985
cce83f371d Set the number of slots and their names from the data loaded from XMLs. 2014-09-16 03:38:21 +02:00
dfighter1985
8b0f7ddeaf Parse expression files, and build the expression tree from the expressions parsed from these files. 2014-09-16 02:32:10 +02:00
kaetemi
fbcf921062 Fix r2ed 2014-09-15 18:15:40 +02:00
kaetemi
f4399190e3 Fix r2ed 2014-09-15 17:42:24 +02:00
kaetemi
4f0a79d67a Fix r2ed 2014-09-15 16:59:12 +02:00
kaetemi
1a8b6333ba Fix r2ed 2014-09-15 14:33:07 +02:00
kaetemi
fab78e58e9 Fix bad type passed to sscanf 2014-09-15 12:49:13 +02:00
dfighter1985
8314fd5c6b Slot count can now be changed. 2014-09-15 01:25:01 +02:00
botanic
4061ada656 Fix #194 2014-09-14 15:52:40 -07:00
botanic
3cd38fdbdb FIX #205 2014-09-14 13:09:00 -07:00
dfighter1985
79e205c6d8 Expression Editor is now a QMainWindow subclass. Also added an expression tree, with some sample nodes. 2014-09-14 21:00:40 +02:00
botanic
8e40fe8210 change to 256 characters 2014-09-14 10:13:30 -07:00
botanic
d6c21ee905 Merge 2014-09-14 09:46:59 -07:00
botanic
f80f8586ec Update domain settings 2014-09-14 09:46:12 -07:00
dfighter1985
1b913a76c1 Show the node names as title, in the link dialog. 2014-09-14 17:19:11 +02:00
dfighter1985
e37394ae20 Add serial number to nodes. 2014-09-14 17:04:42 +02:00
dfighter1985
c404e0e590 Allow painting of arbitrary number of connection slots. 2014-09-14 16:57:56 +02:00
dfighter1985
eb70ac6199 A little refactoring. 2014-09-14 16:43:45 +02:00
kaetemi
62d567afca Add cartographer 2014-09-14 16:37:24 +02:00
dfighter1985
892ca16ae3 Support for adding nodes with different slot count. 2014-09-14 16:37:17 +02:00
dfighter1985
624578c024 Added unlinking support. 2014-09-14 15:36:41 +02:00
dfighter1985
8513711d66 Improved linking 2014-09-14 15:15:20 +02:00
kaetemi
21d283edb0 Add pz process 2014-09-14 15:02:44 +02:00
dfighter1985
dfe108cb82 There are more than 1 slots available now. 2014-09-13 23:54:25 +02:00
dfighter1985
594443ce3b More refactoring. 2014-09-13 22:54:50 +02:00
dfighter1985
2f92e69e9d More refactoring. 2014-09-13 22:39:00 +02:00