Commit graph

5043 commits

Author SHA1 Message Date
kaetemi
c5453625b2 Merge with ryzomcore/v0.11.1 2014-11-24 15:03:07 +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
1704fc9853 Merge with ryzomcore/v0.11.0 2014-11-10 23:47:23 +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
dfighter1985
cce08a6914 Refactoring 2014-09-13 22:31:48 +02:00
dfighter1985
1d1660c27b Connection slots are now managed by their own object, and linking is now done to their positions. 2014-09-13 22:26:11 +02:00
botanic
b8f49d5ac1 Update smarty for admin to 2.6.28 2014-09-13 13:09:48 -07:00
dfighter1985
cf42655519 Paint the connection text, boxes separately. 2014-09-13 21:34:47 +02:00
botanic
4e76e6b562 update lib sql version 2014-09-13 10:40:47 -07:00
botanic
a77516ea05 disable debug mode 2014-09-13 10:35:21 -07:00
botanic
d0491e05f5 Merge 2014-09-13 10:31:22 -07:00
botanic
2642bfc4f5 Fix #122 2014-09-13 10:31:12 -07:00
botanic
2eaf65bb62 Fix #122 2014-09-13 10:30:58 -07:00
dfighter1985
f170d8854b Add a little style. 2014-09-13 18:03:02 +02:00
kaetemi
165143984c Increase texturing limits (*4), ref #203 (TODO: Update config translations) 2014-09-13 12:14:45 +02:00
kaetemi
61d089c7c0 Fix includes 2014-09-13 12:02:47 +02:00
kaetemi
a3b0569624 Fix strange code 2014-09-13 11:13:25 +02:00
kaetemi
2eabeb234e File name, fix #202 2014-09-13 10:08:44 +02:00
dfighter1985
ac9dc5638c Throw an error message when trying to link nodes that are already linked. 2014-09-13 00:54:37 +02:00
dfighter1985
a6e5f52e17 Link nodes and remove and delete the link too when deleting one of the nodes. 2014-09-13 00:43:00 +02:00
dfighter1985
f7b360f1cb Subclassed QGraphicsItem and QGraphicsItemLine. 2014-09-12 23:45:57 +02:00
dfighter1985
475bd91a0c Added link action. 2014-09-12 21:01:29 +02:00
kaetemi
13e690b629 Change cfg name 2014-09-12 20:33:20 +02:00
kaetemi
536ac42f54 Add missing r2_islands_textures tool 2014-09-12 20:29:50 +02:00
dfighter1985
8f72f2d12f We can select multiple items 2014-09-12 19:47:28 +02:00
dfighter1985
b300bb1ee7 Added GUI for expression editor. 2014-09-12 19:19:51 +02:00
kaetemi
302c478af6 Merge with develop 2014-09-12 15:19:12 +02:00
kaetemi
13cddfe2c7 Backed out changeset: eae58a811aa5 2014-09-12 11:20:36 +02:00
kaetemi
7e7e15ebb6 Backed out changeset: cd8e80e4b0d6 2014-09-12 11:19:33 +02:00
kaetemi
1cd4afa1b6 Merge with ryzomcore/v0.10.0 2014-09-12 11:19:09 +02:00
kaetemi
a62c795fac ryzomcore/v0.10.0 2014-09-12 10:57:31 +02:00
kaetemi
5ac1d8f03b Add data_common to executables_dev batch 2014-09-12 10:50:19 +02:00
kaetemi
be7a55f19a Replace some hardcoded urls 2014-09-12 10:49:40 +02:00
kaetemi
6c0125086c Remove hardcoded urls 2014-09-12 10:42:42 +02:00
kaetemi
c0b5876e45 Remove dead code (CCharacterAchievements, CKnownBrickInfo) 2014-09-12 08:35:49 +02:00
botanic
f033744ecb Merge 2014-09-11 20:29:14 -07:00
botanic
6e8a345ad6 FIX #200
dont crash when neldb is missing
2014-09-11 10:50:34 -07:00
kaetemi
0222ebd096 Regenerate PLR cpp and header 2014-09-11 17:40:53 +02:00
kaetemi
3cd9e658a8 Add missing leaf 2014-09-11 15:13:17 +02:00
kaetemi
5391aaf75c Remove dead code 2014-09-11 12:12:17 +02:00
kaetemi
b34c7cf12a When in Rome, do as the Romans do 2014-09-11 10:36:41 +02:00
kaetemi
df9864cb30 Merge 2014-09-11 10:01:05 +02:00
kaetemi
524d5c1f25 Admin web fix 2014-09-11 10:00:10 +02:00
kaetemi
27c1c74c50 Small database adjustment 2014-09-11 09:31:59 +02:00
dfighter1985
60205f51e8 Merged default. 2014-09-10 20:18:00 +02:00
dfighter1985
af7bff14cf Offer to save changes when closing a dialog. 2014-09-10 19:59:38 +02:00
dfighter1985
54b8bf6aa2 When closing a dialog, remove it from the docked dialogs, and delete it. 2014-09-10 19:52:35 +02:00
dfighter1985
26712697c2 Allow editing of the comment section, and save comments when saving. 2014-09-10 19:14:26 +02:00
dfighter1985
6576b3d325 Raise the widget after adding. 2014-09-10 18:50:07 +02:00
dfighter1985
912248afde WTF? 2014-09-10 18:49:34 +02:00
dfighter1985
cb0cacf3cc oups 2014-09-10 18:04:55 +02:00
dfighter1985
b69169af71 Use a file browser for setting files. 2014-09-10 17:59:22 +02:00
dfighter1985
90b3bd0338 A little refactoring 2014-09-10 17:02:51 +02:00
dfighter1985
21da4da0fa Store the filename only in the Dfn value. 2014-09-10 16:44:49 +02:00
kaetemi
0d40dbc177 Add script for installing worldedit data 2014-09-10 16:38:19 +02:00
dfighter1985
c4a9db12f9 Properly support color types. 2014-09-10 16:22:08 +02:00
kaetemi
bdd7cc9b90 Nice try 2014-09-10 16:00:13 +02:00
nimetu
18c5c4df06 Fix #161 fix craft success rate display on client 2014-09-10 15:40:32 +02:00
nimetu
2f78b7dd68 Fix #143 /muteUniverse on dyn universe channels 2014-09-10 15:38:57 +02:00
nimetu
e781439e48 Fix #199 Studio object viewer plugin font 2014-09-10 12:19:11 +02:00
kaetemi
9e948bbf60 Move islands entry points to data 2014-09-10 08:25:45 +02:00
kaetemi
3f9e5e5d03 Remove unused mirror dataset 2014-09-10 08:18:05 +02:00
kaetemi
d02bd5e7b6 Merge 2014-09-10 05:28:14 +02:00
kaetemi
f17fd758ef Use the correct ring database 2014-09-10 05:25:00 +02:00
botanic
95910f0a4f FIX #192 2014-09-09 17:29:59 -07:00
botanic
81ab2fb438 FIX #197
Added default config values that should work for mail config settings in case people are lazy
2014-09-09 17:26:20 -07:00
botanic
d20ef06ba0 fix windows warnings in sync 2014-09-09 17:20:23 -07:00
dfighter1985
3425c517f5 Create vstruct node when needed. 2014-09-10 00:36:55 +02:00
dfighter1985
bd508d3ef4 Instead of storing the node, store the name and the node type. 2014-09-10 00:28:03 +02:00
dfighter1985
0c3a1d7b23 Don't add Virtual Structs to the property browser! 2014-09-09 22:01:52 +02:00
dfighter1985
df02d7f7f1 Added support for Virtual Structs. 2014-09-09 21:57:30 +02:00
kaetemi
3251199ef1 Use correct AES cfg 2014-09-09 18:58:05 +02:00
kaetemi
aa97b11910 Crashfix 2014-09-09 15:50:12 +02:00
kaetemi
f1bca534b5 Bugfix 2014-09-09 12:39:35 +02:00
kaetemi
e03ced791d Typo 2014-09-09 08:23:37 +02:00
kaetemi
f38bcfc1bd Don't use magic numbers for the LCT 2014-09-09 08:16:44 +02:00
kaetemi
0a2ce69818 Typo 2014-09-09 08:15:05 +02:00
kaetemi
f351f458b1 Cleanup the AMS theme a bit, improve layouting of user settings 2014-09-09 04:02:15 +02:00
kaetemi
4e4052a3df Mask database connection error 2014-09-09 02:52:24 +02:00
kaetemi
6bd1563f9b Merge 2014-09-09 02:30:24 +02:00
botanic
f7094af0fa fix sync 2014-09-08 17:29:43 -07:00
kaetemi
001f90bb99 Cache PDO connections and connection failures in a single page load 2014-09-09 02:15:25 +02:00
kaetemi
7ebc9478e6 Disable APC page caching 2014-09-09 02:14:49 +02:00
botanic
8c03a3d746 dont cache $#1t 2014-09-08 16:23:04 -07:00
botanic
dbcbefe77a attachment error checking 2014-09-08 11:59:49 -07:00
botanic
69e2257cbb make the random generation more secure 2014-09-08 11:46:43 -07:00
botanic
0be70dd7de fix some unset warnings 2014-09-08 05:54:34 -07:00
botanic
f24a0fb73d change some div's so it looks proper 2014-09-08 05:20:28 -07:00
botanic
e73079a1d1 turn debugging off 2014-09-08 04:56:13 -07:00
botanic
1ee6cd5387 properly display permissions 2014-09-08 04:55:05 -07:00
botanic
d1d6bbe0ee display the correct plugin page 2014-09-08 03:55:59 -07:00
botanic
9a98e129ec set template permissions 2014-09-08 03:29:30 -07:00
botanic
2644b999c3 fix menu plugin display 2014-09-08 03:19:13 -07:00
botanic
d39729d998 fix notice 2014-09-08 03:04:34 -07:00
botanic
af204ebb7b fix plugin template 2014-09-08 03:02:11 -07:00
botanic
0c2e70bb2b fix index issue 2014-09-08 02:57:09 -07:00
botanic
087c8fce40 Fix smarty issues 2014-09-08 02:36:38 -07:00
botanic
44508e3d73 Cleanup Domain management code 2014-09-08 02:36:31 -07:00
botanic
08ffaa0dfe Merge 2014-09-08 02:08:26 -07:00
botanic
00ecfd59d9 upgrade smarty to 3.1.19 2014-09-08 02:07:42 -07:00
botanic
03742bc483 Fix for stupid loop 2014-09-08 02:05:49 -07:00
kaetemi
5efb09bc5a Install fix 2014-09-08 10:42:38 +02:00
kaetemi
fa975bedb3 Cleanup some RYZOMID code 2014-09-08 09:48:28 +02:00
kaetemi
424b5af411 Remove dead code in game item manager 2014-09-08 09:37:14 +02:00
kaetemi
6376925e62 Bugfix in distance prioritizer 2014-09-08 09:09:42 +02:00
botanic
eb6864f942 remove testing errorlog 2014-09-07 23:57:31 -07:00
kaetemi
730d0e42d1 Remove dead code 2014-09-08 08:04:09 +02:00
botanic
c3fc3abb81 Merge 2014-09-07 22:27:32 -07:00
botanic
8c3dc770ec Domain management plugin updates 2014-09-07 22:26:34 -07:00
kaetemi
4798c0168e Better use this 2014-09-08 07:16:07 +02:00
kaetemi
5554aa2aec Enable PHP APC cache for AMS smarty 2014-09-08 07:10:28 +02:00
kaetemi
7e50a01513 Remove dead declarations in DSS 2014-09-08 05:34:14 +02:00
kaetemi
3f1b78bf91 Fix SU RSM UAP SQL query 2014-09-08 05:28:09 +02:00
kaetemi
79be610902 Make this extra clear 2014-09-08 01:41:33 +02:00
kaetemi
4158b5bcac Enable ring database installation and upgrade in the setup script... 2014-09-08 01:35:47 +02:00
kaetemi
01b0124608 Translation fix 2014-09-08 01:27:46 +02:00
kaetemi
e2246eb8c3 Adjust plugin description 2014-09-08 00:42:07 +02:00
kaetemi
987cea24a0 Don't put fixed row id's in insert queries for upgrades 2014-09-08 00:26:54 +02:00
kaetemi
be40dff097 Bugfix 2014-09-08 00:23:07 +02:00
kaetemi
c691a999b1 Don't write version if upgrade failed 2014-09-08 00:21:30 +02:00
kaetemi
16cdf3b765 Bugfix 2014-09-08 00:16:36 +02:00
kaetemi
84364c0a82 Fix 2014-09-08 00:11:48 +02:00
kaetemi
31d29526cf Typo 2014-09-08 00:09:12 +02:00
kaetemi
670a5905ae Setup adjust 2014-09-08 00:06:13 +02:00
Dylan Geels
76e2a6e7f0 The setup was showing a error from it. 2014-09-07 13:18:32 +00:00
Dylan Geels
42f4a38b9f Function split() is deprecated 2014-09-07 13:06:24 +00:00
Dylan Geels
a6fb490d68 Function split() is deprecated 2014-09-07 13:01:42 +00:00
botanic
36cbfcbce8 upgrade nel lib version 2014-09-07 05:41:35 -07:00
botanic
dfb748b06f Merge 2014-09-07 05:40:29 -07:00
botanic
08301dcb44 setup modifications 2014-09-07 05:40:02 -07:00
botanic
ca8270bf65 Initial Domain Management Plugin 2014-09-07 05:39:48 -07:00
botanic
2f1f2139b5 added initial domain_management plugin, also fixed potental conflicting hook names 2014-09-07 03:17:20 -07:00
kaetemi
6f2ac8e535 Cleanup shard table 2014-09-07 09:10:23 +02:00
kaetemi
55d2685aca Change ClientApplication to DomainId in permission table 2014-09-07 08:53:10 +02:00
kaetemi
b1af237e5a Cleanup some English AMS translations 2014-09-07 04:21:08 +02:00
kaetemi
246e7d4930 Cleanup some English AMS translations 2014-09-07 04:16:07 +02:00
kaetemi
768bfd0238 Bugfix 2014-09-07 03:51:10 +02:00
kaetemi
41cdd65964 Bugfix 2014-09-07 03:47:55 +02:00
kaetemi
65a4681d36 Add login configuration 2014-09-07 03:43:00 +02:00
kaetemi
778a55d022 This might fix #193 2014-09-06 21:25:07 +02:00
kaetemi
c9b3d84f4c Syntax styling 2014-09-06 20:59:21 +02:00
kaetemi
7095bf0864 This should fix #193 2014-09-06 20:56:06 +02:00
botanic
3471c23eb6 Merge 2014-09-05 22:24:41 -07:00
botanic
2694a99c85 fix missing pcntl_fork func 2014-09-05 22:24:09 -07:00
kaetemi
7499ed408c Add more paranoia 2014-09-06 06:49:42 +02:00
kaetemi
d9ce522e0a Now really, don't execute any scripts here 2014-09-06 06:40:33 +02:00
kaetemi
4765f63328 Saner behaviour to show Forbidden error 2014-09-06 04:55:17 +02:00
kaetemi
510bb2074b Add upgrade script 2014-09-06 04:44:08 +02:00
botanic
4f51c4cdb6 fixed sync to be more robust 2014-09-05 19:38:53 -07:00
botanic
f9c4c3ac1f throw error on non-writable file 2014-09-05 19:26:12 -07:00
botanic
d1a300e751 forgot $AMS_TMPDIR 2014-09-05 19:18:17 -07:00
botanic
1d15bdfab3 Merge 2014-09-05 18:46:33 -07:00
botanic
e7ca564187 Fix #189 2014-09-05 18:46:13 -07:00
kaetemi
c782592d9d Make files folder safe to use 2014-09-06 03:44:58 +02:00
kaetemi
b638219dbd Make files folder safe to use 2014-09-06 03:43:31 +02:00
kaetemi
0e76ed6386 Protect shard admin auth SQL queries 2014-09-06 01:40:37 +02:00
kaetemi
4a186cc233 Fix version number 2014-09-06 00:38:20 +02:00
kaetemi
5abb581602 Merge 2014-09-06 00:37:29 +02:00
kaetemi
f46cb42bed Create shard admin user in setup 2014-09-06 00:35:28 +02:00
dfighter1985
15f6ed3c37 Merged default. 2014-09-05 22:28:11 +02:00
dfighter1985
029ebdc751 Get type info from DFN. 2014-09-05 21:42:14 +02:00
dfighter1985
ca910cf17a Added support for manipulating atoms. 2014-09-05 20:28:43 +02:00
dfighter1985
49f216ca0e Appending, resizing arrays, deleting array members should now create the proper new nodes. 2014-09-05 19:41:51 +02:00
dfighter1985
c4e01eaca6 Added support for adding atoms and virtual structs in the treeview. 2014-09-05 18:58:47 +02:00
kervala
ad5cc68107 Changed: Code formatting 2014-09-05 15:42:53 +02:00
dfighter1985
2020638e35 Do the same when readding items after a deletion. 2014-09-05 15:20:22 +02:00
dfighter1985
12996110fc Add new array entries with all their children. 2014-09-05 15:13:58 +02:00
botanic
4b526a4761 Merge 2014-09-05 02:31:56 -07:00
botanic
4368fb7f64 only show powered by and version when admin 2014-09-05 02:30:50 -07:00
botanic
5f5cfd2df6 added version number to ams 2014-09-05 02:27:08 -07:00
kaetemi
2a6edf5c0f Merge 2014-09-05 11:22:47 +02:00
kaetemi
17234d6398 Merge 2014-09-05 11:22:18 +02:00
kaetemi
b273806cf0 Validate setup password 2014-09-05 11:21:21 +02:00
botanic
4ce203b32c remove unecessery printing 2014-09-05 02:21:00 -07:00
botanic
bb38a64e78 fixed some caching 2014-09-05 02:17:19 -07:00
botanic
6ca575ef33 remove errolog 2014-09-05 02:10:32 -07:00
botanic
6b92b85b04 fix sync 2014-09-05 02:10:09 -07:00
kaetemi
daf80ea104 Add basis for database upgrades 2014-09-05 11:07:25 +02:00
botanic
85910829a7 Made filesize friendly 2014-09-05 01:30:54 -07:00
botanic
88afbeac83 remove old file 2014-09-05 01:22:39 -07:00
botanic
42a6c38080 added placeholder 2014-09-05 01:22:19 -07:00
botanic
0076828ee0 added placeholder 2014-09-05 01:21:59 -07:00
botanic
851ffd2bb6 Merge 2014-09-05 01:20:39 -07:00
botanic
cad8ea9592 Fix #190 2014-09-05 01:20:00 -07:00
kaetemi
856213a2aa Alternative redirect script 2014-09-05 10:11:50 +02:00
kaetemi
927eda9188 Merge 2014-09-05 10:01:20 +02:00
kaetemi
bd5cbd9357 Modularize web setup 2014-09-05 09:57:06 +02:00
botanic
2f4d30dc1b forgot to add variable 2014-09-05 00:52:38 -07:00
botanic
0570aedff7 Fix #188 2014-09-05 00:50:07 -07:00
botanic
a5f5c0ce37 added new ticket_attachment table to installer properly 2014-09-04 21:34:57 -07:00
botanic
a49a6f7c4b fixed installer 2014-09-04 20:29:45 -07:00
botanic
460298c773 Upload button setup
TODO: add files to database
TODO: hash folder to stick files in
2014-09-04 19:58:04 -07:00
botanic
49370fb5a4 Merge 2014-09-04 17:27:29 -07:00
botanic
58a2208fe9 Fix #111 2014-09-04 17:26:22 -07:00
dfighter1985
8d3c8de517 Enter a log entry when creating new documents. 2014-09-04 15:41:17 +02:00
dfighter1985
63972b8c43 Merged default. 2014-09-03 20:27:01 +02:00
dfighter1985
6457ab90eb Added support for creating new form documents 2014-09-03 19:55:46 +02:00
dfighter1985
256d72fe62 Added support for new DFN document creation. 2014-09-03 19:37:49 +02:00
dfighter1985
d139bc9f8d Added support for new typ document creation. 2014-09-03 19:28:01 +02:00
dfighter1985
3e3a9b8585 Error messages 2014-09-03 19:14:32 +02:00
dfighter1985
6954103b61 A little refactoring, dialogs are now loaded using the full filepath. 2014-09-03 19:11:38 +02:00
dfighter1985
ec20f009e7 Added GUI stub for new types/Dfns/forms. 2014-09-03 18:33:09 +02:00
dfighter1985
1be8e6f6a8 Removed m_modified, since the base widget has a field for this. 2014-09-03 17:25:11 +02:00
dfighter1985
baec2d1155 Form editor should trigger the save button properly now. 2014-09-03 17:22:09 +02:00
dfighter1985
a0194f5d24 Added missing copyright headers. 2014-09-03 17:12:25 +02:00
dfighter1985
2802f9e6cb Log changes and save log. 2014-09-03 16:42:12 +02:00
dfighter1985
c2738ecf73 Mark the typ dialog modified after a modification. 2014-09-03 16:26:52 +02:00
dfighter1985
4239748047 Apply changes. 2014-09-03 16:14:38 +02:00
dfighter1985
43bf6cebed Load type data into the property browser. 2014-09-03 16:08:13 +02:00
botanic
6fe49dfe92 fix settings width 2014-09-03 05:27:38 -07:00
botanic
fcbca9c5ed margins in element-style...really? 2014-09-03 05:05:21 -07:00
botanic
0dc2509c0e fix #185 2014-09-03 05:00:36 -07:00
botanic
0004241718 Merge 2014-09-03 04:42:54 -07:00
botanic
157c286502 fix support group bug and dblayer bug 2014-09-03 04:42:28 -07:00
Matthew Lagoe
fc5d684403 Merged in shubham_meena/ryzomcore (pull request #71)
documentation for doxygen containing plugin management system
2014-09-03 04:15:02 -07:00
botanic
fa0262bc0a Fix syntax error with unassigned ticket 2014-09-03 04:13:44 -07:00
botanic
fb18ee6f54 fixed language when logged in 2014-09-03 04:03:01 -07:00
botanic
ef2477fa23 updated bootstrap and charisma 2014-09-03 03:22:14 -07:00
botanic
e44cd3d40e updating plugins 2014-09-03 01:28:27 -07:00
botanic
6b484f7cbb Fix path's in plugins 2014-09-03 01:13:08 -07:00
botanic
f29aa60fc7 fixed change email on shard 2014-09-03 00:23:47 -07:00
botanic
ceb1a30e17 Changed to use new throw new SystemExit(); 2014-09-02 23:30:25 -07:00
botanic
6edcdcf65f Merge 2014-09-02 23:26:53 -07:00
botanic
556f246b81 Fix add user in settings 2014-09-02 23:24:41 -07:00
kaetemi
b691fa9694 Crash workaround 2014-09-03 08:18:21 +02:00
kaetemi
2c2f776f3a Remove bad data in sql 2014-09-03 07:38:24 +02:00
kaetemi
88ca2ab7e9 Don't cache redirects 2014-09-03 07:36:10 +02:00
kaetemi
37e0201a5f Throw exception instead of exit. 2014-09-03 07:23:39 +02:00
kaetemi
591a038ad3 Merge 2014-09-03 07:07:55 +02:00
kaetemi
50a3791553 Die, don't exit 2014-09-03 07:06:43 +02:00
botanic
82aaca7eea Merge 2014-09-02 21:40:10 -07:00
botanic
7b27b580b1 Fix #181 2014-09-02 21:39:35 -07:00
kaetemi
6d98bb0493 Merge 2014-09-03 06:39:20 +02:00
kaetemi
fd59c37eda Force all user ids equal 2014-09-03 06:38:38 +02:00
botanic
e75cb7fabc Fix #182 2014-09-02 21:32:48 -07:00
botanic
72db8409a5 Merge 2014-09-02 21:26:09 -07:00
botanic
419f8349dd settings page display bug 2014-09-02 21:25:39 -07:00
kaetemi
c008e0b46d Transactions not required here either, actually 2014-09-03 06:16:41 +02:00
kaetemi
4982e7c6c4 Merge 2014-09-03 06:08:08 +02:00
kaetemi
27efa58777 Reduce unnecessary manual transaction commit 2014-09-03 06:07:02 +02:00
botanic
d9a2e44e9e Merge 2014-09-02 21:04:22 -07:00
botanic
099bce3701 missing ) 2014-09-02 21:03:51 -07:00
botanic
220a93a133 updated hgignore as well as fixed php errors 2014-09-02 20:55:51 -07:00
kaetemi
44b8223a5f Disable connection cache workaround 2014-09-03 05:47:47 +02:00
kaetemi
3f9eb61e07 Don't create transactions for SELECT queries 2014-09-03 05:39:16 +02:00
kaetemi
33d7bf5c15 Fix #180 2014-09-03 05:11:11 +02:00
kaetemi
fdc514b039 Fix #180 2014-09-03 04:46:08 +02:00
kaetemi
011869167d Only make a single database connection per host, and keep them persistent 2014-09-03 03:51:11 +02:00
kaetemi
379e04dc25 Remove excessive javascript interactivity in AMS 2014-09-03 03:08:57 +02:00
kaetemi
bf7a91b3fc Some more adjustments for DBLayer... 2014-09-03 03:08:22 +02:00
dfighter1985
d146d91ab1 Mark the DFN editor modified after adding / removing an element. 2014-09-03 00:00:52 +02:00
dfighter1985
5022549a0d Implemented saving. 2014-09-02 23:54:42 +02:00
dfighter1985
3d6a9fb139 Implemented add button. 2014-09-02 23:37:16 +02:00
dfighter1985
9422a67cf3 Implemented definition editing. 2014-09-02 23:25:47 +02:00
dfighter1985
8635cd3c65 Implemented remove button. 2014-09-02 23:07:55 +02:00
dfighter1985
a76a6b6e85 Load comments, log, and definitions. 2014-09-02 23:00:32 +02:00
dfighter1985
3b270c3e9e Delete DFN when destroying a DFN editor... 2014-09-02 22:47:18 +02:00
dfighter1985
a66582cff5 Load .typ file. 2014-09-02 22:46:19 +02:00