Compare commits

..

230 Commits

Author SHA1 Message Date
Swann 03ad7c0066 fix: geometry nodes input / output 2021-11-08 17:34:02 +01:00
Swann 0681b53141 fix: version check 2021-11-05 15:39:46 +01:00
Swann 6f02b38b0e fix(replication): missing version update 2021-11-03 16:37:12 +01:00
Swann 92c773dae9 Merge branch 'develop' of gitlab.com:slumber/multi-user into develop 2021-11-03 16:34:43 +01:00
Swann f48ade6390 fix python 3.10 compatibility (@NotFood) 2021-11-03 16:32:40 +01:00
Swann Martinez 63c4501b88 Merge branch '236-crash-with-empty-after-a-reconnection' into 'develop'
Resolve "Crash with empty after a reconnection"

See merge request slumber/multi-user!155
2021-10-29 09:40:04 +00:00
Swann 06e21c86ce fix none attribute error 2021-10-21 12:19:46 +02:00
Swann Martinez 9d484b00e9 Merge branch '234-user-info-in-side-panel' into 'develop'
User Info in side panel

See merge request slumber/multi-user!153
2021-08-19 16:09:24 +00:00
Fabian de9255f71c feat: presence overlay button+UInfo in side panel 2021-08-19 18:04:07 +02:00
Swann Martinez 99528ea3e0 Merge branch '232-fix-ui-host-and-lobby' into 'develop'
Resolve "fix ui host and lobby"

See merge request slumber/multi-user!152
2021-08-16 14:03:16 +00:00
Fabian bb342951a5 fix: lobby init 2021-08-16 15:59:19 +02:00
Fabian 438a79177b fix: host solo 2021-08-16 12:02:10 +02:00
Swann 08fc49c40f fix: session private by default 2021-07-30 14:09:40 +02:00
Swann d7e25b1192 fix: clean docker file 2021-07-30 13:47:31 +02:00
Swann 1671422143 Merge branch 'develop' of gitlab.com:slumber/multi-user into develop 2021-07-30 13:17:29 +02:00
Swann a9620c0752 fix: docker server command 2021-07-30 13:16:43 +02:00
Swann Martinez 583beaf6fe Merge branch '231-server-public-session-private-issue' into 'develop'
Server "public session" private issue

See merge request slumber/multi-user!151
2021-07-28 15:34:24 +00:00
Fabian 126d2338f2 fix: server psrwd issue 2021-07-28 17:33:07 +02:00
Swann 24b0c0ed8a fix: get active server preset 2021-07-27 17:03:44 +02:00
Swann 07fc1cf000 fix: enable tests back 2021-07-27 11:08:57 +02:00
Swann 8e0131b3a8 feat: temporary disable test before fixing blender addon_tester 2021-07-26 18:29:06 +02:00
Swann 912a2d524c feat: try disable operator tests 2021-07-26 18:19:24 +02:00
Swann 82a5124d64 fix: unit tests 2021-07-26 18:16:21 +02:00
Swann cca5bf903b fix: replication deployment 2021-07-26 18:05:36 +02:00
Swann Martinez 4c0d4cb1c7 Merge branch '218-new-ui-ux-implementation' into 'develop'
New UI/UX implementation

See merge request slumber/multi-user!140
2021-07-26 15:52:19 +00:00
Fabian ca64797641 Merge branch 'develop' into 218-new-ui-ux-implementation 2021-07-26 17:51:01 +02:00
Fabian a49d9ee437 feat: server ping timeout preferences 2021-07-26 17:42:13 +02:00
Fabian 4c1cd6b8f8 fix: review 2021-07-26 17:30:56 +02:00
Fabian d6cda709a6 fix: replication conflict 2021-07-26 15:46:29 +02:00
Swann 4bc0feb3a5 fix: ReferenceError in update_external dependency by removing orphan nodes. 2021-07-23 19:35:56 +02:00
Fabian 59aab7159a fix: remove logging.info 2021-07-23 17:10:10 +02:00
Fabian 0a798bb21b feat: clean files+add repository sync icons 2021-07-23 12:51:16 +02:00
Swann beaafce4fa Merge branch 'develop' into 218-new-ui-ux-implementation 2021-07-22 11:01:59 +02:00
Fabian 6f77337832 feat: request (with bug) 2021-07-22 10:55:18 +02:00
Fabian 07252d62df feat: fonctional UI, no server pswd/ping 2021-07-22 09:38:01 +02:00
Fabian ac615cd134 feat: first+server list UI, ping/pswd unfonctional 2021-07-21 11:12:17 +02:00
Swann a4f9f6e051 fix: replication dependencies conflicts 2021-07-20 16:19:53 +02:00
Swann 10de88cdc9 fix: old replication installation conflicts 2021-07-20 16:06:24 +02:00
Swann e4fa34c984 fix: addon version number 2021-07-20 15:37:11 +02:00
Swann 0dd685d009 doc: add missing presence flags 2021-07-20 15:11:38 +02:00
Swann 3e8c30c0ab fix: supported datablocks in readme 2021-07-20 14:59:30 +02:00
Swann 21cc3cd917 fix: update readme to reflect changes 2021-07-20 14:57:52 +02:00
Swann 81e620ee3d fix: documentations capture for 0.4.0 2021-07-20 14:50:33 +02:00
Swann fb9bd108bd feat: update changelog to reflect v0.4.0 version 2021-07-20 14:19:33 +02:00
Fabian 4846fbb589 fix: server list working (no ping/lock/pop-up) 2021-07-19 16:03:12 +02:00
Swann Martinez cab6625399 Merge branch '219-lock-annotation-doesn-t-sync' into 'develop'
Resolve "Lock annotation doesn't sync"

