dev #84

Merged
ksenia_mikhailova merged 141 commits from dev into main 2024-10-03 15:30:24 +03:00

141 Commits

Author SHA1 Message Date
Kseninia Mikhaylova 6aa838b151 smooth
Deploy / build_and_push_images (push) Successful in 1m31s Details
Deploy / deploy_to_server_dev (push) Successful in 36s Details
2024-10-02 15:24:54 +03:00
Kseninia Mikhaylova 4a2028415e azimuth
Deploy / build_and_push_images (push) Successful in 1m26s Details
Deploy / deploy_to_server_dev (push) Successful in 1m19s Details
2024-10-02 15:11:19 +03:00
Kseninia Mikhaylova 3fbc27ee2a scale
Deploy / build_and_push_images (push) Successful in 1m26s Details
Deploy / deploy_to_server_dev (push) Successful in 31s Details
2024-10-02 15:06:20 +03:00
Kseninia Mikhaylova 70c34906e3 calc 2024-10-02 15:04:12 +03:00
Kseninia Mikhaylova c7a3485227 total small text 2024-10-02 14:43:45 +03:00
Kseninia Mikhaylova 24120cc7df remove stats
Deploy / build_and_push_images (push) Successful in 1m19s Details
Deploy / deploy_to_server_dev (push) Successful in 41s Details
2024-10-02 14:39:55 +03:00
Kseninia Mikhaylova 62ee7e7c06 condition text
Deploy / build_and_push_images (push) Successful in 1m18s Details
Deploy / deploy_to_server_dev (push) Successful in 44s Details
2024-10-02 14:34:47 +03:00
Kseninia Mikhaylova 5f67e86d99 total text fix
Deploy / build_and_push_images (push) Successful in 1m24s Details
Deploy / deploy_to_server_dev (push) Successful in 32s Details
2024-10-02 14:26:08 +03:00
Зеленская Анастасия Николаевна 3d7493708f uzor
Deploy / build_and_push_images (push) Successful in 1m22s Details
Deploy / deploy_to_server_dev (push) Successful in 32s Details
2024-10-02 14:21:04 +03:00
ksenia_mikhailova 53dae6b1d0 Merge pull request 'adaptive part' (#83) from bx-1480-calc into dev
Deploy / build_and_push_images (push) Successful in 1m17s Details
Deploy / deploy_to_server_dev (push) Successful in 31s Details
Reviewed-on: #83
2024-10-02 12:05:43 +03:00
Kseninia Mikhaylova 0b0ad0fb20 adaptive part 2024-10-02 12:05:25 +03:00
ksenia_mikhailova 0bdc048140 Merge pull request 'io prim color' (#82) from bx-1480-calc into dev
Deploy / build_and_push_images (push) Successful in 1m19s Details
Deploy / deploy_to_server_dev (push) Successful in 39s Details
Reviewed-on: #82
2024-10-02 11:37:36 +03:00
Kseninia Mikhaylova 80171408cc noise only pillar 2024-10-02 11:37:24 +03:00
Kseninia Mikhaylova 8bfa770c6f io prim color 2024-10-02 11:25:15 +03:00
ksenia_mikhailova e240adfb10 Merge pull request 'bx-1480-calc' (#81) from bx-1480-calc into dev
Deploy / build_and_push_images (push) Successful in 1m23s Details
Deploy / deploy_to_server_dev (push) Successful in 31s Details
Reviewed-on: #81
2024-10-02 11:16:14 +03:00
Kseninia Mikhaylova 6522943347 env map in exp diag 2024-10-02 11:15:34 +03:00
Kseninia Mikhaylova e5922a11da new toppers 2024-10-02 11:13:23 +03:00
Kseninia Mikhaylova 8d4df6d76c remove noise from exp diagram 2024-10-02 11:08:46 +03:00
Kseninia Mikhaylova 7bc50a9b97 new topper and bottom 2024-10-02 11:04:09 +03:00
Kseninia Mikhaylova b4caaaf18f brace visibility 2024-10-02 10:56:40 +03:00
Kseninia Mikhaylova c5d39aba91 nan fix 2024-10-02 10:47:04 +03:00
ksenia_mikhailova 004db8addc Merge pull request 'modal' (#80) from bx-1480-calc into dev
Deploy / build_and_push_images (push) Successful in 1m20s Details
Deploy / deploy_to_server_dev (push) Successful in 31s Details
Reviewed-on: #80
2024-10-02 10:36:22 +03:00
Kseninia Mikhaylova 43de811208 modal 2024-10-02 10:31:38 +03:00
aarizona 7c4f7a1a1c shader
Deploy / build_and_push_images (push) Successful in 1m22s Details
Deploy / deploy_to_server_dev (push) Successful in 32s Details
2024-10-01 20:52:44 +03:00
Kseninia Mikhaylova 85ae3802eb vertex merge
Deploy / build_and_push_images (push) Successful in 1m33s Details
Deploy / deploy_to_server_dev (push) Successful in 34s Details
2024-10-01 11:23:33 +03:00
Kseninia Mikhaylova d536173f20 Merge branch 'bx-1480-constructor' into dev
Deploy / build_and_push_images (push) Failing after 39s Details
Deploy / deploy_to_server_dev (push) Has been skipped Details
2024-10-01 11:20:09 +03:00
Kseninia Mikhaylova fda2ce879c shader 2024-10-01 11:16:47 +03:00
ksenia_mikhailova 73d609f89c Merge pull request 'ral' (#77) from bx-1146-more_calc into dev
Deploy / build_and_push_images (push) Successful in 3m22s Details
Deploy / deploy_to_server_dev (push) Successful in 41s Details
Reviewed-on: #77
2024-10-01 11:06:37 +03:00
Kseninia Mikhaylova 6fd4693fa6 Merge branch 'bx-1146-more_calc' of https://git.svs-tech.pro/mns/mns-mini-zabor into bx-1146-more_calc 2024-10-01 11:06:04 +03:00
ksenia_mikhailova 4302be1860 Merge pull request 'bx-1480-shaderexp' (#76) from bx-1480-shaderexp into dev
Deploy / deploy_to_server_dev (push) Blocked by required conditions Details
Deploy / build_and_push_images (push) Has been cancelled Details
Reviewed-on: #76
2024-10-01 11:03:25 +03:00
aarizona 4511d081c6 procedural noise 2024-09-30 22:23:46 +03:00
aarizona 8572014f6b make base noise normal 2024-09-30 22:18:11 +03:00
aarizona 10ca4f23b5 vertex to files 2024-09-30 21:07:04 +03:00
Kseninia Mikhaylova 219d652e71 shader test 2024-09-30 17:00:47 +03:00
Kseninia Mikhaylova ba623c90cf shader 2024-09-30 16:54:24 +03:00
Зеленская Анастасия Николаевна e9159c1b90 ral 2024-09-30 15:39:54 +03:00
Kseninia Mikhaylova bd5dbccd08 extra value
Deploy / build_and_push_images (push) Successful in 1m21s Details
Deploy / deploy_to_server_dev (push) Successful in 32s Details
2024-09-30 14:20:11 +03:00
Kseninia Mikhaylova 7dbcecacdc text color fix 2024-09-30 14:14:55 +03:00
Kseninia Mikhaylova f4d16895fe last el fix
Deploy / build_and_push_images (push) Successful in 1m28s Details
Deploy / deploy_to_server_dev (push) Successful in 33s Details
2024-09-30 13:57:32 +03:00
Kseninia Mikhaylova 32b6702efd shader test 2024-09-30 13:54:15 +03:00
Kseninia Mikhaylova 1dce9e7ea9 noise by gb channek 2024-09-30 13:17:19 +03:00
Kseninia Mikhaylova 7c0c7cd6c3 noise shader 2024-09-30 13:06:10 +03:00
Kseninia Mikhaylova f00664bcd6 braces color 2024-09-30 12:13:21 +03:00
Kseninia Mikhaylova 8ff2c8bdbc picker calc
Deploy / build_and_push_images (push) Successful in 1m23s Details
Deploy / deploy_to_server_dev (push) Successful in 32s Details
2024-09-30 11:58:22 +03:00
Kseninia Mikhaylova 9c49426c27 picker sizes
Deploy / build_and_push_images (push) Successful in 1m25s Details
Deploy / deploy_to_server_dev (push) Successful in 32s Details
2024-09-30 11:52:28 +03:00
Kseninia Mikhaylova c9e0d489d1 color size 2024-09-30 11:47:56 +03:00
Kseninia Mikhaylova 6858183aa4 goto cam
Deploy / build_and_push_images (push) Successful in 1m17s Details
Deploy / deploy_to_server_dev (push) Successful in 32s Details
2024-09-30 10:20:01 +03:00
Kseninia Mikhaylova 7d9792f279 topper
Deploy / build_and_push_images (push) Successful in 1m20s Details
Deploy / deploy_to_server_dev (push) Successful in 40s Details
2024-09-30 10:16:02 +03:00
Kseninia Mikhaylova 3f31a2c8a0 topper 2024-09-30 09:53:47 +03:00
aarizona e7cb7ea201 max size
Deploy / build_and_push_images (push) Successful in 1m24s Details
Deploy / deploy_to_server_dev (push) Successful in 31s Details
2024-09-27 17:50:37 +03:00
aarizona bc628b07fd test square 2024-09-27 17:46:45 +03:00
aarizona b5c87e0b6e max size 2024-09-27 17:31:45 +03:00
aarizona b30766cb3f cenvas 800 px height 2024-09-27 17:10:06 +03:00
aarizona fe05fe959c Merge branch 'dev' into bx-1480-constructor
Deploy / build_and_push_images (push) Successful in 1m20s Details
Deploy / deploy_to_server_dev (push) Successful in 53s Details
2024-09-27 16:58:47 +03:00
aarizona 0341756dd1 blocks 2024-09-27 16:50:47 +03:00
aarizona 988b490d87 picker 2024-09-27 16:43:28 +03:00
aarizona b313da0a53 form-group 2024-09-27 16:27:17 +03:00
Kseninia Mikhaylova 7c3b7d621f slate clear color
Deploy / build_and_push_images (push) Successful in 1m29s Details
Deploy / deploy_to_server_dev (push) Successful in 49s Details
2024-09-27 14:18:22 +03:00
Kseninia Mikhaylova 1cd7865401 Range styles
Deploy / build_and_push_images (push) Successful in 1m30s Details
Deploy / deploy_to_server_dev (push) Successful in 1m5s Details
2024-09-27 13:47:24 +03:00
Kseninia Mikhaylova 764a287c20 range styles 2024-09-27 13:40:28 +03:00
Kseninia Mikhaylova 04d7de4104 close tabber 2024-09-27 13:23:00 +03:00
Kseninia Mikhaylova 6358f3c924 fixing position 2024-09-27 13:18:23 +03:00
Kseninia Mikhaylova 912e1f305a hise opened calc 2024-09-27 12:26:49 +03:00
Kseninia Mikhaylova 7b8e7becee fixing color 2024-09-27 12:18:53 +03:00
Kseninia Mikhaylova 755f5c48c0 top position
Deploy / build_and_push_images (push) Successful in 1m45s Details
Deploy / deploy_to_server_dev (push) Successful in 1m20s Details
2024-09-27 12:11:19 +03:00
Kseninia Mikhaylova c277c4f034 braces 2024-09-27 12:10:06 +03:00
Kseninia Mikhaylova 74995d8f5b lamelle fixing
Deploy / build_and_push_images (push) Successful in 1m29s Details
Deploy / deploy_to_server_dev (push) Successful in 1m20s Details
2024-09-27 09:59:13 +03:00
Kseninia Mikhaylova 50644767db top fixing 2024-09-27 09:33:33 +03:00
Kseninia Mikhaylova 114f1eefc0 top fastening 2024-09-27 09:04:37 +03:00
aarizona 462b1cf5e5 pivot test 2024-09-26 22:05:38 +03:00
Kseninia Mikhaylova 065b3a646f part of models
Deploy / build_and_push_images (push) Successful in 1m21s Details
Deploy / deploy_to_server_dev (push) Successful in 32s Details
2024-09-26 17:01:42 +03:00
Kseninia Mikhaylova fe6474983d texture file 2024-09-26 16:36:35 +03:00
Kseninia Mikhaylova 05afc0e4c6 files rename
Deploy / build_and_push_images (push) Successful in 1m22s Details
Deploy / deploy_to_server_dev (push) Successful in 37s Details
2024-09-26 15:21:37 +03:00
Kseninia Mikhaylova 5cb7d19f3f uv 2024-09-26 15:13:21 +03:00
Kseninia Mikhaylova 2af002ee2b noise koef
Deploy / build_and_push_images (push) Successful in 1m22s Details
Deploy / deploy_to_server_dev (push) Successful in 31s Details
2024-09-26 14:56:19 +03:00
Kseninia Mikhaylova a3687808ea texture scaling 2024-09-26 14:52:27 +03:00
Kseninia Mikhaylova 012af96856 braces
Deploy / build_and_push_images (push) Successful in 1m20s Details
Deploy / deploy_to_server_dev (push) Successful in 48s Details
2024-09-26 13:27:20 +03:00
Kseninia Mikhaylova 3420b488fc texture
Deploy / build_and_push_images (push) Successful in 1m26s Details
Deploy / deploy_to_server_dev (push) Successful in 39s Details
2024-09-26 13:14:02 +03:00
Kseninia Mikhaylova e0fe1d5a96 brace start 2024-09-26 12:06:11 +03:00
Kseninia Mikhaylova 2c97c4212c lamelle color 2024-09-26 11:37:49 +03:00
Kseninia Mikhaylova 4484fb6c96 pillar color 2024-09-26 10:58:22 +03:00
Kseninia Mikhaylova ec4db1497b pillar recolor 2024-09-26 08:48:09 +03:00
aarizona ff2c9c34d1 test pillar 2024-09-25 20:40:41 +03:00
Kseninia Mikhaylova 6afed2d73e pattern
Deploy / build_and_push_images (push) Successful in 1m27s Details
Deploy / deploy_to_server_dev (push) Successful in 41s Details
2024-09-25 16:56:36 +03:00
Kseninia Mikhaylova 74f975f049 colors
Deploy / build_and_push_images (push) Successful in 1m24s Details
Deploy / deploy_to_server_dev (push) Successful in 2m37s Details
2024-09-25 16:50:13 +03:00
Kseninia Mikhaylova a3e91c1801 test
Deploy / build_and_push_images (push) Successful in 1m24s Details
Deploy / deploy_to_server_dev (push) Successful in 43s Details
2024-09-25 16:38:35 +03:00
Kseninia Mikhaylova c797f66218 recolor inner
Deploy / build_and_push_images (push) Successful in 1m44s Details
Deploy / deploy_to_server_dev (push) Successful in 34s Details
2024-09-25 15:49:06 +03:00
Kseninia Mikhaylova cac6bf1bff rotate
Deploy / build_and_push_images (push) Successful in 6m1s Details
Deploy / deploy_to_server_dev (push) Successful in 32s Details
2024-09-25 15:28:33 +03:00
Kseninia Mikhaylova 027fc2e6bf target 2024-09-25 15:13:07 +03:00
Kseninia Mikhaylova 007a4fb014 dropdown 2024-09-25 15:05:28 +03:00
Kseninia Mikhaylova 673783280b recolor fix 2024-09-25 14:28:02 +03:00
Kseninia Mikhaylova d21b5f9042 camera pos on lame 2024-09-25 14:15:41 +03:00
Kseninia Mikhaylova fbad0016f8 Merge branch 'dev' into bx-1480-constructor
Deploy / build_and_push_images (push) Successful in 1m22s Details
Deploy / deploy_to_server_dev (push) Successful in 33s Details
2024-09-25 13:12:51 +03:00
Kseninia Mikhaylova 7a59d8c77f parametric 2024-09-25 13:12:38 +03:00
Kseninia Mikhaylova 405c2a6b77 recolor 2024-09-25 13:06:40 +03:00
Kseninia Mikhaylova 1b0b514e62 env file 2024-09-25 12:50:39 +03:00
Kseninia Mikhaylova c0608e1650 Merge branch 'bx-1480-constructor' into dev 2024-09-25 12:41:29 +03:00
Kseninia Mikhaylova 2f47086a57 block position 2024-09-25 12:41:05 +03:00
ksenia_mikhailova 04b874e262 Merge pull request 'bx-1480-constructor' (#75) from bx-1480-constructor into dev
Deploy / build_and_push_images (push) Successful in 1m21s Details
Deploy / deploy_to_server_dev (push) Successful in 37s Details
Reviewed-on: #75
2024-09-25 08:36:54 +03:00
aarizona e870d5ee92 camera movve part 2024-09-24 21:11:24 +03:00
aarizona 1e14b9dc95 color picker ref 2024-09-24 20:54:32 +03:00
aarizona e458ba9f16 pattern 2024-09-24 18:52:28 +03:00
Kseninia Mikhaylova 195332d963 test slots 2024-09-24 16:58:15 +03:00
ksenia_mikhailova d0f42670ab Merge pull request 'pattern' (#74) from bx-1480-constructor into dev
Deploy / build_and_push_images (push) Successful in 1m23s Details
Deploy / deploy_to_server_dev (push) Successful in 56s Details
Reviewed-on: #74
2024-09-24 16:17:03 +03:00
Kseninia Mikhaylova 13b6be05e0 pattern 2024-09-24 16:16:38 +03:00
ksenia_mikhailova ed884abd49 Merge pull request 'bx-1480-constructor' (#73) from bx-1480-constructor into dev
Deploy / build_and_push_images (push) Successful in 1m31s Details
Deploy / deploy_to_server_dev (push) Successful in 2m9s Details
Reviewed-on: #73
2024-09-24 15:51:20 +03:00
Kseninia Mikhaylova e6c25b4be2 pattern 2024-09-24 15:50:45 +03:00
Kseninia Mikhaylova 127447eeaf color contrast 2024-09-24 13:36:54 +03:00
ksenia_mikhailova ebd7411541 Merge pull request 'filename' (#72) from bx-1480-constructor into dev
Deploy / build_and_push_images (push) Successful in 1m22s Details
Deploy / deploy_to_server_dev (push) Successful in 32s Details
Reviewed-on: #72
2024-09-24 13:07:59 +03:00
Kseninia Mikhaylova e17bf9d23b filename 2024-09-24 13:07:43 +03:00
ksenia_mikhailova 34b2aa0eaa Merge pull request 'remove async' (#71) from bx-1480-constructor into dev
Deploy / build_and_push_images (push) Successful in 1m21s Details
Deploy / deploy_to_server_dev (push) Successful in 31s Details
Reviewed-on: #71
2024-09-24 13:02:58 +03:00
Kseninia Mikhaylova 69add3ceab remove async 2024-09-24 13:02:19 +03:00
ksenia_mikhailova 787bbcd735 Merge pull request 'bx-1480-constructor' (#70) from bx-1480-constructor into dev
Deploy / build_and_push_images (push) Successful in 1m25s Details
Deploy / deploy_to_server_dev (push) Successful in 41s Details
Reviewed-on: #70
2024-09-24 12:15:10 +03:00
Kseninia Mikhaylova 152c64f686 disabled fix 2024-09-24 12:11:56 +03:00
Kseninia Mikhaylova 02549e1993 calc 2024-09-24 11:54:30 +03:00
ksenia_mikhailova be1009acf4 Merge pull request 'bx-1480-constructor' (#69) from bx-1480-constructor into dev
Deploy / build_and_push_images (push) Successful in 1m34s Details
Deploy / deploy_to_server_dev (push) Successful in 33s Details
Reviewed-on: #69
2024-09-24 10:43:51 +03:00
Kseninia Mikhaylova c53a9ddc45 css 2024-09-24 10:43:26 +03:00
Kseninia Mikhaylova d30ac35ce4 fence section distance 2024-09-24 09:53:09 +03:00
Kseninia Mikhaylova 21a4d71fe6 test css 2024-09-23 17:02:46 +03:00
ksenia_mikhailova d448b36d59 Merge pull request 'bx-1480-constructor' (#68) from bx-1480-constructor into dev
Deploy / build_and_push_images (push) Successful in 6m41s Details
Deploy / deploy_to_server_dev (push) Successful in 38s Details
Reviewed-on: #68
2024-09-23 14:19:30 +03:00
Kseninia Mikhaylova fff3d11818 one fence item 2024-09-23 14:17:06 +03:00
Kseninia Mikhaylova e81e0ad34c test pointer 2024-09-23 13:16:11 +03:00
Kseninia Mikhaylova 1461e178ca absolute 2024-09-23 09:30:45 +03:00
ksenia_mikhailova 280a2cc09a Merge pull request 'bx-1480-constructor' (#67) from bx-1480-constructor into dev
Deploy / build_and_push_images (push) Successful in 1m26s Details
Deploy / deploy_to_server_dev (push) Successful in 44s Details
Reviewed-on: #67
2024-09-20 16:55:17 +03:00
Kseninia Mikhaylova 2a90ac033d angle 2024-09-20 16:53:32 +03:00
Kseninia Mikhaylova 767bcb6c47 angle 2024-09-20 16:52:40 +03:00
Kseninia Mikhaylova f76f7ebf21 сторона забора 2024-09-20 16:29:20 +03:00
ksenia_mikhailova f74b0e3004 Merge pull request 'bx-1480-constructor' (#66) from bx-1480-constructor into dev
Deploy / build_and_push_images (push) Successful in 1m23s Details
Deploy / deploy_to_server_dev (push) Successful in 32s Details
Reviewed-on: #66
2024-09-20 15:45:30 +03:00
Kseninia Mikhaylova bc8af23bc8 fence square 2024-09-20 15:44:57 +03:00
Kseninia Mikhaylova a2ec1326bc test position 2024-09-19 17:28:08 +03:00
Kseninia Mikhaylova 9c0dca4946 fence lines 2024-09-19 16:26:18 +03:00
Kseninia Mikhaylova 6a25442c19 sides 2024-09-18 17:01:13 +03:00
Kseninia Mikhaylova 2ed3bea406 Merge branch 'bx-1480-constructor' of https://git.svs-tech.pro/mns/mns-mini-zabor into bx-1480-constructor 2024-09-18 16:29:51 +03:00
Kseninia Mikhaylova c6b97830fa Second light 2024-09-18 16:29:45 +03:00
ksenia_mikhailova c3fe88ff60 Merge pull request 'Merge pull request 'bx-1480-constructor' (#64) from bx-1480-constructor into dev' (#65) from dev into bx-1480-constructor
Reviewed-on: #65
2024-09-17 10:47:46 +03:00
ksenia_mikhailova 653f46ea51 Merge branch 'bx-1480-constructor' into dev
Deploy / build_and_push_images (push) Successful in 1m20s Details
Deploy / deploy_to_server_dev (push) Successful in 20s Details
2024-09-17 10:47:34 +03:00
Kseninia Mikhaylova f022fab129 pkg 2024-09-17 10:46:59 +03:00
ksenia_mikhailova 810d905e72 Merge pull request 'bx-1480-constructor' (#64) from bx-1480-constructor into dev
Deploy / build_and_push_images (push) Failing after 1m26s Details
Deploy / deploy_to_server_dev (push) Has been skipped Details
Reviewed-on: #64
2024-09-17 10:39:34 +03:00
Kseninia Mikhaylova cbe97f5d8a fence tile 2024-09-17 10:34:58 +03:00
Kseninia Mikhaylova 6661c17385 svg count 2024-09-16 12:59:08 +03:00
Kseninia Mikhaylova 350523e753 fence test 2024-09-16 11:05:52 +03:00