hpi-swa-teaching / SketchMorph2

86%

dev: 86%

LAST BUILD ON BRANCH 111-contour-text-while-using-text-tool

branch: 111-contour-text-while-using-text-tool

CHANGE BRANCH

x

Reset

Sync Branches

• 111-contour-text-while-using-text-tool
• 101-change-handle-color
• 101-restore-tests
• 101-to-move-and-rotate-shapes
• 102-add-non-rectangular-selection-tool
• 103-retain-highlight-of-selection-after-mouse-up
• 105-fix-insert-preview
• 106-extend-circle-tool
• 107-adjust-layer-edit-panel
• 107-cleanup-viewport
• 107-fix-eraser-size
• 107-ui-layer-system
• 109-handle-selection-area-transparency
• 112-add-triangle-drawing-tool
• 113-add-abiltity-to-change-text-color-while-editing
• 116-shortcut-for-triangle-drawing-tool
• 119-add-ability-to-mirror-selected-shapes
• 123-fix-flip-undo
• 123-fix-geometric-morph-offset
• 123-fix-offset-tests
• 123-fix-viewport-canvas-desync
• 123-linter-pleasing
• 123-merge
• 123-more-class-comments
• 123-packages
• 123-refactor-draw-to-drag
• 123-refactor-tools
• 123-refactor-tools-texttool
• 123-refactor-tools_actions
• 123-refactor-tools_actions2
• 123-refactor-tools_actions3
• 123-refactor-tools_class-comments_core
• 123-refactor-tools_class-comments_tools
• 123-rename-drawing-classes
• 123-rename-menu-items
• 123-rework-userAction-lifecycle
• 123-work-on-tests
• 123-work-on-tests-merge
• 30-brush-size
• 33-copy-paste
• 35-text-tool
• 37-zoom
• 50-readme-mtf
• 55-tool-preview
• 56-hint-saving-colors
• 57-canvas-anchor
• 58-pipette-tool
• 69-test-undo
• 70-moving-text
• 71-jpg-import
• 71-jpg-import.b.b
• 74-ctrl-v-text
• 8-apps-integration
• 81-shortcuts
• 92-brushSize-indicator
• Layer-System-Part-2
• adhere-coding-standards
• auto-refactor
• brush-size-undo
• correct-badge
• coverage
• coverage-runner-fix-1
• coverage-runner-fix-2
• current-alpha
• dev
• external-linter
• feature/30-brush-size
• feature/35-text-tool
• feature/coverage
• fix/correct-badge
• fix/tool-reset-undo
• master
• no-windows-ci
• sprint-2022-cw-19-20
• sprint-2022-cw-20-22
• tool-reset-undo
• try-fix-ci-bytesymbol

fix conflicts