See merge request slumber/multi-user!143
2021-07-14 10:41:32 +00:00
Swann 1b81251a11 fix: annotation lock 2021-07-14 12:38:30 +02:00
Fabian cf44e547a2 fix: presence_text_distance rename 2021-07-13 17:15:34 +02:00
Fabian 0269363c63 fix: overlay UI 2021-07-13 17:14:32 +02:00
Fabian 4ffca17c54 fix: edit>prefs UI/UX 2021-07-13 16:40:26 +02:00
Swann Martinez 77bf269fb5 Merge branch '221-optimize-user-selection-draw-code' into 'develop'
Resolve "Optimize user selection draw code"

See merge request slumber/multi-user!142
2021-07-13 14:37:09 +00:00
Swann 1e675132d4 fix: collection instances index offset 2021-07-13 16:33:46 +02:00
Swann 781287c390 refactor: use one drawcall for all selection bbox 2021-07-13 15:45:08 +02:00
Fabian fc91b252f4 feat: edit>preferences + serverpassword ui 2021-07-12 18:01:35 +02:00
Fabian 41c7c569ca fix: link session status icons to session header 2021-07-12 14:55:41 +02:00
Fabian a82d263f05 feat: add "icons" folder + init 2021-07-12 14:53:18 +02:00
Swann Martinez d4476baa1b Merge branch '220-batch-right-selection-update' into 'develop'
Resolve "Batch right selection update"

See merge request slumber/multi-user!141
2021-07-12 10:20:23 +00:00
Swann 467e98906e feat: Batch right selection update
Related to https://gitlab.com/slumber/multi-user/-/issues/220
2021-07-12 12:06:45 +02:00
Swann 64a25f94a3 fix: gpencil material loading error
Now loading gpencil materials from uuid
2021-07-09 16:59:59 +02:00
Swann Martinez e6996316be Merge branch '215-annotations-doesn-t-sync-correctly' into 'develop'
Resolve "Annotations doesn't sync correctly"

See merge request slumber/multi-user!138
2021-07-07 08:18:49 +00:00
Swann cf4cd94096 refactor: remove gpencil dump stroke legacy
Related to #166 and #215
2021-07-07 10:15:23 +02:00
Swann e9ab633aac fix: annotations updates
Related to #215
2021-07-06 16:06:14 +02:00
Swann 297639e80f fix: crash on changing workspace change 2021-07-06 15:39:19 +02:00
Swann Martinez f0cc63b6f0 Merge branch '214-animated-object-transform-not-correctly-sync' into 'develop'
Resolve "Animated object transform not correctly sync"

See merge request slumber/multi-user!137
2021-07-06 12:32:39 +00:00
Swann d433e8f241 fix: transform offset for object animated with a curve constraint
Related to #214
2021-07-06 14:29:20 +02:00
Swann Martinez 963a551a1e Merge branch '206-draw-active-mode-in-the-object-presence-overlay-2' into 'develop'
Draw active mode in the object presence overlay

See merge request slumber/multi-user!131
2021-07-01 12:57:01 +00:00
Fabian d01a434fb7 fix: Review 2021-07-01 14:53:14 +02:00
Fabian 3a5a5fc633 fix : draw active mode UI side pannel 2021-07-01 11:58:52 +02:00
Swann Martinez 8926ab44e1 Merge branch '201-improved-image-support' into 'develop'
Resolve "Improved image support"

See merge request slumber/multi-user!136
2021-07-01 09:55:47 +00:00
Fabian a8f96581c5 fix: new mode display 2021-06-30 15:34:03 +02:00
Fabian 440a4cc1cd feat: add mode visibily 2021-06-29 17:10:59 +02:00
Swann a207c51973 fix: image renamin support
fix: sync Color Space Settings

related to #201
2021-06-29 15:59:26 +02:00
Swann Martinez e706c8e0bf Merge branch '209-adding-a-scene-create-node-duplicates' into 'develop'
Resolve "Adding a scene create node duplicates"

