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 |
|
dfighter1985
|
7abd407bc5
|
oups
--HG--
branch : dfighter-tools
|
2014-09-10 18:04:55 +02:00 |
|
dfighter1985
|
1d028c759c
|
Use a file browser for setting files.
--HG--
branch : dfighter-tools
|
2014-09-10 17:59:22 +02:00 |
|
dfighter1985
|
946685dfac
|
A little refactoring
--HG--
branch : dfighter-tools
|
2014-09-10 17:02:51 +02:00 |
|
dfighter1985
|
c44d910434
|
Store the filename only in the Dfn value.
--HG--
branch : dfighter-tools
|
2014-09-10 16:44:49 +02:00 |
|
kaetemi
|
fceb2927f4
|
Add script for installing worldedit data
|
2014-09-10 16:38:19 +02:00 |
|
dfighter1985
|
e89cde4b93
|
Properly support color types.
--HG--
branch : dfighter-tools
|
2014-09-10 16:22:08 +02:00 |
|
kaetemi
|
d03c2dcfcd
|
Nice try
|
2014-09-10 16:00:13 +02:00 |
|
nimetu
|
1a4c2169c5
|
Fix #161 fix craft success rate display on client
|
2014-09-10 15:40:32 +02:00 |
|
nimetu
|
ca79af60c6
|
Fix #143 /muteUniverse on dyn universe channels
|
2014-09-10 15:38:57 +02:00 |
|
nimetu
|
0cd3ea8d3b
|
Fix #199 Studio object viewer plugin font
|
2014-09-10 12:19:11 +02:00 |
|
kaetemi
|
9e74156181
|
Move islands entry points to data
|
2014-09-10 08:25:45 +02:00 |
|
kaetemi
|
f5fb98764f
|
Remove unused mirror dataset
|
2014-09-10 08:18:05 +02:00 |
|
kaetemi
|
22fc641666
|
Merge
|
2014-09-10 05:28:14 +02:00 |
|
kaetemi
|
89db6c78a7
|
Use the correct ring database
|
2014-09-10 05:25:00 +02:00 |
|
botanic
|
cafe41fa24
|
FIX #192
|
2014-09-09 17:29:59 -07:00 |
|
botanic
|
74df36b179
|
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
|
dfdd7698c3
|
fix windows warnings in sync
|
2014-09-09 17:20:23 -07:00 |
|
dfighter1985
|
0587d6a687
|
Create vstruct node when needed.
--HG--
branch : dfighter-tools
|
2014-09-10 00:36:55 +02:00 |
|
dfighter1985
|
e47d480170
|
Instead of storing the node, store the name and the node type.
--HG--
branch : dfighter-tools
|
2014-09-10 00:28:03 +02:00 |
|
dfighter1985
|
53357ca9ec
|
Don't add Virtual Structs to the property browser!
--HG--
branch : dfighter-tools
|
2014-09-09 22:01:52 +02:00 |
|
dfighter1985
|
821ec6cfad
|
Added support for Virtual Structs.
--HG--
branch : dfighter-tools
|
2014-09-09 21:57:30 +02:00 |
|
kaetemi
|
328eaf592a
|
Use correct AES cfg
|
2014-09-09 18:58:05 +02:00 |
|
kaetemi
|
55ca1e7a2a
|
Crashfix
|
2014-09-09 15:50:12 +02:00 |
|
kaetemi
|
7c40248728
|
Bugfix
|
2014-09-09 12:39:35 +02:00 |
|
kaetemi
|
0445c3138c
|
Typo
|
2014-09-09 08:23:37 +02:00 |
|
kaetemi
|
a8f8fa7b63
|
Don't use magic numbers for the LCT
|
2014-09-09 08:16:44 +02:00 |
|
kaetemi
|
ea9cf3db93
|
Typo
|
2014-09-09 08:15:05 +02:00 |
|
kaetemi
|
f0ac4705d8
|
Cleanup the AMS theme a bit, improve layouting of user settings
|
2014-09-09 04:02:15 +02:00 |
|
kaetemi
|
d863ed8a10
|
Mask database connection error
|
2014-09-09 02:52:24 +02:00 |
|
kaetemi
|
7cd21d48b4
|
Merge
|
2014-09-09 02:30:24 +02:00 |
|
botanic
|
6a36f1f433
|
fix sync
|
2014-09-08 17:29:43 -07:00 |
|
kaetemi
|
be78a1cd0b
|
Cache PDO connections and connection failures in a single page load
|
2014-09-09 02:15:25 +02:00 |
|
kaetemi
|
c4d4587830
|
Disable APC page caching
|
2014-09-09 02:14:49 +02:00 |
|
botanic
|
e1c70eb423
|
dont cache $#1t
|
2014-09-08 16:23:04 -07:00 |
|
botanic
|
0b579f6306
|
attachment error checking
|
2014-09-08 11:59:49 -07:00 |
|
botanic
|
efadbb3f58
|
make the random generation more secure
|
2014-09-08 11:46:43 -07:00 |
|
botanic
|
6f1037f829
|
fix some unset warnings
|
2014-09-08 05:54:34 -07:00 |
|
botanic
|
2a8ff51169
|
change some div's so it looks proper
|
2014-09-08 05:20:28 -07:00 |
|
botanic
|
8be65ec64c
|
turn debugging off
|
2014-09-08 04:56:13 -07:00 |
|
botanic
|
32745a132b
|
properly display permissions
|
2014-09-08 04:55:05 -07:00 |
|
botanic
|
4f907c30e6
|
display the correct plugin page
|
2014-09-08 03:55:59 -07:00 |
|
botanic
|
7fc83ccd37
|
set template permissions
|
2014-09-08 03:29:30 -07:00 |
|
botanic
|
b20008b520
|
fix menu plugin display
|
2014-09-08 03:19:13 -07:00 |
|
botanic
|
c3c319944c
|
fix notice
|
2014-09-08 03:04:34 -07:00 |
|
botanic
|
76dc593a1c
|
fix plugin template
|
2014-09-08 03:02:11 -07:00 |
|
botanic
|
8d49355c9f
|
fix index issue
|
2014-09-08 02:57:09 -07:00 |
|
botanic
|
4009772907
|
Fix smarty issues
|
2014-09-08 02:36:38 -07:00 |
|
botanic
|
371f666dea
|
Cleanup Domain management code
|
2014-09-08 02:36:31 -07:00 |
|
botanic
|
1b9986063e
|
Merge
|
2014-09-08 02:08:26 -07:00 |
|
botanic
|
b58f365473
|
upgrade smarty to 3.1.19
|
2014-09-08 02:07:42 -07:00 |
|
botanic
|
52885f20e0
|
Fix for stupid loop
|
2014-09-08 02:05:49 -07:00 |
|
kaetemi
|
3e476a9376
|
Install fix
|
2014-09-08 10:42:38 +02:00 |
|
kaetemi
|
d651eff10b
|
Cleanup some RYZOMID code
|
2014-09-08 09:48:28 +02:00 |
|
kaetemi
|
3baf60ad1d
|
Remove dead code in game item manager
|
2014-09-08 09:37:14 +02:00 |
|