Commit graph

4590 commits

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