See merge request slumber/multi-user!135
2021-06-28 08:30:22 +00:00
Swann e590e896da fix: scene duplicates by using data instead of the update id
Related to #209
2021-06-28 10:27:04 +02:00
Swann Martinez 4140b62a8e Merge branch '119-add-timeline-marker-sync' into 'develop'
Resolve "Add timeline marker sync"

See merge request slumber/multi-user!133
2021-06-24 15:52:12 +00:00
Swann 6d9c9c4532 fix: timeline marker selection
feat: basic test
2021-06-24 17:45:34 +02:00
Swann Martinez e9e1911840 Merge branch '208-late-update-logging-error' into 'develop'
Resolve "Late update logging error"

See merge request slumber/multi-user!134
2021-06-24 15:28:56 +00:00
Swann ab350ca7bc fix: late update logging error
Related to #208
2021-06-24 17:24:08 +02:00
Fabian 0a8f0b5f88 feat: add mode overlay 2021-06-24 16:01:14 +02:00
Swann 2238a15c11 feat: initial markers support 2021-06-24 15:51:01 +02:00
Swann de73f022e6 merge 2021-06-24 14:52:07 +02:00
Swann f517205647 fix: doc authors 2021-06-24 14:51:00 +02:00
Swann f33c3d8481 fix: doc version 2021-06-24 14:50:12 +02:00
Swann Martinez 71c69000ec Merge branch '207-repository-panel-filtering-is-boken' into 'develop'
Resolve "Repository panel filtering is boken"

See merge request slumber/multi-user!132
2021-06-24 12:49:06 +00:00
Swann de1e684b3c fix: name filtering 2021-06-24 14:35:59 +02:00
Swann Martinez d87730cffb Merge branch '197-user-selection-bounding-box-glitches-for-non-mesh-objects' into 'develop'
User selection bounding box glitches for non-mesh objects

See merge request slumber/multi-user!129
2021-06-23 16:02:50 +00:00
Fabian 3f005b86ab fix : add enumerate / remove nb_object 2021-06-23 17:45:01 +02:00
Fabian 5098e5135d fix: bbox work for non-mesh objects+ins.collection 2021-06-23 17:00:05 +02:00
Swann Martinez 37cfed489c Merge branch '204-animation-doesn-t-sync-for-gpencil-materials' into 'develop'
Resolve "Animation doesn't sync for materials"

See merge request slumber/multi-user!128
2021-06-22 12:10:23 +00:00
Swann 9003abcd18 feat: notes for furtur improvements 2021-06-22 14:06:19 +02:00
Swann a199e0df00 feat: apply bl_apply_child member to force dependencies reloading
fix: node_tree animation dependencies
2021-06-22 11:36:51 +02:00
Swann 3774419b7e fix: force push is now pushing the whole node data instead of delta 2021-06-22 10:41:36 +02:00
Swann 3e552cb406 feat: gpencil materials animation support 2021-06-22 10:39:40 +02:00
Swann 9f381b44c8 fix: material animation support 2021-06-21 18:58:16 +02:00
Swann ad795caed5 fix: only apply repository heads on connection 2021-06-21 18:38:43 +02:00
Swann 504dd77405 fix: scene cleaning 2021-06-21 17:10:05 +02:00
Swann 82022c9e4d clean: only log ignored update in debug logging level 2021-06-18 15:45:51 +02:00
Swann d81b4dc014 feat: enable delta back for all datablocks execpt gpencil, files and images 2021-06-18 15:30:39 +02:00
Swann Martinez 63affa079f Merge branch '199-filter-correctly-distant-updates-in-the-depsgraph-handler' into 'develop'
Resolve "Filter correctly distant updates in the depsgraph handler"

See merge request slumber/multi-user!126
2021-06-18 13:12:15 +00:00
Swann fcf5a12dd0 fix: log verbosity level 2021-06-18 15:03:14 +02:00
Swann b0529e4444 refactor: move handlers to hendlers.py 2021-06-18 14:59:56 +02:00
Swann bdfd89c085 feat: temporary store applied update to ignore them. 2021-06-18 14:34:11 +02:00
Swann Martinez ff1630f9cc Merge branch '194-smooth-brush-size-reset' into 'develop'
Resolve "Brush deleted on join"

See merge request slumber/multi-user!124
2021-06-16 12:30:31 +00:00
Fabian 5830fe1abb fix: add items_to_remove 2021-06-16 14:28:26 +02:00
Fabian c609f72080 fix: All brushes 2021-06-16 12:29:56 +02:00
Swann a28a6f91bd feat: move testing to blender 2.93 2021-06-15 16:27:49 +02:00
Swann Martinez a996f39d3b Merge branch '195-auto-updater-install-a-broken-version-of-the-addon' into 'develop'
Resolve "Auto updater install a broken version of the addon"

