Commit graph

4923 commits

Author SHA1 Message Date
kaetemi
d8b26f1b9b Backed out incomplete changes to GL driver 2014-09-18 11:31:19 +02:00
dfighter1985
3d95baf101 Fixed Object Viewer build. 2014-09-17 22:36:58 +02:00
dfighter1985
58f5047b7e Merged the gui-editor branch. 2014-09-17 21:12:14 +02:00
dfighter1985
274565ff79 don't evaluate the child-nodes when there are none, directly just return () 2014-09-17 20:54:16 +02:00
dfighter1985
2d4e60a328 When removing the root node, don't retain the pointer to it... 2014-09-17 20:51:45 +02:00
dfighter1985
d45661a8ac Added the rest of the expression files. 2014-09-17 20:49:26 +02:00
Laszlo Kis-Adam
dd87905e1a Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #81)
Expression Editor
2014-09-17 19:53:36 +02:00
dfighter1985
4045126855 Merged develop. 2014-09-17 19:51:14 +02:00
dfighter1985
91a11938a2 Added support for clearing the Expression Editor scene. 2014-09-17 19:27:06 +02:00
dfighter1985
6e499f2dba Texture Chooser shouldn't have been left in the main menu... 2014-09-17 19:21:39 +02:00
dfighter1985
12be42506f Moved the Expression Editor to it's right place. 2014-09-17 19:19:43 +02:00
dfighter1985
7b5bed2442 Instead of mouse move event, use the itemChange handler to move the links. 2014-09-17 16:17:41 +02:00
dfighter1985
fee6b431a0 ExpressionNode flags are now set in it's constructor. 2014-09-17 16:02:28 +02:00
dfighter1985
5771f0c914 Links shouldn't be selectable. 2014-09-17 16:01:23 +02:00
dfighter1985
fc65ef8e8b This is the GUI Editor not Georges... 2014-09-17 15:50:12 +02:00
dfighter1985
a96eb529e5 Save expression. 2014-09-17 15:47:49 +02:00
dfighter1985
ec657d4207 Expression can now be built. 2014-09-17 15:31:54 +02:00
dfighter1985
1e1a86a4c1 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
7a54ca8658 Fixing the database migration system for issue #206 2014-09-16 22:43:36 +02:00
Rodolphe Breard
bdfb3e615f fixing #206 : passwords are now stored using SHA-512 instead of traditional DES 2014-09-16 20:34:26 +02:00
Rodolphe Breard
9f7aaad5b7 Created new branch sha512-auth 2014-09-16 18:14:16 +00:00
dfighter1985
8e0bd853ab Added sample expression files. 2014-09-16 15:54:53 +02:00
dfighter1985
045fa34e43 When changing the value of a node, change the size the node if needed. 2014-09-16 15:31:06 +02:00
dfighter1985
83b6e2a18b Allow to set and change values of value nodes. 2014-09-16 15:15:31 +02:00
dfighter1985
754393064d Only allow variable nodes to have their number of slots changed. 2014-09-16 03:45:26 +02:00
dfighter1985
d027afbaeb Set the number of slots and their names from the data loaded from XMLs. 2014-09-16 03:38:21 +02:00
dfighter1985
48b46dcc8c Parse expression files, and build the expression tree from the expressions parsed from these files. 2014-09-16 02:32:10 +02:00
kaetemi
a5bd49ae34 Fix r2ed 2014-09-15 18:15:40 +02:00
kaetemi
c245822abb Fix r2ed 2014-09-15 17:42:24 +02:00
kaetemi
34b1fa4e36 Fix r2ed 2014-09-15 16:59:12 +02:00
kaetemi
ca7c0e23f1 Fix r2ed 2014-09-15 14:33:07 +02:00
kaetemi
d7645d4b3e Fix bad type passed to sscanf 2014-09-15 12:49:13 +02:00
dfighter1985
580ded1bd4 Slot count can now be changed. 2014-09-15 01:25:01 +02:00
botanic
705f554287 Fix #194 2014-09-14 15:52:40 -07:00
botanic
50740d34b5 FIX #205 2014-09-14 13:09:00 -07:00
dfighter1985
29176b7bc6 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
f4ccd206e0 change to 256 characters 2014-09-14 10:13:30 -07:00
botanic
ae3d3ef1d4 Merge 2014-09-14 09:46:59 -07:00
botanic
71014094b8 Update domain settings 2014-09-14 09:46:12 -07:00
dfighter1985
4f79371896 Show the node names as title, in the link dialog. 2014-09-14 17:19:11 +02:00
dfighter1985
171e383b14 Add serial number to nodes. 2014-09-14 17:04:42 +02:00
dfighter1985
035f824a93 Allow painting of arbitrary number of connection slots. 2014-09-14 16:57:56 +02:00
dfighter1985
4a923a0dc7 A little refactoring. 2014-09-14 16:43:45 +02:00
kaetemi
9e94ccd701 Add cartographer 2014-09-14 16:37:24 +02:00
dfighter1985
97e2b3d1e4 Support for adding nodes with different slot count. 2014-09-14 16:37:17 +02:00
dfighter1985
1df2e53239 Added unlinking support. 2014-09-14 15:36:41 +02:00
dfighter1985
13b41d2fa6 Improved linking 2014-09-14 15:15:20 +02:00
kaetemi
c662d727f9 Add pz process 2014-09-14 15:02:44 +02:00
dfighter1985
7f178d6c86 There are more than 1 slots available now. 2014-09-13 23:54:25 +02:00
dfighter1985
61b3f60e47 More refactoring. 2014-09-13 22:54:50 +02:00