Commit Graph

444 Commits

Author SHA1 Message Date
Kira Dmitrieva
faafee7d32
Merge branch 'dev' into dev 2021-08-20 16:17:10 +03:00
Kira Dmitrieva
d96def0dc9
Merge pull request #14 from kiruma524/tutorial
Documantation of hierarchy, raw version №1
2021-08-20 16:14:51 +03:00
kiruma524
8babcd7f88 Documentation vol.3 2021-08-20 16:12:04 +03:00
kiruma524
fcf5ab17ca Documentation vol.2 2021-08-20 15:52:32 +03:00
kiruma524
f6a78c5a31 Documentation 2021-08-20 15:43:12 +03:00
Alexander Nozik
f00408166b
Rename inheritance to inheritance.md 2021-08-18 15:58:38 +03:00
kiruma524
1979b66e84
Merge pull request #13 from kiruma524/tutorial
Changed Vision.puml
2021-08-18 12:37:08 +03:00
kiruma524
fc8db7886e Merge remote-tracking branch 'origin/tutorial' into tutorial 2021-08-18 12:35:55 +03:00
9afe5da45b Fix webpack server bug and adjust demo styles. 2021-08-18 11:39:37 +03:00
bb61b97c1d Adjust demo 2021-08-17 21:57:09 +03:00
kiruma524
86ab88cde0 changed hierarchy.md 2021-08-17 20:24:05 +03:00
kiruma524
ad3fdeab28 changed hierarchy.md 2021-08-17 20:23:31 +03:00
kiruma524
89f24fbe12
Merge pull request #12 from kiruma524/tutorial
Updated Vision.puml
2021-08-17 19:25:35 +03:00
kiruma524
efec462d98
Merge branch 'dev' into tutorial 2021-08-17 19:09:37 +03:00
kiruma524
becae94d3e Updated Vision.puml ver.2 2021-08-17 19:07:28 +03:00
kiruma524
ff9e2a0c9f Updated Vision.puml 2021-08-17 18:52:32 +03:00
cbc67cb16b fix styles and remove bootstrap dependencies 2021-08-17 15:26:31 +03:00
238a9e0dd1 Fix color chooser order of update 2021-08-17 10:53:36 +03:00
Alexander Nozik
f602e21b23
Merge pull request #60 from kiruma524/dev
New images, raw version of inheritance.md, hierarchy.md, and Vision.puml
2021-08-17 09:30:09 +03:00
kiruma524
350d7c6634
Merge branch 'dev' into dev 2021-08-17 00:02:36 +03:00
kiruma524
67a2d3c241
Merge pull request #11 from kiruma524/tutorial
New images, raw versions of inheritance and hierarchy docs, raw version of new Vision.puml file
2021-08-16 23:57:05 +03:00
kiruma524
0c71101858 hierarchy comments 2021-08-16 23:50:11 +03:00
kiruma524
c70d4d2da6 Supplemented inheritance doc 2021-08-16 23:48:22 +03:00
kiruma524
d361d42c29 Added one more image, supplemented inheritance doc 2021-08-16 23:33:32 +03:00
kiruma524
7b99ec54d2 images, inheritance doc 2021-08-16 22:11:00 +03:00
kiruma524
68495c0cdf Duplicated in scheme hierarchy 2021-08-16 13:21:00 +03:00
8a8bac48db Update examples 2021-08-15 20:04:21 +03:00
95459422d6 Fixes and bouncing ball demo. 2021-08-15 18:45:36 +03:00
af327c17e3 Fixes and bouncing ball demo. 2021-08-15 18:15:17 +03:00
f99a359e24 Fix color resolution 2021-08-14 21:31:36 +03:00
a33d9d1946 fix for Plotly vision serialization 2021-08-14 15:54:16 +03:00
60cec91ab8 Update js examples 2021-08-14 14:17:54 +03:00
d916dde6a7 Update to DataForge and plotly release versions 2021-08-13 22:14:43 +03:00
c44162671f Replace structure changes listener by callback. Fix review issues 2021-08-13 20:40:28 +03:00
c425f3b36f Merge branch 'dev' into feature/df-new
# Conflicts:
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooserBase.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisionTreeFragment.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectEditorFragment.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt
2021-08-11 20:33:19 +03:00
1505aa8091 Merge remote-tracking branch 'origin/dev' into feature/df-new
# Conflicts:
#	visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/Extruded.kt
2021-08-11 18:34:49 +03:00
c410baac8c Merge branch 'dev' into feature/df-new
# Conflicts:
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooserBase.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisionTreeFragment.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectEditorFragment.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt
2021-08-11 18:24:35 +03:00
e38bac8d23 Fix MM model 2021-08-11 18:17:47 +03:00
kiruma524
25e46a6c47 Really Raw version of hierarchy documentation. 2021-08-11 17:55:15 +03:00
5721bb9456 A lot of fixes 2021-08-11 16:52:36 +03:00
kiruma524
a027e71c48
Merge pull request #10 from kiruma524/tutorial
Raw version hierarchy documentation
2021-08-10 13:23:57 +03:00
kiruma524
004cdc049b Really Raw version of hierarchy documentation. 2021-08-10 13:21:35 +03:00
7b78052f61 A lot of changes 2021-08-08 22:17:50 +03:00
8d21d3cd74 Adjust property editors 2021-08-07 11:27:57 +03:00
kiruma524
052336700a spaces 2021-08-06 17:17:17 +03:00
kiruma524
2a9e5c4078
Merge pull request #9 from kiruma524/dev
Dev
2021-08-06 17:10:43 +03:00
kiruma524
0e3c3cf2ce
Merge branch 'tutorial' into dev 2021-08-06 17:10:30 +03:00
kiruma524
60da696785 dashes 2021-08-06 17:03:47 +03:00
Alexander Nozik
5b2da86838
Merge pull request #57 from kiruma524/dev
Tutorial and changed names
2021-08-06 13:40:08 +03:00
kiruma524
92474b0334
Merge pull request #8 from kiruma524/tutorial
demo renamings
2021-08-06 13:05:04 +03:00