Compare commits
645 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7bc45f8b58 | |||
| 7e6fc3ef3a | |||
| acc74b9bf9 | |||
| 62904e8106 | |||
| b58871470c | |||
| 8935c94101 | |||
| 12355b6457 | |||
| 74ad4e5e1f | |||
| 2a88c3e5ac | |||
| 4c42a5be92 | |||
| 757ee7015a | |||
| 15d66579c6 | |||
| 4128a47b88 | |||
| 689a565c75 | |||
| c5f1bf1176 | |||
| 4dc6781c94 | |||
| 5311e55208 | |||
| 4cb64e5e77 | |||
| ff67b581b1 | |||
| f7bec3fc08 | |||
| 5e929db3ee | |||
| 629f2e1cdb | |||
| b8fed806ed | |||
| 8190846b59 | |||
| c228b6ad7f | |||
| 48651ce890 | |||
| 26847cf459 | |||
| bfa6991c00 | |||
| 0c60c86775 | |||
| 70b6f9bcfa | |||
| 8d176b55e4 | |||
| 4c0356e724 | |||
| 6b04d1d8d6 | |||
| edfcdd8867 | |||
| bdd6599614 | |||
| 6efd1321ce | |||
| 047bd47048 | |||
| d32cbb7b30 | |||
| adabce3822 | |||
| 62f52db5b2 | |||
| 745f45b682 | |||
| 4b7573234a | |||
| f84860f520 | |||
| c7ee67d4dd | |||
| 7ed4644b75 | |||
| e0c4a17be9 | |||
| 2a6181b832 | |||
| 0f7c9adec5 | |||
| f094ec097c | |||
| 2495b5b0e7 | |||
| cc829b66d1 | |||
| 97cec4f9af | |||
| 102eb3ded0 | |||
| bea6373f03 | |||
| 8c3845349a | |||
| 9256d78d3c | |||
| bb952a507f | |||
| 3669aafcff | |||
| dfcfb84c20 | |||
| 5390e1a60c | |||
| 2910ea654b | |||
| ff2ecec18b | |||
| 7555b1332a | |||
| 690e450349 | |||
| 3e7e3a9b19 | |||
| e27a16975c | |||
| 44f1dc1aa8 | |||
| c62ed63de3 | |||
| de32bd89e3 | |||
| 50e86aea15 | |||
| c05a12343c | |||
| a09193fba2 | |||
| 60e21f2b8e | |||
| 421f00879f | |||
| 5ac61b5348 | |||
| 189e5c6cf1 | |||
| 964e6a8c63 | |||
| 80c81dc934 | |||
| 563fdb693d | |||
| a64eea3cea | |||
| 03ad7c0066 | |||
| d685573834 | |||
| 0681b53141 | |||
| 6f02b38b0e | |||
| 92c773dae9 | |||
| f48ade6390 | |||
| 63c4501b88 | |||
| 06e21c86ce | |||
| e28d3860da | |||
| 7b247372fb | |||
| bc47ef951a | |||
| de7417f0da | |||
| 9d484b00e9 | |||
| de9255f71c | |||
| 61cdfd7eca | |||
| 99528ea3e0 | |||
| bb342951a5 | |||
| 438a79177b | |||
| 947e9044c6 | |||
| 08fc49c40f | |||
| d7e25b1192 | |||
| 1671422143 | |||
| a9620c0752 | |||
| 583beaf6fe | |||
| 126d2338f2 | |||
| 24b0c0ed8a | |||
| 07fc1cf000 | |||
| 8e0131b3a8 | |||
| 912a2d524c | |||
| 82a5124d64 | |||
| cca5bf903b | |||
| 4c0d4cb1c7 | |||
| ca64797641 | |||
| a49d9ee437 | |||
| 4c1cd6b8f8 | |||
| d6cda709a6 | |||
| 4bc0feb3a5 | |||
| 59aab7159a | |||
| 0a798bb21b | |||
| beaafce4fa | |||
| 6f77337832 | |||
| 07252d62df | |||
| ac615cd134 | |||
| ac84509b83 | |||
| a4f9f6e051 | |||
| 10de88cdc9 | |||
| 69565b3852 | |||
| e4fa34c984 | |||
| 0dd685d009 | |||
| 3e8c30c0ab | |||
| 21cc3cd917 | |||
| 81e620ee3d | |||
| fb9bd108bd | |||
| 4846fbb589 | |||
| cab6625399 | |||
| 1b81251a11 | |||
| cf44e547a2 | |||
| 0269363c63 | |||
| 4ffca17c54 | |||
| 77bf269fb5 | |||
| 1e675132d4 | |||
| 781287c390 | |||
| fc91b252f4 | |||
| 41c7c569ca | |||
| a82d263f05 | |||
| d4476baa1b | |||
| 467e98906e | |||
| 64a25f94a3 | |||
| e6996316be | |||
| cf4cd94096 | |||
| e9ab633aac | |||
| 297639e80f | |||
| f0cc63b6f0 | |||
| d433e8f241 | |||
| 963a551a1e | |||
| d01a434fb7 | |||
| 3a5a5fc633 | |||
| 8926ab44e1 | |||
| a8f96581c5 | |||
| 440a4cc1cd | |||
| a207c51973 | |||
| e706c8e0bf | |||
| e590e896da | |||
| 4140b62a8e | |||
| 6d9c9c4532 | |||
| e9e1911840 | |||
| ab350ca7bc | |||
| 0a8f0b5f88 | |||
| 2238a15c11 | |||
| de73f022e6 | |||
| f517205647 | |||
| f33c3d8481 | |||
| 71c69000ec | |||
| de1e684b3c | |||
| d87730cffb | |||
| 3f005b86ab | |||
| 5098e5135d | |||
| 37cfed489c | |||
| 9003abcd18 | |||
| a199e0df00 | |||
| 3774419b7e | |||
| 3e552cb406 | |||
| 9f381b44c8 | |||
| ad795caed5 | |||
| 504dd77405 | |||
| 82022c9e4d | |||
| d81b4dc014 | |||
| 63affa079f | |||
| fcf5a12dd0 | |||
| b0529e4444 | |||
| bdfd89c085 | |||
| ff1630f9cc | |||
| 5830fe1abb | |||
| c609f72080 | |||
| a28a6f91bd | |||
| a996f39d3b | |||
| 7790a16034 | |||
| 836fdd02b8 | |||
| 7cb3482353 | |||
| 041022056c | |||
| 05f3eb1445 | |||
| 17193bde3a | |||
| a14b4313f5 | |||
| b203d9dffd | |||
| f64db2155e | |||
| e07ebdeff5 | |||
| 3d6453f7a2 | |||
| 7421511079 | |||
| bc24525cec | |||
| 699cf578e2 | |||
| e9b4afb440 | |||
| 0c6491590e | |||
| b87e733ddc | |||
| cb0962b484 | |||
| 1fc25412ac | |||
| b5405553dc | |||
| a1b6fb0533 | |||
| b6a8a2ec01 | |||
| 3e41b18af1 | |||
| f7c4f5d1fe | |||
| c616054878 | |||
| 5c08493774 | |||
| af8a138b4f | |||
| 6d9216f14a | |||
| fc4fb088bb | |||
| 98553ba00c | |||
| 1e15a12b10 | |||
| 569543650f | |||
| 07358802f7 | |||
| a059fafe12 | |||
| 297f68ccfe | |||
| c9c70d1e08 | |||
| a34f58ef3f | |||
| e7b7f38991 | |||
| 392e0aaaa3 | |||
| 4c774d5d53 | |||
| 4c4cf8a970 | |||
| 211d0848c2 | |||
| c9665c4719 | |||
| 431fe0d840 | |||
| df7ca66ad8 | |||
| c2d2db78e6 | |||
| ad89a4e389 | |||
| 6ca6d4443d | |||
| 81c9b5fc06 | |||
| 9fddfe084c | |||
| ca40523393 | |||
| 76e28ced21 | |||
| 55c6002b28 | |||
| 8d5c8aded3 | |||
| 8ebba80b97 | |||
| 50d6c6b3c8 | |||
| f0b03c50f2 | |||
| 28e83a38e6 | |||
| 2e261cd66b | |||
| 3f6e4f7333 | |||
| 49fadf084a | |||
| e2e0dc31c1 | |||
| 389bbd97d5 | |||
| 19602691d3 | |||
| 2e2ff5d4bf | |||
| fef6559ce0 | |||
| 5f669fd49a | |||
| 330ff08fd3 | |||
| f3be8f9623 | |||
| ffb70ab74c | |||
| 26140eefb2 | |||
| cdf0433e8a | |||
| acd70f73bf | |||
| 36c3a9ab0b | |||
| cfb1afdd72 | |||
| 4eeb80350e | |||
| fb1c985f31 | |||
| 689c2473d6 | |||
| 41620fce90 | |||
| 249bcf827b | |||
| d47eab4f26 | |||
| f011089d82 | |||
| acc58a1c9f | |||
| 24d850de9f | |||
| b045911a59 | |||
| a67be76422 | |||
| 32033c743c | |||
| 5da8650611 | |||
| aec5096f87 | |||
| fba39b9980 | |||
| 6af3e4b777 | |||
| 58d639e9d8 | |||
| 0efe5d5a10 | |||
| 2ad93cf304 | |||
| 771d76a98b | |||
| 1e83241494 | |||
| 1bcbff3ed4 | |||
| 9a45fe7125 | |||
| 207901afdd | |||
| c6eb1ba22f | |||
| ba4168d0fd | |||
| 00e7adf022 | |||
| d9d8ca7ca0 | |||
| e8cd271bd8 | |||
| e71af6402c | |||
| dd1c6a4fc7 | |||
| 7fe1ae83b1 | |||
| a7ad9d30c3 | |||
| 14779be1ed | |||
| a36c3740cc | |||
| d2108facab | |||
| e5651151d9 | |||
| fb61b380b6 | |||
| 57fdd492ef | |||
| e538752fbc | |||
| 53eaaa2fcd | |||
| a7e9108bff | |||
| 570909a7c4 | |||
| 736c3df7c4 | |||
| 8e606068f3 | |||
| eb631e2d4b | |||
| 70641435cc | |||
| 552c649d34 | |||
| d9d5a34653 | |||
| 12acd22660 | |||
| 826a59085e | |||
| 5ee4988aca | |||
| cb85a1db4c | |||
| 5e30e215ab | |||
| 9f167256d0 | |||
| 4e19c169b2 | |||
| 9c633c35ec | |||
| 9610b50a49 | |||
| 67d18f08e2 | |||
| 9d0d684589 | |||
| 2446df4fe3 | |||
| 07862f1cf0 | |||
| 3a02711baa | |||
| c7e8002fed | |||
| f4e7ec6be8 | |||
| 480818fe85 | |||
| b965c80ba5 | |||
| 235db712fd | |||
| 647ac46c01 | |||
| 8e3c86561f | |||
| dba19e831d | |||
| 93df5ca5fa | |||
| b17104c67e | |||
| b66d0dd4ce | |||
| 9487753307 | |||
| df1257ca4c | |||
| 875b9ce934 | |||
| 2d638ef76f | |||
| cc5a87adb8 | |||
| 19c56e590b | |||
| d0e80da945 | |||
| 0ccd0563ea | |||
| 1c3394ce56 | |||
| d2b63df68e | |||
| 3d9c78c2f9 | |||
| 4726a90a4a | |||
| 73b763d85f | |||
| 5e29c6fe26 | |||
| 113ab81cbf | |||
| d2215b662c | |||
| 238a34d023 | |||
| 55ca8a7b84 | |||
| 7049c1723d | |||
| 6586647eac | |||
| fb6f170d60 | |||
| c1c39438e3 | |||
| 317fc03f87 | |||
| 505f3ab770 | |||
| 209062af4f | |||
| 88bab2a4c6 | |||
| a91bae3506 | |||
| 0a96643a9f | |||
| 261d4d9610 | |||
| 3293741969 | |||
| 3eee8db1ae | |||
| 031b143843 | |||
| 7dd6e38e3f | |||
| 1dd0235061 | |||
| cdcb2de786 | |||
| 0b88631250 | |||
| c00b2a2d7d | |||
| 1f0f44fdbf | |||
| 8262fb9d4e | |||
| c2114b593e | |||
| 7e28ca3fa1 | |||
| d0bd4193d9 | |||
| d09479fd47 | |||
| 07cfb85561 | |||
| cf0d7a1122 | |||
| 3f335c7031 | |||
| 2180db5206 | |||
| e6110b4cea | |||
| 819598ebd9 | |||
| 1be43f0336 | |||
| 6a5ff9a097 | |||
| 86cb3d29fb | |||
| 589702dab7 | |||
| ed76210270 | |||
| 75c4f42796 | |||
| 1fd54769b9 | |||
| c4484b4b51 | |||
| 4eb787cc0f | |||
| c855b5a424 | |||
| ee4083c134 | |||
| 0325e9d0bd | |||
| 21dc95b5a7 | |||
| d8161f22f3 | |||
| 94f8bff231 | |||
| d3a1094cc2 | |||
| d08e0a80a4 | |||
| 26148e9934 | |||
| 0a7be03c6f | |||
| b6449a7da2 | |||
| 36038effdf | |||
| cb90c196a5 | |||
| ae3c9fe43e | |||
| 2983195af4 | |||
| 4d69faf186 | |||
| 2304563b6e | |||
| 1cfb4e797e | |||
| 8f95158f08 | |||
| 5949e3c5cc | |||
| 790f145022 | |||
| ec40862dd0 | |||
| 9cc1c92e0e | |||
| 7a716b4c37 | |||
| a4ef8a6344 | |||
| c5e20085f0 | |||
| f4463f9cfe | |||
| a212445927 | |||
| 89a8891073 | |||
| 52ebb874b0 | |||
| 2913e6d5a7 | |||
| 6a00b58600 | |||
| 2bde136bb6 | |||
| f5c77fec3a | |||
| d3211199c4 | |||
| 2d90ea7679 | |||
| abd846fc8d | |||
| e3bd7ea445 | |||
| 12bd4a603b | |||
| 3c31fb5118 | |||
| c24f70fad5 | |||
| ca2d8e49b5 | |||
| 4b1499f6ae | |||
| f0c1fe9c87 | |||
| dfaf1be4ff | |||
| 51cb099c4c | |||
| 64731a9198 | |||
| 213523c8d6 | |||
| 4fdb72f874 | |||
| 1412fc638c | |||
| 7920f67aea | |||
| a0c0f781e2 | |||
| ec74ea0038 | |||
| 2c016833fd | |||
| 3d9da73ab0 | |||
| 2f4e30f432 | |||
| cd1e535a56 | |||
| 8a8cc0b322 | |||
| 1e64e17ff4 | |||
| 66b6c06a2c | |||
| 45fbc46d8d | |||
| 39e3c1dbd5 | |||
| f043b03128 | |||
| ffe419a46e | |||
| d4a0f782aa | |||
| 9273adbd01 | |||
| 03b92eb5e7 | |||
| d0dc61bf66 | |||
| 056b3524e5 | |||
| 16fc4b8c54 | |||
| e62f0682a2 | |||
| f463cb82e7 | |||
| 54f416e8c3 | |||
| 682c983a64 | |||
| 8015881e29 | |||
| 6e2d36cd00 | |||
| affab2414c | |||
| af6d54296a | |||
| 2ab0a75608 | |||
| ccb9e55920 | |||
| 31254d13c0 | |||
| 6fddbb6f5e | |||
| 9ee3f26b80 | |||
| 19c5ca0928 | |||
| 4bc35d7da4 | |||
| 8d19ffd52f | |||
| 4f506c461a | |||
| 49fcc40db9 | |||
| 8492b537a8 | |||
| e6e4f6ab7a | |||
| e073182028 | |||
| 78eb5d948c | |||
| ac9a0f3733 | |||
| 4e7ade8f38 | |||
| 0b25264375 | |||
| 1d03fe4975 | |||
| 1273ab2371 | |||
| 7dd2ee5e70 | |||
| c72bb21f20 | |||
| 5b43520353 | |||
| 7e25ca4c84 | |||
| 4a4cd5db50 | |||
| 7f19d45b71 | |||
| 37b3d6d094 | |||
| 64bb715aff | |||
| 3024b479d3 | |||
| abf4462da6 | |||
| aa6827303f | |||
| 254e8e8ca1 | |||
| a63bf66023 | |||
| 983c5f9020 | |||
| 9f61335a85 | |||
| ed0c5d9431 | |||
| 46414aef13 | |||
| 3841ed3330 | |||
| 47a281faff | |||
| f0442861a8 | |||
| 039225a41c | |||
| f1ffe37ac7 | |||
| 6ca7b42ab4 | |||
| fbb32147b9 | |||
| d85db295a5 | |||
| 0f1850bf2c | |||
| 8f4de7adbf | |||
| 320745aab3 | |||
| 40cec39d27 | |||
| 498616147b | |||
| 30b2f5d32e | |||
| f7e98abb59 | |||
| 4022f300b3 | |||
| cef45dad3c | |||
| 30d734c2c1 | |||
| 4391510d7b | |||
| 04a4f7668a | |||
| 908c0fa4af | |||
| c718e62b33 | |||
| 2f34bba1fd | |||
| db4e495183 | |||
| c00a7184ff | |||
| 9c83df45fc | |||
| 17949003f7 | |||
| 371d793a13 | |||
| c710111887 | |||
| 664f7635cc | |||
| babecf5ae7 | |||
| 0bad6895da | |||
| 66e55a7eec | |||
| 4e2377cd7f | |||
| f90c12b27f | |||
| 3573db0969 | |||
| 92bde00a5a | |||
| 2c82560d24 | |||
| 6f364d2b88 | |||
| 760b52c02b | |||
| 4dd932fc56 | |||
| ba1a03cbfa | |||
| 18b5fa795c | |||
| 1a82ec72e4 | |||
| 804747c73b | |||
| 7ee705332f | |||
| bed33ca6ba | |||
| 716c78e380 | |||
| 5e4ce4556f | |||
| aa9ea08151 | |||
| f56890128e | |||
| 8865556229 | |||
| 5bc9b10c12 | |||
| 7db3c18213 | |||
| ff35e34032 | |||
| 9f8222afa7 | |||
| 1828bfac22 | |||
| 3a1087ecb8 | |||
| b398541787 | |||
| f0b33d8471 | |||
| 5a282a3e22 | |||
| 4283fc0fff | |||
| 753f4d3f27 | |||
| 9dd02b2756 | |||
| c74d12c843 | |||
| e1d9982276 | |||
| 8861986213 | |||
| 1cb9fb410c | |||
| c4a8cc4606 | |||
| 187f11071c | |||
| 530fae8cb4 | |||
| 6771c371a1 | |||
| c844c6e54f | |||
| a4d0b1a68b | |||
| 2fdc11692d | |||
| dbfca4568f | |||
| 069a528276 | |||
| 030f2661fd | |||
| e589e3eec4 | |||
| 04140ced1b | |||
| 0d9ce43e74 | |||
| d3969b4fd4 | |||
| e21f64ac98 | |||
| b25b380d21 | |||
| 1146d9d304 | |||
| 51b60521e6 | |||
| 035f8a1dcd | |||
| cefaef5c4b | |||
| 4714e60ff7 | |||
| 3eca25ae19 | |||
| 96346f8a25 | |||
| a258c2c182 | |||
| 6862df5331 | |||
| f271a9d0e3 | |||
| bdff6eb5c9 | |||
| b661407952 | |||
| d5eb7fda02 | |||
| 35e8ac9c33 | |||
| 4453d256b8 | |||
| 299e330ec6 | |||
| 34b9f7ae27 | |||
| 9d100d84ad | |||
| 2f677c399e | |||
| e967b35c38 | |||
| 7bd0a196b4 | |||
| 7892b5e9b6 | |||
| f779678c0e | |||
| 629fc2d223 | |||
| 724c2345df | |||
| 673c4e69a4 | |||
| fbfff6c7ec | |||
| f592294335 | |||
| 8e7be5afde | |||
| fc76b2a8e6 | |||
| 1a8bcddb74 | |||
| 60fba5b9df | |||
| be0eb1fa42 | |||
| 93d9bea3ae | |||
| 022b7f7822 | |||
| ae34846509 | |||
| d328077cb0 | |||
| 0c4740eef8 | |||
| d7b2c7e2f6 | |||
| efbb9e7096 | |||
| 7a94c21187 | |||
| 56ea93508c | |||
| 5f95eadc1d | |||
| 40ad96b0af |
@@ -14,3 +14,4 @@ _build
|
|||||||
|
|
||||||
# ignore generated zip generated from blender_addon_tester
|
# ignore generated zip generated from blender_addon_tester
|
||||||
*.zip
|
*.zip
|
||||||
|
libs
|
||||||
+2
-4
@@ -1,9 +1,7 @@
|
|||||||
stages:
|
stages:
|
||||||
- test
|
|
||||||
- build
|
- build
|
||||||
- deploy
|
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- local: .gitlab/ci/test.gitlab-ci.yml
|
|
||||||
- local: .gitlab/ci/build.gitlab-ci.yml
|
- local: .gitlab/ci/build.gitlab-ci.yml
|
||||||
- local: .gitlab/ci/deploy.gitlab-ci.yml
|
|
||||||
|
|||||||
@@ -7,4 +7,5 @@ build:
|
|||||||
name: multi_user
|
name: multi_user
|
||||||
paths:
|
paths:
|
||||||
- multi_user
|
- multi_user
|
||||||
|
variables:
|
||||||
|
GIT_SUBMODULE_STRATEGY: recursive
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
deploy:
|
deploy:
|
||||||
stage: deploy
|
stage: deploy
|
||||||
|
needs: ["build"]
|
||||||
image: slumber/docker-python
|
image: slumber/docker-python
|
||||||
variables:
|
variables:
|
||||||
DOCKER_DRIVER: overlay2
|
DOCKER_DRIVER: overlay2
|
||||||
DOCKER_TLS_CERTDIR: "/certs"
|
DOCKER_TLS_CERTDIR: "/certs"
|
||||||
|
GIT_SUBMODULE_STRATEGY: recursive
|
||||||
|
|
||||||
services:
|
services:
|
||||||
- docker:19.03.12-dind
|
- docker:19.03.12-dind
|
||||||
@@ -15,4 +17,5 @@ deploy:
|
|||||||
- docker build --build-arg replication_version=${RP_VERSION} --build-arg version={VERSION} -t registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} ./scripts/docker_server
|
- docker build --build-arg replication_version=${RP_VERSION} --build-arg version={VERSION} -t registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} ./scripts/docker_server
|
||||||
- echo "Pushing to gitlab registry ${VERSION}"
|
- echo "Pushing to gitlab registry ${VERSION}"
|
||||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||||
- docker push registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION}
|
- docker tag registry.gitlab.com/slumber/multi-user/multi-user-server:${VERSION} registry.gitlab.com/slumber/multi-user/multi-user-server:${CI_COMMIT_REF_NAME}
|
||||||
|
- docker push registry.gitlab.com/slumber/multi-user/multi-user-server
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
pages:
|
||||||
|
stage: doc
|
||||||
|
needs: ["deploy"]
|
||||||
|
image: python
|
||||||
|
script:
|
||||||
|
- pip install -U sphinx sphinx_rtd_theme sphinx-material
|
||||||
|
- sphinx-build -b html ./docs public
|
||||||
|
artifacts:
|
||||||
|
paths:
|
||||||
|
- public
|
||||||
|
only:
|
||||||
|
refs:
|
||||||
|
- master
|
||||||
|
- develop
|
||||||
|
|
||||||
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
test:
|
|
||||||
stage: test
|
|
||||||
image: slumber/blender-addon-testing:latest
|
|
||||||
script:
|
|
||||||
- python3 scripts/test_addon.py
|
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
[submodule "multi_user/libs/replication"]
|
||||||
|
path = multi_user/libs/replication
|
||||||
|
url = https://gitlab.com/slumber/replication.git
|
||||||
|
|||||||
+176
-1
@@ -65,7 +65,7 @@ All notable changes to this project will be documented in this file.
|
|||||||
- Unused strict right management strategy
|
- Unused strict right management strategy
|
||||||
- Legacy config management system
|
- Legacy config management system
|
||||||
|
|
||||||
## [0.1.0] - preview
|
## [0.1.0] - 2020-10-05
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
@@ -96,3 +96,178 @@ All notable changes to this project will be documented in this file.
|
|||||||
- World sync
|
- World sync
|
||||||
- Snapshot UUID error
|
- Snapshot UUID error
|
||||||
- The world is not synchronized
|
- The world is not synchronized
|
||||||
|
|
||||||
|
## [0.1.1] - 2020-10-16
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Session status widget
|
||||||
|
- Affect dependencies during change owner
|
||||||
|
- Dedicated server managment scripts(@brybalicious)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Refactored presence.py
|
||||||
|
- Reset button UI icon
|
||||||
|
- Documentation `How to contribute` improvements (@brybalicious)
|
||||||
|
- Documentation `Hosting guide` improvements (@brybalicious)
|
||||||
|
- Show flags are now available from the viewport overlay
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Render sync race condition (causing scene errors)
|
||||||
|
- Binary differentials
|
||||||
|
- Hybrid session crashes between Linux/Windows
|
||||||
|
- Materials node default output value
|
||||||
|
- Right selection
|
||||||
|
- Client node rights changed to COMMON after disconnecting from the server
|
||||||
|
- Collection instances selection draw
|
||||||
|
- Packed image save error
|
||||||
|
- Material replication
|
||||||
|
- UI spelling errors (@brybalicious)
|
||||||
|
|
||||||
|
|
||||||
|
## [0.2.0] - 2020-12-17
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Documentation `Troubleshouting` section (@brybalicious)
|
||||||
|
- Documentation `Update` section (@brybalicious)
|
||||||
|
- Documentation `Cloud Hosting Walkthrough` (@brybalicious)
|
||||||
|
- Support DNS name
|
||||||
|
- Sync annotations
|
||||||
|
- Sync volume objects
|
||||||
|
- Sync material node_goups
|
||||||
|
- Sync VSE
|
||||||
|
- Sync grease pencil modifiers
|
||||||
|
- Sync textures (modifier only)
|
||||||
|
- Session status widget
|
||||||
|
- Disconnection popup
|
||||||
|
- Popup with disconnection reason
|
||||||
|
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Improved GPencil performances
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Texture paint update
|
||||||
|
- Various documentation fixes section (@brybalicious)
|
||||||
|
- Empty and Light object selection highlights
|
||||||
|
- Material renaming
|
||||||
|
- Default material nodes input parameters
|
||||||
|
- blender 2.91 python api compatibility
|
||||||
|
|
||||||
|
## [0.3.0] - 2021-04-14
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Curve material support
|
||||||
|
- Cycle visibility settings
|
||||||
|
- Session save/load operator
|
||||||
|
- Add new scene support
|
||||||
|
- Physic initial support
|
||||||
|
- Geometry node initial support
|
||||||
|
- Blender 2.93 compatibility
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Host documentation on Gitlab Page
|
||||||
|
- Event driven update (from the blender deps graph)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Vertex group assignation
|
||||||
|
- Parent relation can't be removed
|
||||||
|
- Separate object
|
||||||
|
- Delete animation
|
||||||
|
- Sync missing holdout option for grease pencil material
|
||||||
|
- Sync missing `skin_vertices`
|
||||||
|
- Exception access violation during Undo/Redo
|
||||||
|
- Sync missing armature bone Roll
|
||||||
|
- Sync missing driver data_path
|
||||||
|
- 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
|
||||||
|
|
||||||
|
## [0.5.0] - 2022-02-10
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- New overall UI and UX (@Kysios)
|
||||||
|
- Documentation overall update (@Kysios)
|
||||||
|
- Server presets (@Kysios)
|
||||||
|
- Server online status (@Kysios)
|
||||||
|
- Draw connected user color in the user list
|
||||||
|
- Private session (access protected with a password) (@Kysios)
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Dependencies are now installed in the addon folder and correctly cleaned during the addon removal process
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Python 3.10 compatibility (@notfood)
|
||||||
|
- Blender 3.x compatibility
|
||||||
|
- Skin vertex radius synchronization (@kromar)
|
||||||
|
- Sequencer audio strip synchronization
|
||||||
|
- Crash with empty after a reconnection
|
||||||
|
|
||||||
|
## [0.5.1] - 2022-02-10
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Auto updater breaks dependency auto installer
|
||||||
|
- Auto updater update from tag
|
||||||
|
|
||||||
|
## [0.5.2] - 2022-02-18
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Objects not selectable after user leaves session
|
||||||
|
- Geometry nodes attribute toogle doesn't sync
|
||||||
|
|
||||||
|
## [0.5.3] - 2022-03-11
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Snapshots logs
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Server crashing during snapshots
|
||||||
|
- Blender 3.1 numpy loading error during early connection process
|
||||||
|
- Server docker arguments
|
||||||
|
|
||||||
|
## [0.5.5] - 2022-06-12
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Numpy mesh serialization error
|
||||||
@@ -11,46 +11,53 @@ This tool aims to allow multiple users to work on the same scene over the networ
|
|||||||
|
|
||||||
## Quick installation
|
## Quick installation
|
||||||
|
|
||||||
1. Download latest release [multi_user.zip](https://gitlab.com/slumber/multi-user/-/jobs/artifacts/master/download?job=build).
|
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. Run blender as administrator (dependencies installation).
|
2. Install last_version.zip from your addon preferences.
|
||||||
3. Install last_version.zip from your addon preferences.
|
|
||||||
|
|
||||||
[Dependencies](#dependencies) will be automatically added to your blender python during installation.
|
[Dependencies](#dependencies) will be automatically added to your blender python during installation.
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
See the [documentation](https://multi-user.readthedocs.io/en/latest/) for details.
|
See the [documentation](https://slumber.gitlab.io/multi-user/index.html) for details.
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
See the [troubleshooting guide](https://slumber.gitlab.io/multi-user/getting_started/troubleshooting.html) for tips on the most common issues.
|
||||||
|
|
||||||
## Current development status
|
## Current development status
|
||||||
|
|
||||||
Currently, not all data-block are supported for replication over the wire. The following list summarizes the status for each ones.
|
Currently, not all data-block are supported for replication over the wire. The following list summarizes the status for each ones.
|
||||||
|
|
||||||
| Name | Status | Comment |
|
| Name | Status | Comment |
|
||||||
| ----------- | :----: | :--------------------------------------------------------------------------: |
|
| -------------- | :----: | :---------------------------------------------------------------------: |
|
||||||
| action | ✔️ | |
|
| action | ✔️ | |
|
||||||
| armature | ❗ | Not stable |
|
|
||||||
| camera | ✔️ | |
|
| camera | ✔️ | |
|
||||||
| collection | ✔️ | |
|
| collection | ✔️ | |
|
||||||
| curve | ❗ | Nurbs not supported |
|
| gpencil | ✔️ | |
|
||||||
| gpencil | ✔️ | [Airbrush not supported](https://gitlab.com/slumber/multi-user/-/issues/123) |
|
|
||||||
| image | ✔️ | |
|
| image | ✔️ | |
|
||||||
| mesh | ✔️ | |
|
| mesh | ✔️ | |
|
||||||
| material | ✔️ | |
|
| material | ✔️ | |
|
||||||
|
| node_groups | ✔️ | Material & Geometry only |
|
||||||
|
| geometry nodes | ✔️ | |
|
||||||
| metaball | ✔️ | |
|
| metaball | ✔️ | |
|
||||||
| object | ✔️ | |
|
| object | ✔️ | |
|
||||||
| texts | ✔️ | |
|
| texts | ✔️ | |
|
||||||
| scene | ✔️ | |
|
| scene | ✔️ | |
|
||||||
| world | ✔️ | |
|
| world | ✔️ | |
|
||||||
|
| volumes | ✔️ | |
|
||||||
| lightprobes | ✔️ | |
|
| lightprobes | ✔️ | |
|
||||||
| compositing | ❌ | [Planned](https://gitlab.com/slumber/multi-user/-/issues/46) |
|
| physics | ✔️ | |
|
||||||
| texts | ❌ | [Planned](https://gitlab.com/slumber/multi-user/-/issues/81) |
|
| textures | ✔️ | |
|
||||||
| nla | ❌ | |
|
| curve | ❗ | Nurbs surfaces not supported |
|
||||||
| volumes | ❌ | |
|
| armature | ❗ | Only for Mesh. [Planned for GPencil](https://gitlab.com/slumber/multi-user/-/issues/161). Not stable yet |
|
||||||
| particles | ❌ | [On-going](https://gitlab.com/slumber/multi-user/-/issues/24) |
|
| particles | ❗ | The cache isn't syncing. |
|
||||||
| speakers | ❗ | [Partial](https://gitlab.com/slumber/multi-user/-/issues/65) |
|
| speakers | ❗ | [Partial](https://gitlab.com/slumber/multi-user/-/issues/65) |
|
||||||
| vse | ❌ | [Planned](https://gitlab.com/slumber/multi-user/-/issues/45) |
|
| vse | ❗ | Mask and Clip not supported yet |
|
||||||
| physics | ❌ | [Planned](https://gitlab.com/slumber/multi-user/-/issues/45) |
|
| libraries | ❌ | |
|
||||||
| libraries | ❗ | Partial |
|
| 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) |
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
### Performance issues
|
### Performance issues
|
||||||
@@ -68,7 +75,7 @@ I'm working on it.
|
|||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
See [contributing section](https://multi-user.readthedocs.io/en/latest/ways_to_contribute.html) of the documentation.
|
See [contributing section](https://slumber.gitlab.io/multi-user/ways_to_contribute.html) of the documentation.
|
||||||
|
|
||||||
Feel free to [join the discord server](https://discord.gg/aBPvGws) to chat, seek help and contribute.
|
Feel free to [join the discord server](https://discord.gg/aBPvGws) to chat, seek help and contribute.
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
=========
|
||||||
|
Community
|
||||||
|
=========
|
||||||
|
|
||||||
|
Discord
|
||||||
|
=======
|
||||||
|
|
||||||
|
Feel free to join our `discord server <https://discord.gg/aBPvGws>`_ !
|
||||||
|
|
||||||
|
You will find help, a way to take part in the project, public collaborative sessions, people to create with, information about the addon's progress and much more.
|
||||||
|
|
||||||
|
.. TODO: Make a call on discord get a link / image for evry contributor ?
|
||||||
|
|
||||||
|
Contributors
|
||||||
|
============
|
||||||
|
|
||||||
|
Swann, Fabian, NotFood, Poochyc, Valentin, Adrien, Tanguy, Bruno, Gorgio, Axel, Ultr-X, Wuaieyo, Softyoda, Staz, Ikxi, Kysios.
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
============
|
||||||
|
Key Features
|
||||||
|
============
|
||||||
|
|
||||||
|
Multi-User is a free and open source blender addon.
|
||||||
|
It aims to allow multiple users to work on the same scene over the network. Based on a Clients / Server architecture, the data-oriented replication schema replicate blender data-blocks across the wire.
|
||||||
|
|
||||||
|
.. warning::
|
||||||
|
The addon is still in development Be carefull when using it.
|
||||||
|
|
||||||
|
On rare occasions, it can happen that your blender scenes become corrupted, think of making backups to avoid losing your projects.
|
||||||
|
|
||||||
|
Collaboration
|
||||||
|
=============
|
||||||
|
|
||||||
|
Multi-User allows a strong collaborative workflow between users. Being able to collaborate in this way has opened up new opportunities:
|
||||||
|
|
||||||
|
|
||||||
|
- Being able to create together and in real time on the same 3D scene, with instant feedback.
|
||||||
|
- Being able to teach directly in the same 3D environment in real time, facilitating communication between the teacher and these students.
|
||||||
|
- To be able to experiment with several people, to make challenges or simply to have fun.
|
||||||
|
- And much more !
|
||||||
|
|
||||||
|
Easier communication
|
||||||
|
====================
|
||||||
|
|
||||||
|
Thanks to *presence*, the overlay system that Multi-User provides, it is possible to see other users in the 3D space. The *presence* overlay is customizable to match your preferences (visibility, names, options).
|
||||||
|
|
||||||
|
Session management
|
||||||
|
==================
|
||||||
|
|
||||||
|
The addon works on a session system. The creator of the session and the administrators have rights that allow them to easily manage the session (backups, user management). In addition, there is a management of datablock rights so that each user can collaborate as they wish.
|
||||||
@@ -1,8 +1,10 @@
|
|||||||
About
|
================
|
||||||
=====
|
About Multi-User
|
||||||
|
================
|
||||||
|
|
||||||
.. toctree::
|
.. toctree::
|
||||||
:maxdepth: 1
|
:maxdepth: 2
|
||||||
:name: toc-about
|
|
||||||
|
|
||||||
introduction
|
introduction
|
||||||
|
features
|
||||||
|
community
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
============
|
========
|
||||||
Introduction
|
The idea
|
||||||
============
|
========
|
||||||
|
|
||||||
|
|
||||||
A film is an idea carved along the whole production process by many different peoples. A traditional animation pipeline involve a linear succession of tasks. From storyboard to compositing by passing upon different step, its fundamental work flow is similar to an industrial assembly line. Since each step is almost a department, its common that one person on department B doesn't know what another person did on a previous step in a department A. This lack of visibility/communication could be a source of problems which could produce a bad impact on the final production result.
|
A film is an idea carved along the whole production process by many different peoples. A traditional animation pipeline involve a linear succession of tasks. From storyboard to compositing by passing upon different step, its fundamental work flow is similar to an industrial assembly line. Since each step is almost a department, its common that one person on department B doesn't know what another person did on a previous step in a department A. This lack of visibility/communication could be a source of problems which could produce a bad impact on the final production result.
|
||||||
|
|
||||||
|
|||||||
+50
-17
@@ -12,17 +12,16 @@
|
|||||||
#
|
#
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
# sys.path.insert(0, os.path.abspath('.'))
|
|
||||||
|
|
||||||
|
|
||||||
# -- Project information -----------------------------------------------------
|
# -- Project information -----------------------------------------------------
|
||||||
|
|
||||||
project = 'multi-user'
|
project = 'Multi-User 0.5.x Documentation'
|
||||||
copyright = '2020, Swann Martinez'
|
copyright = '2020, Swann Martinez'
|
||||||
author = 'Swann Martinez'
|
author = 'Swann Martinez, Poochy, Fabian'
|
||||||
|
|
||||||
# The full version, including alpha/beta/rc tags
|
# The full version, including alpha/beta/rc tags
|
||||||
release = '0.0.2'
|
version_release = '0.5.5'
|
||||||
|
|
||||||
|
|
||||||
# -- General configuration ---------------------------------------------------
|
# -- General configuration ---------------------------------------------------
|
||||||
@@ -42,12 +41,15 @@ source_suffix = ".rst"
|
|||||||
# The master toctree document.
|
# The master toctree document.
|
||||||
master_doc = "index"
|
master_doc = "index"
|
||||||
|
|
||||||
|
# General information about the projet
|
||||||
|
projet = 'Multi-User %s Doc' % version_release
|
||||||
|
|
||||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
# for a list of supported languages.
|
# for a list of supported languages.
|
||||||
#
|
|
||||||
# This is also used if you do content translation via gettext catalogs.
|
# This is also used if you do content translation via gettext catalogs.
|
||||||
# Usually you set "language" from the command line for these cases.
|
# Usually you set "language" from the command line for these cases.
|
||||||
language = 'python'
|
language = 'en'
|
||||||
|
|
||||||
# List of patterns, relative to source directory, that match files and
|
# List of patterns, relative to source directory, that match files and
|
||||||
# directories to ignore when looking for source files.
|
# directories to ignore when looking for source files.
|
||||||
@@ -60,28 +62,59 @@ exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
|
|||||||
# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
|
# on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
|
||||||
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
|
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
|
||||||
|
|
||||||
import sphinx_rtd_theme
|
html_theme = "default"
|
||||||
html_theme = 'sphinx_rtd_theme'
|
|
||||||
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
|
try:
|
||||||
|
import sphinx_rtd_theme
|
||||||
|
html_theme = 'sphinx_rtd_theme'
|
||||||
|
del sphinx_rtd_theme
|
||||||
|
except ModuleNotFoundError:
|
||||||
|
pass
|
||||||
|
|
||||||
if on_rtd:
|
if on_rtd:
|
||||||
using_rtd_theme = True
|
using_rtd_theme = True
|
||||||
|
|
||||||
# Theme options
|
|
||||||
|
# Theme options are theme-specific and customize the look and feel of a theme
|
||||||
|
# further. For a list of options available for each theme, see the
|
||||||
|
# documentation.
|
||||||
html_theme_options = {
|
html_theme_options = {
|
||||||
# 'typekit_id': 'hiw1hhg',
|
|
||||||
# 'analytics_id': '',
|
|
||||||
# 'sticky_navigation': True # Set to False to disable the sticky nav while scrolling.
|
|
||||||
# 'logo_only': True, # if we have a html_logo below, this shows /only/ the logo with no title text
|
|
||||||
'collapse_navigation': False, # Collapse navigation (False makes it tree-like)
|
'collapse_navigation': False, # Collapse navigation (False makes it tree-like)
|
||||||
# 'display_version': True, # Display the docs version
|
|
||||||
# 'navigation_depth': 4, # Depth of the headers shown in the navigation bar
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Add any paths that contain custom themes here, relative to this directory.
|
||||||
|
html_theme_path = []
|
||||||
|
|
||||||
|
if html_theme == "sphinx_rtd_theme":
|
||||||
|
html_theme_options = {
|
||||||
|
"analytics_id": "UA-1418081-1",
|
||||||
|
# included in the title
|
||||||
|
"display_version": False,
|
||||||
|
"collapse_navigation": True,
|
||||||
|
"navigation_depth": -1,
|
||||||
|
}
|
||||||
|
|
||||||
|
extensions.append('sphinx_rtd_theme')
|
||||||
|
|
||||||
|
# The name for this set of Sphinx documents.
|
||||||
|
# "<project> v<release> documentation" by default.
|
||||||
|
html_title = "Multi-User Doc"
|
||||||
|
|
||||||
|
# Add any paths that contain custom static files (such as style sheets) here,
|
||||||
|
# relative to this directory. They are copied after the builtin static files,
|
||||||
|
# so a file named "default.css" will overwrite the builtin "default.css".
|
||||||
|
html_logo = "resources/logo.png"
|
||||||
|
html_favicon = "ressources/favicon.ico"
|
||||||
|
html_static_path = ["resources"]
|
||||||
|
|
||||||
|
|
||||||
|
if html_theme == "sphinx_rtd_theme":
|
||||||
|
html_css_files = ["css/theme_overrides.css"]
|
||||||
|
|
||||||
# -- Options for HTMLHelp output ------------------------------------------
|
# -- Options for HTMLHelp output ------------------------------------------
|
||||||
|
|
||||||
# Output file base name for HTML help builder.
|
# Output file base name for HTML help builder.
|
||||||
htmlhelp_basename = 'multiusrdoc'
|
htmlhelp_basename = 'Multi-User Manual'
|
||||||
|
|
||||||
# sphinx-notfound-page
|
# sphinx-notfound-page
|
||||||
# https://github.com/readthedocs/sphinx-notfound-page
|
# https://github.com/readthedocs/sphinx-notfound-page
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 106 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 80 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 9.3 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user