See merge request slumber/multi-user!123
2021-06-15 12:54:49 +00:00
Swann 7790a16034 fix: download the build artifact instead of the repository default zip
Related to #195
2021-06-15 14:51:37 +02:00
Swann Martinez 836fdd02b8 Merge branch '192-parent-type-isn-t-synced' into 'develop'
Resolve "Parent type isn't synced"

See merge request slumber/multi-user!122
2021-06-15 09:22:13 +00:00
Fabian 7cb3482353 fix: parent type and parent bone 2021-06-15 11:20:31 +02:00
Swann 041022056c Merge branch 'develop' of gitlab.com:slumber/multi-user into develop 2021-06-14 17:32:50 +02:00
Swann 05f3eb1445 fix: update readme 2021-06-14 17:32:05 +02:00
Swann Martinez 17193bde3a fix: doc server .png names 2021-06-14 14:29:45 +00:00
Swann a14b4313f5 feat: update to develop 2021-06-14 16:12:47 +02:00
Swann b203d9dffd Merge branch '188-intgrate-replication-as-a-submodule' into develop 2021-06-14 16:10:15 +02:00
Swann Martinez f64db2155e Merge branch '49-connection-preset-system' into 'develop'
Connection-preset-system

See merge request slumber/multi-user!121
2021-06-14 13:50:58 +00:00
Fabian e07ebdeff5 fix: remove ui overwrite class 2021-06-14 15:46:57 +02:00
Fabian 3d6453f7a2 feat: doc 2021-06-14 15:17:30 +02:00
Fabian 7421511079 fix: override operator 2021-06-14 15:17:07 +02:00
Fabian bc24525cec fix: new UI/UX 2021-06-11 16:57:02 +02:00
Swann 699cf578e2 feat: prevent updates in sclupt mode 2021-06-11 16:42:23 +02:00
Swann e9b4afb440 refactor: enable partial delta based replication 2021-06-11 15:28:37 +02:00
Fabian 0c6491590e fix: admin password root 2021-06-11 12:18:51 +02:00
Fabian b87e733ddc fix: name conflict + responsive enum 2021-06-11 12:13:23 +02:00
Fabian cb0962b484 feat: server preset working with bad ui/ux 2021-06-10 15:39:12 +02:00
Swann 1fc25412ac fix: constraint differential update support 2021-06-10 15:21:25 +02:00
Swann b5405553dc refactor: install replication dependencies in libs 2021-06-09 18:16:43 +02:00
Fabian a1b6fb0533 feat: server preset 2021-06-08 17:03:43 +02:00
Fabian b6a8a2ec01 Revert "doc: comment ui draw()"
This reverts commit f7c4f5d1fe.
2021-06-08 15:02:53 +02:00
Fabian 3e41b18af1 Merge branch '49-connection-preset-system' of https://gitlab.com/slumber/multi-user into 49-connection-preset-system 2021-06-08 15:00:50 +02:00
Fabian f7c4f5d1fe doc: comment ui draw() 2021-06-08 14:58:57 +02:00
Swann c616054878 tour du python blender 2021-06-07 17:06:41 +02:00
Swann 5c08493774 fix 'GraphObjectStore' object has no attribute 'object_store' 2021-06-04 18:30:54 +02:00
Swann af8a138b4f fix: modifier order 2021-06-04 17:17:30 +02:00
Swann 6d9216f14a refactor: cleanup repository 2021-06-04 16:07:02 +02:00
Swann fc4fb088bb refactor: repository api clean 2021-06-04 14:02:09 +02:00
Swann 98553ba00c refactor: remove get_nodes 2021-06-04 12:13:53 +02:00
Swann 1e15a12b10 refactor: remove list 2021-06-04 12:07:54 +02:00
Swann 569543650f feat: skip external updates 2021-06-03 15:43:47 +02:00
Swann 07358802f7 refactor: fix scene item removal 2021-06-03 15:03:09 +02:00
Swann a059fafe12 feat: add mutate to scene delta 2021-06-03 11:43:24 +02:00
Swann 297f68ccfe refactor: only apply node when it is necessary (skip for host) 2021-06-03 11:41:25 +02:00
Swann c9c70d1e08 refactor: stamp datablock during apply 2021-06-03 11:20:54 +02:00
Swann a34f58ef3f fix: cherrypick TCP idle bug 2021-06-02 23:10:13 +02:00
Swann e7b7f38991 fix: change rights 2021-06-02 17:49:22 +02:00
Swann 392e0aaaa3 refactor: remove missing parameter 2021-06-02 15:45:11 +02:00
Swann 4c774d5d53 refactor: move update user metadata to porcelain 2021-06-02 12:59:53 +02:00
Swann 4c4cf8a970 refactor: move rm to porcelain 2021-06-02 11:47:41 +02:00
Swann 211d0848c2 fix: replication version 2021-06-02 11:39:37 +02:00
Swann c9665c4719 refactor: move unlock/lock/kick to porcelain 2021-06-02 11:31:23 +02:00
Swann 431fe0d840 refactor: move lock/unock to porcelain 2021-06-02 10:22:37 +02:00
Swann df7ca66ad8 fix: repo dumps api 2021-06-02 09:35:55 +02:00
Swann c2d2db78e6 refactor: temporary remove name resolution 2021-06-01 15:47:05 +02:00
Swann ad89a4e389 fix: disable mutable delta for scene 2021-06-01 14:53:17 +02:00
Swann 6ca6d4443d refactor: move load/dumps to repository 2021-05-31 11:39:54 +02:00
Swann 81c9b5fc06 fix: animation loading 2021-05-21 23:02:42 +02:00
Swann 9fddfe084c fix: annotation 2021-05-21 17:29:22 +02:00
Swann ca40523393 fix: apply and resolve 2021-05-21 17:14:28 +02:00
Swann 76e28ced21 refactor: remove legacy data 2021-05-21 15:40:45 +02:00
Swann 55c6002b28 feat: update version 2021-05-20 17:22:00 +02:00
Swann 8d5c8aded3 refacor: code formating 2021-05-20 09:57:44 +02:00
Swann 8ebba80b97 refactor: add diff back 2021-05-19 17:44:42 +02:00
Swann 50d6c6b3c8 fix: filter 2021-05-19 15:59:36 +02:00
Swann f0b03c50f2 refactor: fix tests 2021-05-19 15:12:11 +02:00
Swann 28e83a38e6 refactor: add back armature lightprobes, sound and speaker 2021-05-19 15:05:54 +02:00
Swann 2e261cd66b refactor: add particle and lattive back 2021-05-19 14:40:13 +02:00
Swann 3f6e4f7333 refactor: add texts back 2021-05-19 14:23:56 +02:00
Swann 49fadf084a refactor: add gpencil back 2021-05-19 13:56:42 +02:00
Swann e2e0dc31c1 refactor: add volume and world support 2021-05-19 13:42:34 +02:00
Swann 389bbd97d5 refactor: add image and file back 2021-05-19 13:31:57 +02:00
Swann 19602691d3 feat: texture 2021-05-19 11:43:01 +02:00
Swann 2e2ff5d4bf refactor: add material nodegroup back 2021-05-19 11:25:56 +02:00
Swann fef6559ce0 refactor: add light and camera support back 2021-05-19 10:52:04 +02:00
Swann 5f669fd49a refactor: add camera back 2021-05-19 09:55:07 +02:00
Swann 330ff08fd3 refactor: add collection back 2021-05-19 09:47:01 +02:00
Swann f3be8f9623 feat: bring back icons 2021-05-19 09:37:50 +02:00
Swann ffb70ab74c refactor: protocol refactoring part 1 (mesh, object, action, scene) 2021-05-18 23:14:09 +02:00
Swann 26140eefb2 refactor: clear replicated datablock init states 2021-05-18 18:23:28 +02:00
Swann cdf0433e8a refactor: move fetch to repository 2021-05-18 17:17:10 +02:00
Swann acd70f73bf refactor: add remote
refactor: move push to porcelain
2021-05-18 16:54:07 +02:00
Swann 36c3a9ab0b refactor: remove sanitize 2021-05-18 11:01:55 +02:00
Swann cfb1afdd72 Revert "feat: node sanitize on collection and scene update"
This reverts commit fb1c985f31.
2021-05-18 11:00:05 +02:00
Swann 4eeb80350e fix: layer info missing 2021-05-18 10:54:13 +02:00
Swann fb1c985f31 feat: node sanitize on collection and scene update 2021-05-17 17:35:34 +02:00
Swann 689c2473d6 fix: commit 2021-05-17 17:18:17 +02:00
Swann 41620fce90 fix: commit 2021-05-17 17:04:43 +02:00
Swann 249bcf827b fix: collection instance bounding box selection 2021-05-17 16:03:01 +02:00
Swann d47eab4f26 refactor: move commit to porcelain 2021-05-17 11:12:18 +02:00
Swann f011089d82 refactor: removed apply from replicated datablock 2021-05-17 10:52:28 +02:00
Swann acc58a1c9f fix: tcp keepalive IDLE time 2021-05-16 22:26:53 +02:00
Swann 24d850de9f refactor: get metadata updates optimization back 2021-05-11 11:41:43 +02:00
Swann b045911a59 refactor: get diff back for testing 2021-05-10 12:04:45 +02:00
Swann a67be76422 feat: delta commit 2021-05-09 17:42:56 +02:00
Swann 32033c743c feat: update repllication version 2021-05-07 17:10:23 +02:00
Swann 5da8650611 fix: get replication version 2021-05-07 16:56:00 +02:00
Swann aec5096f87 feat: update submodule url 2021-05-07 16:12:04 +02:00
Swann fba39b9980 fix: ci with submodules 2021-05-07 15:47:53 +02:00
Swann 6af3e4b777 refactor: add threaded data handling back on server side 2021-05-04 16:25:36 +02:00
Swann 58d639e9d8 feat: add replication as a submoduke 2021-05-04 14:56:50 +02:00
Swann Martinez 0efe5d5a10 Merge branch 'remove-services' into 'develop'
refactor: differential revision Stage 1

