Commit graph

4465 commits

Author SHA1 Message Date
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
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
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