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

4658 commits

Author SHA1 Message Date
kaetemi
f900f80b36 Merge with develop 
--HG--
branch : sha512-auth
 2014-10-07 01:15:35 +02:00
Jan Boon
944b048356 Merged in rodolphe_breard/ryzomcore/sha512-auth (pull request #89) 
ref #206 : windows compilation stuff

--HG--
branch : sha512-auth
 2014-10-07 01:14:31 +02:00
kaetemi
b98c6f6a59 Set version 
--HG--
branch : develop
 2014-10-07 01:14:03 +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
Rodolphe Breard
4c2be7ea1f ref #206 : hacking the types so it may compile on windows 
--HG--
branch : sha512-auth
 2014-10-02 19:14:25 +02:00
Rodolphe Breard
81d5294fc3 ref #206 : removing unused crypt lib reference 
--HG--
branch : sha512-auth
 2014-10-02 18:21:56 +02:00
kaetemi
bb9d0d91d3 Fix #207, FXAA orientation under D3D 
--HG--
branch : develop
 2014-10-01 23:24:56 +02:00
kaetemi
ff7450a22e Merge with develop 
--HG--
branch : sha512-auth
 2014-10-01 23:23:06 +02:00
Jan Boon
7549ab8b7f Merged in rodolphe_breard/ryzomcore/sha512-auth (pull request #88) 
rolling back to include a crypt(3) implementation and adding sha512 support

--HG--
branch : sha512-auth
 2014-10-01 23:20:52 +02:00
Jan Boon
7729c3b65c Merged in nimetu/ryzomcore-2/nimetu/find-lua-version-for-luabind-under-fedor-1412076128442 (pull request #87) 
find lua version for luabind under fedora

--HG--
branch : develop
 2014-10-01 23:19:21 +02:00
Jan Boon
782f08f137 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)

--HG--
branch : develop
 2014-10-01 23:19:04 +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
Rodolphe Breard
65b902970a ref #206 : rolling back to include a crypt(3) implementation and adding sha512 support 
--HG--
branch : sha512-auth
 2014-10-01 21:29:10 +02:00
nimetu
dcf2906b94 find lua version for luabind under fedora 
--HG--
branch : nimetu/find-lua-version-for-luabind-under-fedor-1412076128442
 2014-09-30 11:23:16 +00:00
nimetu
3e209147b0 static libxml2 under linux requires lzma (tested on fedora/debian) 
--HG--
branch : nimetu/static-libxml2-under-linux-requires-lzma-1412075714030
 2014-09-30 11:16:28 +00: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
22d9accae6 When moving a widget, save the reference to the hierarchy lookup map... 
--HG--
branch : dfighter-tools
 2014-09-27 20:54:44 +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
0af278e50a A little bit of refactoring. 
--HG--
branch : dfighter-tools
 2014-09-27 01:04:49 +02:00
dfighter1985
8c3702f826 Update coords when changing something. 
--HG--
branch : dfighter-tools
 2014-09-27 01:00:52 +02: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
4ec13e57e4 Collapse the tree, and only expand the items that are needed to get to the selected items. 
--HG--
branch : dfighter-tools
 2014-09-25 00:37:25 +02:00
dfighter1985
9cae0c1793 When repareting a widget, remove the old item from the hierarchy and add a new one at the right place. 
--HG--
branch : dfighter-tools
 2014-09-24 23:56:11 +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
3bd552ebb0 Add useful default config variables to dev client 
--HG--
branch : develop
 2014-09-24 12:34:40 +02:00
kaetemi
27cbd59a0f Add some more practical data build batch scripts 
--HG--
branch : develop
 2014-09-24 01:07:12 +02:00
kaetemi
6551881171 Handle GUI event only once 
--HG--
branch : develop
 2014-09-23 19:47:06 +02:00
kaetemi
cb022c6bbb Remove debug message 
--HG--
branch : develop
 2014-09-23 18:18:14 +02:00
kaetemi
e714e37c4c Fix EGS sheet rebuild crashes 
--HG--
branch : develop
 2014-09-23 13:54:02 +02:00
dfighter1985
7ef9920bac Instantiate the Wold Editor window after the LIGO setup. 
--HG--
branch : dfighter-tools
 2014-09-23 00:16:57 +02:00
dfighter1985
9b989a2dc0 Merged develop. 
--HG--
branch : dfighter-tools
 2014-09-22 23:58:48 +02:00
dfighter1985
e67e9594e1 Call the onActivate method of the current context after all plugins are initialized. 
--HG--
branch : dfighter-tools
 2014-09-22 23:41:55 +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
kaetemi
eff07ebbf9 Add an assert 
--HG--
branch : develop
 2014-09-21 13:24:33 +02:00
kaetemi
cec992c4a5 Fix double delete 
--HG--
branch : develop
 2014-09-21 12:31:02 +02:00
dfighter1985
648b2cb46b oups 
--HG--
branch : dfighter-tools
 2014-09-20 20:55:30 +02:00
dfighter1985
5b7bc8cc54 GUI Editor should no longer crash on Linux 
--HG--
branch : dfighter-tools
 2014-09-20 20:51:08 +02:00
dfighter1985
447aac5821 Merged develop 
--HG--
branch : dfighter-tools
 2014-09-19 20:10:00 +02:00
kaetemi
779b0c22bc Add extra search paths 
--HG--
branch : develop
 2014-09-19 19:48:17 +02:00
kaetemi
0ed6e8111b Increment web version 
--HG--
branch : sha512-auth
 2014-09-18 21:55:34 +02:00
kaetemi
b6df4cac4f Merge with develop 
--HG--
branch : sha512-auth
 2014-09-18 21:54:34 +02:00
kaetemi
0275d0fe29 It works on my machine 
--HG--
branch : develop
 2014-09-18 21:02:14 +02:00
kaetemi
902a873e78 Add resave scripts 
--HG--
branch : develop
 2014-09-18 17:40:07 +02:00
kaetemi
5e9c3b82fc Add particle system path fixing script 
--HG--
branch : develop
 2014-09-18 14:10:03 +02:00
kaetemi
027860be16 Fix missing include 
--HG--
branch : develop
 2014-09-18 13:02:32 +02:00
kaetemi
c1b8ea9bd0 Backed out incomplete changes to GL driver 
--HG--
branch : develop
 2014-09-18 11:31:19 +02:00
dfighter1985
780394f989 Fixed Object Viewer build. 
--HG--
branch : dfighter-tools
 2014-09-17 22:36:58 +02:00
dfighter1985
7a4d9e2cdc Merged the gui-editor branch. 
--HG--
branch : dfighter-tools
 2014-09-17 21:12:14 +02:00
dfighter1985
012fae0ef6 don't evaluate the child-nodes when there are none, directly just return () 
--HG--
branch : dfighter-tools
 2014-09-17 20:54:16 +02:00
dfighter1985
4d760c7515 When removing the root node, don't retain the pointer to it... 
--HG--
branch : dfighter-tools
 2014-09-17 20:51:45 +02:00
dfighter1985
0c354f436d Added the rest of the expression files. 
--HG--
branch : dfighter-tools
 2014-09-17 20:49:26 +02:00
dfighter1985
d90d3cd227 Merged develop. 
--HG--
branch : dfighter-tools
 2014-09-17 19:51:14 +02:00
dfighter1985
4059547835 Added support for clearing the Expression Editor scene. 
--HG--
branch : dfighter-tools
 2014-09-17 19:27:06 +02:00
dfighter1985
e77fed3c3d Texture Chooser shouldn't have been left in the main menu... 
--HG--
branch : dfighter-tools
 2014-09-17 19:21:39 +02:00
dfighter1985
df98492b1c Moved the Expression Editor to it's right place. 
--HG--
branch : dfighter-tools
 2014-09-17 19:19:43 +02:00
dfighter1985
a9cd538786 Instead of mouse move event, use the itemChange handler to move the links. 
--HG--
branch : dfighter-tools
 2014-09-17 16:17:41 +02:00
dfighter1985
315e43a469 ExpressionNode flags are now set in it's constructor. 
--HG--
branch : dfighter-tools
 2014-09-17 16:02:28 +02:00
dfighter1985
bf12cbc53c Links shouldn't be selectable. 
--HG--
branch : dfighter-tools
 2014-09-17 16:01:23 +02:00
dfighter1985
b715b6eaf6 This is the GUI Editor not Georges... 
--HG--
branch : dfighter-tools
 2014-09-17 15:50:12 +02:00
dfighter1985
83859cdd82 Save expression. 
--HG--
branch : dfighter-tools
 2014-09-17 15:47:49 +02:00
dfighter1985
5f47f74431 Expression can now be built. 
--HG--
branch : dfighter-tools
 2014-09-17 15:31:54 +02:00
dfighter1985
cbca49fcc0 A root node can now be set. The root node is where the evaluation will start. 
--HG--
branch : dfighter-tools
 2014-09-17 14:41:57 +02:00
Rodolphe Breard
5c2cc95dc9 Fixing the database migration system for issue #206 
--HG--
branch : sha512-auth
 2014-09-16 22:43:36 +02:00
Rodolphe Breard
094a23bd09 fixing #206 : passwords are now stored using SHA-512 instead of traditional DES 
--HG--
branch : sha512-auth
 2014-09-16 20:34:26 +02:00
dfighter1985
cc071e5048 Added sample expression files. 
--HG--
branch : dfighter-tools
 2014-09-16 15:54:53 +02:00
dfighter1985
5e91c2f374 When changing the value of a node, change the size the node if needed. 
--HG--
branch : dfighter-tools
 2014-09-16 15:31:06 +02:00
dfighter1985
f0e78b5fbb Allow to set and change values of value nodes. 
--HG--
branch : dfighter-tools
 2014-09-16 15:15:31 +02:00
dfighter1985
142d82d788 Only allow variable nodes to have their number of slots changed. 
--HG--
branch : dfighter-tools
 2014-09-16 03:45:26 +02:00
dfighter1985
89aaa52703 Set the number of slots and their names from the data loaded from XMLs. 
--HG--
branch : dfighter-tools
 2014-09-16 03:38:21 +02:00
dfighter1985
af74411104 Parse expression files, and build the expression tree from the expressions parsed from these files. 
--HG--
branch : dfighter-tools
 2014-09-16 02:32:10 +02:00
kaetemi
c789a22155 Fix r2ed 
--HG--
branch : develop
 2014-09-15 18:15:40 +02:00
kaetemi
74e9aac960 Fix r2ed 
--HG--
branch : develop
 2014-09-15 17:42:24 +02:00
kaetemi
9283a74a22 Fix r2ed 
--HG--
branch : develop
 2014-09-15 16:59:12 +02:00
kaetemi
84046c8db4 Fix r2ed 
--HG--
branch : develop
 2014-09-15 14:33:07 +02:00
kaetemi
07caf402c2 Fix bad type passed to sscanf 
--HG--
branch : develop
 2014-09-15 12:49:13 +02:00
dfighter1985
5e5fb49f12 Slot count can now be changed. 
--HG--
branch : dfighter-tools
 2014-09-15 01:25:01 +02:00
botanic
89604dbba4 Fix #194 
--HG--
branch : develop
 2014-09-14 15:52:40 -07:00
botanic
ba3f48a9e2 FIX #205 
--HG--
branch : develop
 2014-09-14 13:09:00 -07:00
dfighter1985
7f2091d6c9 Expression Editor is now a QMainWindow subclass. Also added an expression tree, with some sample nodes. 
--HG--
branch : dfighter-tools
 2014-09-14 21:00:40 +02:00
botanic
9ceeed138e change to 256 characters 
--HG--
branch : develop
 2014-09-14 10:13:30 -07:00
botanic
34acdf0d94 Merge 
--HG--
branch : develop
 2014-09-14 09:46:59 -07:00
botanic
38810a8c0f Update domain settings 
--HG--
branch : develop
 2014-09-14 09:46:12 -07:00
dfighter1985
65382b45b7 Show the node names as title, in the link dialog. 
--HG--
branch : dfighter-tools
 2014-09-14 17:19:11 +02:00
dfighter1985
eb0693cd27 Add serial number to nodes. 
--HG--
branch : dfighter-tools
 2014-09-14 17:04:42 +02:00
dfighter1985
99ebe16c03 Allow painting of arbitrary number of connection slots. 
--HG--
branch : dfighter-tools
 2014-09-14 16:57:56 +02:00
dfighter1985
40b4bce729 A little refactoring. 
--HG--
branch : dfighter-tools
 2014-09-14 16:43:45 +02:00
kaetemi
adb717052a Add cartographer 
--HG--
branch : develop
 2014-09-14 16:37:24 +02:00
dfighter1985
42cd76c768 Support for adding nodes with different slot count. 
--HG--
branch : dfighter-tools
 2014-09-14 16:37:17 +02:00
dfighter1985
aa67011381 Added unlinking support. 
--HG--
branch : dfighter-tools
 2014-09-14 15:36:41 +02:00
dfighter1985
875cad3f72 Improved linking 
--HG--
branch : dfighter-tools
 2014-09-14 15:15:20 +02:00
kaetemi
b5a95d725b Add pz process 
--HG--
branch : develop
 2014-09-14 15:02:44 +02:00
dfighter1985
2e6a5bb1d6 There are more than 1 slots available now. 
--HG--
branch : dfighter-tools
 2014-09-13 23:54:25 +02:00
dfighter1985
275095107b More refactoring. 
--HG--
branch : dfighter-tools
 2014-09-13 22:54:50 +02:00
dfighter1985
5fc392623b More refactoring. 
--HG--
branch : dfighter-tools
 2014-09-13 22:39:00 +02:00
dfighter1985
c63f22fe92 Refactoring 
--HG--
branch : dfighter-tools
 2014-09-13 22:31:48 +02:00
dfighter1985
4cf4440a97 Connection slots are now managed by their own object, and linking is now done to their positions. 
--HG--
branch : dfighter-tools
 2014-09-13 22:26:11 +02:00
botanic
07933bf52c Update smarty for admin to 2.6.28 
--HG--
branch : develop
 2014-09-13 13:09:48 -07:00
dfighter1985
7c930366de Paint the connection text, boxes separately. 
--HG--
branch : dfighter-tools
 2014-09-13 21:34:47 +02:00
botanic
53ea877a50 update lib sql version 
--HG--
branch : develop
 2014-09-13 10:40:47 -07:00
botanic
3c01c5c811 disable debug mode 
--HG--
branch : develop
 2014-09-13 10:35:21 -07:00
botanic
9be68e3326 Merge 
--HG--
branch : develop
 2014-09-13 10:31:22 -07:00
botanic
9b813a5e4c Fix #122 
--HG--
branch : develop
 2014-09-13 10:31:12 -07:00
botanic
765e614c23 Fix #122 
--HG--
branch : develop
 2014-09-13 10:30:58 -07:00
dfighter1985
aef69eef64 Add a little style. 
--HG--
branch : dfighter-tools
 2014-09-13 18:03:02 +02:00
kaetemi
433d83e2fc Increase texturing limits (*4), ref #203 (TODO: Update config translations) 
--HG--
branch : develop
 2014-09-13 12:14:45 +02:00
kaetemi
7fed632c54 Fix includes 
--HG--
branch : develop
 2014-09-13 12:02:47 +02:00
kaetemi
9678b56ed5 Fix strange code 
--HG--
branch : develop
 2014-09-13 11:13:25 +02:00
dfighter1985
af550acd62 Throw an error message when trying to link nodes that are already linked. 
--HG--
branch : dfighter-tools
 2014-09-13 00:54:37 +02:00
dfighter1985
d2c396bc84 Link nodes and remove and delete the link too when deleting one of the nodes. 
--HG--
branch : dfighter-tools
 2014-09-13 00:43:00 +02:00
dfighter1985
adece7564a Subclassed QGraphicsItem and QGraphicsItemLine. 
--HG--
branch : dfighter-tools
 2014-09-12 23:45:57 +02:00
dfighter1985
83566116d9 Added link action. 
--HG--
branch : dfighter-tools
 2014-09-12 21:01:29 +02:00
kaetemi
6bb136dca9 Change cfg name 
--HG--
branch : develop
 2014-09-12 20:33:20 +02:00
kaetemi
07ee9a4469 Add missing r2_islands_textures tool 
--HG--
branch : develop
 2014-09-12 20:29:50 +02:00
dfighter1985
e2ea5a74b8 We can select multiple items 
--HG--
branch : dfighter-tools
 2014-09-12 19:47:28 +02:00
dfighter1985
cc7e93c96e Added GUI for expression editor. 
--HG--
branch : dfighter-tools
 2014-09-12 19:19:51 +02:00
kaetemi
d12ccf194e Merge with develop 
--HG--
branch : multipass-stereo
 2014-09-12 15:19:12 +02:00
kaetemi
e347b2a97f ryzomcore/v0.10.0 2014-09-12 10:57:31 +02:00
kaetemi
9fd8338849 Add data_common to executables_dev batch 2014-09-12 10:50:19 +02:00
kaetemi
8a3994d95a Replace some hardcoded urls 2014-09-12 10:49:40 +02:00
kaetemi
50f05a2bb9 Remove hardcoded urls 2014-09-12 10:42:42 +02:00
kaetemi
927ecb3dae Remove dead code (CCharacterAchievements, CKnownBrickInfo) 2014-09-12 08:35:49 +02:00
botanic
dcd09e034b Merge 2014-09-11 20:29:14 -07:00
botanic
92afe8e76a FIX #200 
dont crash when neldb is missing
 2014-09-11 10:50:34 -07:00
kaetemi
2abe431675 Regenerate PLR cpp and header 2014-09-11 17:40:53 +02:00
kaetemi
14fda8a39a Add missing leaf 2014-09-11 15:13:17 +02:00
kaetemi
47368e78f9 Remove dead code 2014-09-11 12:12:17 +02:00
kaetemi
0d7c9fd4bf When in Rome, do as the Romans do 2014-09-11 10:36:41 +02:00
kaetemi
6b2b633fed Merge 2014-09-11 10:01:05 +02:00
kaetemi
a9ee3c6b37 Admin web fix 2014-09-11 10:00:10 +02:00
kaetemi
1bf482adc9 Small database adjustment 2014-09-11 09:31:59 +02:00
dfighter1985
1ca2b634ee Merged default. 
--HG--
branch : dfighter-tools
 2014-09-10 20:18:00 +02:00
dfighter1985
52963260a8 Offer to save changes when closing a dialog. 
--HG--
branch : dfighter-tools
 2014-09-10 19:59:38 +02:00
dfighter1985
09ccd8613d When closing a dialog, remove it from the docked dialogs, and delete it. 
--HG--
branch : dfighter-tools
 2014-09-10 19:52:35 +02:00
dfighter1985
97d7fbe6e8 Allow editing of the comment section, and save comments when saving. 
--HG--
branch : dfighter-tools
 2014-09-10 19:14:26 +02:00
dfighter1985
104506a717 Raise the widget after adding. 
--HG--
branch : dfighter-tools
 2014-09-10 18:50:07 +02:00
dfighter1985
78a65459f0 WTF? 
--HG--
branch : dfighter-tools
 2014-09-10 18:49:34 +02:00