See merge request slumber/multi-user!119
2021-05-04 12:24:05 +00:00
Swann 2ad93cf304 Merge branch 'develop' into remove-services 2021-04-30 16:53:02 +02:00
Swann 771d76a98b fix: missing shapekeys attr 2021-04-30 16:51:11 +02:00
Swann 1e83241494 feat: remove pull socket 2021-04-30 16:26:20 +02:00
Swann 1bcbff3ed4 Merge branch 'develop' into remove-services 2021-04-29 14:41:55 +02:00
Swann 9a45fe7125 fix: shapekey animation data 2021-04-29 14:41:11 +02:00
Swann Martinez 207901afdd Merge branch '184-uv-project-modifier-target-object-doesn-t-sync' into 'develop'
Resolve "UV project modifier target object doesn't sync"

See merge request slumber/multi-user!118
2021-04-29 09:11:47 +00:00
Swann c6eb1ba22f fix: shapekey performances
Related to #187
2021-04-29 11:06:46 +02:00
Swann ba4168d0fd Merge branch 'develop' into remove-services 2021-04-28 16:56:20 +02:00
Swann 00e7adf022 fix: Image Empty is not loading.
Related to #186
2021-04-28 10:01:04 +02:00
Swann d9d8ca7ca0 revert: image source replication until a proper fix is done 2021-04-23 15:35:19 +02:00
Swann e8cd271bd8 fix: renable gitlab-ci file 2021-04-23 11:48:01 +02:00
Swann e71af6402c feat: increment addon version 2021-04-23 11:46:29 +02:00
Swann dd1c6a4fc7 feat: enable back ci 2021-04-23 11:45:47 +02:00
Swann 7fe1ae83b1 feat: update replication version to the right one 2021-04-23 11:25:15 +02:00
Swann a7ad9d30c3 Merge branch 'develop' into remove-services 2021-04-23 11:21:16 +02:00
Swann 14779be1ed feat: support video file as camera background images 2021-04-22 15:52:06 +02:00
Swann a36c3740cc fix: load driver variable without id 2021-04-22 15:00:08 +02:00
Swann d2108facab feat: fcurve modifiers support 2021-04-22 14:52:43 +02:00
Swann e5651151d9 fix: having both animation and drivers on the same object 2021-04-22 14:00:26 +02:00
Swann 3a02711baa feat: faster root management 2021-03-14 20:58:25 +01:00
Swann c7e8002fed fix: apply api
clean: ipc port propertie
2021-03-14 18:32:04 +01:00
Swann f4e7ec6be8 Merge branch 'develop' into 173-differential-revision-milestone-2-replication-refactoring 2021-03-14 17:46:23 +01:00
Swann 235db712fd fix: api 2021-03-11 15:45:48 +01:00
Swann 647ac46c01 feat: move apply to porcelain
feat: move data access to repository
feat: object_store layer to repository (with GraphObjectStore)
revert: missing network services
2021-03-09 14:07:59 +01:00
Swann 8e3c86561f refactor: move add to porcelain 2021-03-09 10:19:51 +01:00
Swann dba19e831d Merge branch 'develop' into 173-differential-revision-milestone-2-replication-refactoring 2021-03-08 22:16:14 +01:00
Swann 93df5ca5fa fix: disconnect callback 2021-03-06 10:20:57 +01:00
Swann b17104c67e fix: naming 2021-03-05 10:35:35 +01:00
Swann 875b9ce934 feat: temporary disable CI jobs for this branch because of breaking changes 2021-03-04 14:24:03 +01:00
Swann 2d638ef76f refactor: interface api changes 2021-03-04 14:22:54 +01:00
90 changed files with 3402 additions and 2122 deletions
+2 -1
View File
@@ -13,4 +13,5 @@ multi_user_updater/
_build
# ignore generated zip generated from blender_addon_tester
*.zip
*.zip
libs
+2
View File
@@ -8,3 +8,5 @@ build:
name: multi_user
paths:
- multi_user
variables:
GIT_SUBMODULE_STRATEGY: recursive
+1
View File
@@ -5,6 +5,7 @@ deploy:
variables:
DOCKER_DRIVER: overlay2
DOCKER_TLS_CERTDIR: "/certs"
GIT_SUBMODULE_STRATEGY: recursive
services:
- docker:19.03.12-dind
+2
View File
@@ -3,3 +3,5 @@ test:
image: slumber/blender-addon-testing:latest
script:
- python3 scripts/test_addon.py
variables:
GIT_SUBMODULE_STRATEGY: recursive
+3
View File
@@ -0,0 +1,3 @@
[submodule "multi_user/libs/replication"]
path = multi_user/libs/replication
url = https://gitlab.com/slumber/replication.git
+31 -1
View File
@@ -186,4 +186,34 @@ All notable changes to this project will be documented in this file.
- Exception access violation during Undo/Redo
- Sync missing armature bone Roll
- Sync missing driver data_path
- Constraint replication
- Constraint replication
## [0.4.0] - 2021-07-20
### Added
- Connection preset system (@Kysios)
- Display connected users active mode (users pannel and viewport) (@Kysios)
- Delta-based replication
- Sync timeline marker
- Sync images settings (@Kysios)
- Sync parent relation type (@Kysios)
- Sync uv project modifier
- Sync FCurves modifiers
### Changed
- User selection optimizations (draw and sync) (@Kysios)
- Improved shapekey syncing performances
- Improved gpencil syncing performances
- Integrate replication as a submodule
- The dependencies are now installed in a folder(blender addon folder) that no longer requires administrative rights
- Presence overlay UI optimization (@Kysios)
### Fixed
- User selection bounding box glitches for non-mesh objects (@Kysios)
- Transforms replication for animated objects
- GPencil fill stroke
- Sculpt and GPencil brushes deleted when joining a session (@Kysios)
- Auto-updater doesn't work for master and develop builds
+31 -32
View File
@@ -11,9 +11,8 @@ This tool aims to allow multiple users to work on the same scene over the networ
## Quick installation
1. Download latest release [multi_user.zip](https://gitlab.com/slumber/multi-user/-/jobs/artifacts/master/download?job=build).
2. Run blender as administrator (dependencies installation).
3. Install last_version.zip from your addon preferences.
1. Download [latest build](https://gitlab.com/slumber/multi-user/-/jobs/artifacts/develop/download?job=build) or [stable build](https://gitlab.com/slumber/multi-user/-/jobs/artifacts/master/download?job=build).
2. Install last_version.zip from your addon preferences.
[Dependencies](#dependencies) will be automatically added to your blender python during installation.
@@ -29,35 +28,35 @@ See the [troubleshooting guide](https://slumber.gitlab.io/multi-user/getting_sta
Currently, not all data-block are supported for replication over the wire. The following list summarizes the status for each ones.
| Name | Status | Comment |
| -------------- | :----: | :----------------------------------------------------------: |
| action | ✔️ | |
| armature | ❗ | Not stable |
| camera | ✔️ | |
| collection | ✔️ | |
| curve | ❗ | Nurbs surfaces not supported |
| gpencil | ✔️ | |
| image | ✔️ | |
| mesh | ✔️ | |
| material | ✔️ | |
| node_groups | ❗ | Material & Geometry only |
| geometry nodes | ✔️ | |
| metaball | ✔️ | |
| object | ✔️ | |
| textures | ❗ | Supported for modifiers/materials/geo nodes only |
| texts | ✔️ | |
| scene | ✔️ | |
| world | ✔️ | |
| lightprobes | ✔️ | |
| compositing | ❌ | [Planned](https://gitlab.com/slumber/multi-user/-/issues/46) |
| texts | ❌ | [Planned](https://gitlab.com/slumber/multi-user/-/issues/81) |
| nla | ❌ | |
| volumes | ✔️ | |
| particles | ❗ | The cache isn't syncing. |
| speakers | ❗ | [Partial](https://gitlab.com/slumber/multi-user/-/issues/65) |
| vse | ❗ | Mask and Clip not supported yet |
| physics | ❌ | [Planned](https://gitlab.com/slumber/multi-user/-/issues/45) |
| libraries | ❗ | Partial |
| Name | Status | Comment |
| -------------- | :----: | :---------------------------------------------------------------------: |
| action | ✔️ | |
| camera | ✔️ | |
| collection | ✔️ | |
| gpencil | ✔️ | |
| image | ✔️ | |
| mesh | ✔️ | |
| material | ✔️ | |
| node_groups | ✔️ | Material & Geometry only |
| geometry nodes | ✔️ | |
| metaball | ✔️ | |
| object | ✔️ | |
| texts | ✔️ | |
| scene | ✔️ | |
| world | ✔️ | |
| volumes | ✔️ | |
| lightprobes | ✔️ | |
| physics | ✔️ | |
| textures | ✔️ | |
| curve | ❗ | Nurbs surfaces not supported |
| armature | ❗ | Only for Mesh. [Planned for GPencil](https://gitlab.com/slumber/multi-user/-/issues/161). Not stable yet |
| particles | ❗ | The cache isn't syncing. |
| speakers | ❗ | [Partial](https://gitlab.com/slumber/multi-user/-/issues/65) |
| vse | ❗ | Mask and Clip not supported yet |
| libraries | ❌ | |
| nla | ❌ | |
| texts | ❌ | [Planned for v0.5.0](https://gitlab.com/slumber/multi-user/-/issues/81) |
| compositing | ❌ | [Planned for v0.5.0](https://gitlab.com/slumber/multi-user/-/issues/46) |
+2 -2
View File
@@ -19,10 +19,10 @@ import sys
project = 'multi-user'
copyright = '2020, Swann Martinez'
author = 'Swann Martinez, with contributions from Poochy'
author = 'Swann Martinez, Poochy, Fabian'
# The full version, including alpha/beta/rc tags
release = '0.2.0'
release = '0.5.0-develop'
# -- General configuration ---------------------------------------------------
Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 365 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 320 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

+51 -24
View File
@@ -108,36 +108,69 @@ Before starting make sure that you have access to the session IP address and por
1. Fill in your user information
--------------------------------
Follow the user-info_ section for this step.
Joining a server
=======================
----------------
2. Network setup
----------------
--------------
Network setup
--------------
In the network panel, select **JOIN**.
The **join sub-panel** (see image below) allows you to configure your client to join a
collaborative session which is already hosted.
.. figure:: img/quickstart_join.png
:align: center
:alt: Connect menu
.. figure:: img/server_preset_image_normal_server.png
:align: center
:width: 200px
Connection panel
Connection pannel
Fill in the fields with your information:
- **IP**: the host's IP address.
- **Port**: the host's port number.
- **Connect as admin**: connect yourself with **admin rights** (see :ref:`admin` ) to the session.
.. Maybe something more explicit here
.. note::
Additional configuration settings can be found in the :ref:`advanced` section.
Once you've configured every field, hit the button **CONNECT** to join the session !
When the :ref:`session-status` is **ONLINE** you are online and ready to start co-creating.
.. note::
If you want to have **administrator rights** (see :ref:`admin` ) on the server, just enter the password created by the host in the **Connect as admin** section
.. figure:: img/server_preset_image_admin.png
:align: center
:width: 200px
Admin password
---------------
Server presets
---------------
You can save your server presets in a preset list below the 'JOIN' and 'HOST' buttons. This allows you to quickly access and manage your servers.
To add a server, first enter the ip address and the port (plus the password if needed), then click on the + icon to add a name to your preset. To remove a server from the list, select it and click on the - icon.
.. figure:: img/server_preset_exemple.gif
:align: center
:width: 200px
.. warning:: Be careful, if you don't rename your new preset, or if it has the same name as an existing preset, the old preset will be overwritten.
.. figure:: img/server_preset_image_report.png
:align: center
:width: 200px
.. note::
Two presets are already present when the addon is launched:
- The 'localhost' preset, to host and join a local session quickly
- The 'public session' preset, to join the public sessions of the multi-user server (official discord to participate : https://discord.gg/aBPvGws)
.. note::
Additional configuration settings can be found in the :ref:`advanced` section.
.. note::
When starting a **dedicated server**, the session status screen will take you to the **LOBBY**, awaiting an admin to start the session.
@@ -182,8 +215,10 @@ One of the most vital tools is the **Online user panel**. It lists all connected
users' information including your own:
* **Role** : if a user is an admin or a regular user.
* **Location**: Where the user is actually working.
* **Username** : Name of the user.
* **Mode** : User's active editing mode (edit_mesh, paint,etc.).
* **Frame**: When (on which frame) the user is working.
* **Location**: Where the user is actually working.
* **Ping**: user's connection delay in milliseconds
.. figure:: img/quickstart_users.png
@@ -240,6 +275,7 @@ it draw users' related information in your viewport such as:
* Username
* User point of view
* User active mode
* User selection
.. figure:: img/quickstart_presence.png
@@ -374,15 +410,6 @@ Network
Advanced network settings
**IPC Port** is the port used for Inter Process Communication. This port is used
by the multi-user subprocesses to communicate with each other. If different instances
of multi-user are using the same IPC port, this will create conflict !
.. note::
You only need to modify this setting if you need to launch multiple clients from the same
computer (or if you try to host and join from the same computer). To resolve this, you simply need to enter a different
**IPC port** for each blender instance.
**Timeout (in milliseconds)** is the maximum ping authorized before auto-disconnecting.
You should only increase it if you have a bad connection.

Some files were not shown because too many files have changed in this diff Show More