kaetemi
|
499155b9d5
|
Merge with develop
|
2014-10-07 01:15:35 +02:00 |
|
Jan Boon
|
9fdb341faa
|
Merged in rodolphe_breard/ryzomcore/sha512-auth (pull request #89)
ref #206 : windows compilation stuff
|
2014-10-07 01:14:31 +02:00 |
|
kaetemi
|
bf1f843f16
|
Set version
|
2014-10-07 01:14:03 +02:00 |
|
kaetemi
|
cbe5cb66f7
|
Add inset_t parameter to layer options, allows putting header graphics in top texture
|
2014-10-04 01:43:27 +02:00 |
|
kaetemi
|
96ea88ac07
|
Fix a bad copy paste in NLGUI
|
2014-10-04 01:43:13 +02:00 |
|
Rodolphe Breard
|
a0ec4645cc
|
ref #206 : hacking the types so it may compile on windows
|
2014-10-02 19:14:25 +02:00 |
|
Rodolphe Breard
|
1f54bf31e6
|
ref #206 : removing unused crypt lib reference
|
2014-10-02 18:21:56 +02:00 |
|
kaetemi
|
0eed48b902
|
Fix #207, FXAA orientation under D3D
|
2014-10-01 23:24:56 +02:00 |
|
kaetemi
|
9709a5da6a
|
Merge with develop
|
2014-10-01 23:23:06 +02:00 |
|
Jan Boon
|
7feab0e5cf
|
Merged in rodolphe_breard/ryzomcore/sha512-auth (pull request #88)
rolling back to include a crypt(3) implementation and adding sha512 support
|
2014-10-01 23:20:52 +02:00 |
|
Jan Boon
|
185c7ba4ac
|
Merged in nimetu/ryzomcore-2/nimetu/find-lua-version-for-luabind-under-fedor-1412076128442 (pull request #87)
find lua version for luabind under fedora
|
2014-10-01 23:19:21 +02:00 |
|
Jan Boon
|
98b0192352
|
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)
|
2014-10-01 23:19:04 +02:00 |
|
Jan Boon
|
2935767d60
|
Merged in nimetu/ryzomcore/html-maxlength-attr (pull request #84)
Add maxlength attribute to input and textarea tags
|
2014-10-01 23:18:33 +02:00 |
|
nimetu
|
adf5cb28b5
|
find lua version for luabind under fedora
|
2014-09-30 11:23:16 +00:00 |
|
nimetu
|
e0151ffa17
|
static libxml2 under linux requires lzma (tested on fedora/debian)
|
2014-09-30 11:16:28 +00:00 |
|
dfighter1985
|
7504dc1238
|
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.
|
2014-09-29 20:29:04 +02:00 |
|
dfighter1985
|
4d5d67fac7
|
Update CCtrlTextButton's CViewText's coords after updating it's own coords.
|
2014-09-29 17:38:24 +02:00 |
|
dfighter1985
|
2383e19561
|
Posref changes in the editor should apply...
|
2014-09-29 17:23:22 +02:00 |
|
dfighter1985
|
e87d83bccc
|
Refactoring. Added CInterfaceFactory.
|
2014-09-27 21:48:51 +02:00 |
|
dfighter1985
|
59011fe726
|
When moving a widget, save the reference to the hierarchy lookup map...
|
2014-09-27 20:54:44 +02:00 |
|
dfighter1985
|
fada6e7dcc
|
A little refactoring.
|
2014-09-27 20:15:46 +02:00 |
|
dfighter1985
|
75047b71b4
|
Move the text too with the text button.
|
2014-09-27 19:54:19 +02:00 |
|
dfighter1985
|
3ca518dca2
|
Merged develop
|
2014-09-27 18:22:44 +02:00 |
|
dfighter1985
|
039e8a83a4
|
Initialize struct member before use...
|
2014-09-27 18:20:29 +02:00 |
|
Nimetu
|
2b02fd2c37
|
Add maxlength attribute to input and textarea tags
|
2014-09-27 15:55:57 +03:00 |
|
dfighter1985
|
6e162e7edb
|
A little bit of refactoring.
|
2014-09-27 01:04:49 +02:00 |
|
dfighter1985
|
1f4553f39c
|
Update coords when changing something.
|
2014-09-27 01:00:52 +02:00 |
|
dfighter1985
|
3fbe51185f
|
Merged develop.
|
2014-09-27 00:08:06 +02:00 |
|
dfighter1985
|
161c8e5edc
|
Editbox selection should be stopped when the mouse button goes up, even if it happens outside of the box.
|
2014-09-26 23:29:38 +02:00 |
|
Rodolphe Breard
|
31a08ab8d7
|
rolling back to include a crypt(3) implementation and adding sha512 support
|
2014-09-26 22:30:56 +02:00 |
|
dfighter1985
|
6eb4cf9c3f
|
Collapse the tree, and only expand the items that are needed to get to the selected items.
|
2014-09-25 00:37:25 +02:00 |
|
dfighter1985
|
b46483a2a6
|
When repareting a widget, remove the old item from the hierarchy and add a new one at the right place.
|
2014-09-24 23:56:11 +02:00 |
|
dfighter1985
|
e6f4801129
|
Refactored IWidgetAdditionWatcher, now it's called IWidgetWatcher and it also reports widget moves.
|
2014-09-24 23:32:24 +02:00 |
|
dfighter1985
|
f7825fc8b3
|
No need for free floating elements when we can simply reparent to the top window...
|
2014-09-24 22:59:40 +02:00 |
|
dfighter1985
|
c5b8f30bb9
|
Orphaned widgets won't get stuck.
|
2014-09-24 20:40:37 +02:00 |
|
dfighter1985
|
f30054a26c
|
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.
|
2014-09-24 18:45:52 +02:00 |
|
dfighter1985
|
49d023d273
|
Set dragged widgets' coordinates based on the move rather than the mouse pointer's coords.
|
2014-09-24 16:31:26 +02:00 |
|
dfighter1985
|
574d24e5e3
|
Dragged elements will no longer disappear.
|
2014-09-24 16:20:25 +02:00 |
|
kaetemi
|
a943c939ef
|
Add useful default config variables to dev client
|
2014-09-24 12:34:40 +02:00 |
|
kaetemi
|
cdfbcfe1d8
|
Add some more practical data build batch scripts
|
2014-09-24 01:07:12 +02:00 |
|
kaetemi
|
3158f6d90e
|
Handle GUI event only once
|
2014-09-23 19:47:06 +02:00 |
|
kaetemi
|
f6a5adb597
|
Remove debug message
|
2014-09-23 18:18:14 +02:00 |
|
kaetemi
|
32c0f2d7f7
|
Fix EGS sheet rebuild crashes
|
2014-09-23 13:54:02 +02:00 |
|
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 |
|