Commit graph

4947 commits

Author SHA1 Message Date
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
kaetemi
fe4c2becf8 File name, fix #202
--HG--
branch : compatibility
2014-09-13 10:08:44 +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
96664ec19c Merge multipass-stereo and game-device (Adds FXAA, removes DirectInput, updates Bloom, adds LibOVR 0.4 support)
--HG--
branch : develop
2014-09-12 15:29:19 +02:00
kaetemi
d12ccf194e Merge with develop
--HG--
branch : multipass-stereo
2014-09-12 15:19:12 +02:00
kaetemi
5c310368bb IMPORTANT! This is the develop branch. Do not ever commit directly to default from now on
--HG--
branch : develop
2014-09-12 14:41:34 +02:00
kaetemi
0fe2401260 Backed out changeset: eae58a811aa5
--HG--
branch : compatibility
2014-09-12 11:20:36 +02:00
kaetemi
04528999c8 Backed out changeset: cd8e80e4b0d6
--HG--
branch : compatibility
2014-09-12 11:19:33 +02:00
kaetemi
b698c10475 Merge with ryzomcore/v0.10.0
--HG--
branch : compatibility
2014-09-12 11:19:09 +02:00
kaetemi
d43530168f Added tag ryzomcore/v0.10.0 for changeset fedf2aa443d0 2014-09-12 10:57:42 +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
Laszlo Kis-Adam
65798aea70 Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #79)
More studio changes
2014-09-10 20:19:49 +02:00
dfighter1985
1ca2b634ee Merged default.
--HG--
branch : dfighter-tools
2014-09-10 20:18:00 +02:00