Code

Merge Dev into Master#100

Code

Open

ninaanre wants to merge 124 commits intomasterhpi-swa-teaching/AnimationsEditor:masterfrom devhpi-swa-teaching/AnimationsEditor:devCopy head branch name to clipboard

+1,921-850

Commits

Commits on May 25, 2022

• Added Class MovingLine (still in progress)

  saragrau

  committed
  edfd3b2

Commits on May 27, 2022

• First Failing Test

  Ol-Ba

  committed
  63ee3e9

Commits on May 29, 2022

• Two working tests, one almost working

  Ol-Ba

  committed
  c440e42

Commits on May 30, 2022

• length of end frame to last keyframe automatically

  

  lka

  committed
  a4cedb5

Commits on Jun 5, 2022

• duration implementation

  ninaanre

  committed
  0a1a6c0

Commits on Jun 8, 2022

• Add time line labels with frame number (in ms)

  judoka2015

  committed
  f6f10bf

Commits on Jun 9, 2022

• Timeline length is now dependend on the duration of the animation

  

  Noel Bastubee

  committed
  a20d07e

• Moving line deleted after the end of the animation

  Ol-Ba

  committed
  6d6e067

• Partial refactoring

  Ol-Ba

  committed
  883f315

Commits on Jun 13, 2022

• Duration not visible on start

  ninaanre

  committed
  d33926e

• all tests green

  Ol-Ba

  committed
  0ce9f55

• green test check

  Ol-Ba

  committed
  fd1e5fe

• Fixed the tests for this version

  

  Noel Bastubbe

  committed
  c9ea600

• Added tests for the scaling timeline size

  

  Noel Bastubbe

  committed
  e03f814

Commits on Jun 14, 2022

• Merge branch 'timelinemarks' of origin into dev

  

  Noel Bastubbe

  committed
  c14dddd

• Resolved merge conflicts from merge of 'timelinemarks' of origin into dev

  

  Noel Bastubbe

  committed
  a18a692

• Fixed unwanted removal of the Start-End-Display

  

  Noel Bastubbe

  committed
  fb6b047

• duration w-o tests ready

  ninaanre

  committed
  ba41478

• Merge branch 'dev' into duration

  Noel-Bastubbe

  authored
  cc29716

• Merge pull request #65 from hpi-swa-teaching/duration

  Show description for 399982e
  Noel-Bastubbe

  authored
  399982e

• Merge branch 'dev' into movingLine

  Noel-Bastubbe

  authored
  2b94c59

• Merge pull request #66 from hpi-swa-teaching/movingLine

  Show description for 944f69c
  Noel-Bastubbe

  authored
  944f69c

Commits on Jun 20, 2022

• button activate property, track are commented out

  Ol-Ba

  committed
  1257f84

Commits on Jun 21, 2022

• Buttons for activating/deactivating properties

  Ol-Ba

  committed
  708890d

Commits on Jun 22, 2022

• Removed the Start- and Endtime-Display from the tree and changed the tests accordingly.

  

  Noel Bastubbe

  committed
  0bc0597

• Recategorizing methods, deleting dead methods and adding dots at the end of methods.

  

  Noel Bastubbe

  committed
  1352026

• implemented clickable Keyframes that show right property

  saragrau

  committed
  c27cef9

Commits on Jun 25, 2022

• clickable Keyframes show now right values and frames

  saragrau

  committed
  2b1d30b

Commits on Jun 26, 2022

• (De)Activated Tracks per Morph

  ninaanre

  committed
  d519915

• Keyframe only added on activated track.

  ninaanre

  committed
  bea5530

• Delete Keyframes when deactivated Track (draft)

  ninaanre

  committed
  5e5a5d6

• keyframes deleted when property deactivated finished

  Ol-Ba

  committed
  dee94bb

• Refactoring and fixed collection bug

  Ol-Ba

  committed
  f2cb51e

• Merge branch 'feature/spuren' into refactoring/duration

  Ol-Ba

  authored
  a0bf4b5

• Merge pull request #67 from hpi-swa-teaching/refactoring/duration

  Show description for 657bb1d
  Ol-Ba

  authored
  657bb1d

• all tests green

  Ol-Ba

  committed
  9fb2a59

Commits on Jun 27, 2022

• Adding a test for the duration display.

  

  Noel Bastubbe

  committed
  28318d5

• works with two Morphs

  saragrau

  committed
  6a9144f

• Merge pull request #68 from hpi-swa-teaching/refactoring/duration

  Show description for e108647
  lorenzkautzsch

  authored
  e108647

• Merge branch 'dev' into feature/spuren

  lorenzkautzsch

  authored
  156c8da

• Merge branch 'devv' into feature/functioningClicableKeyframes

  Ol-Ba

  authored
  fc36447

• Merge pull request #75 from hpi-swa-teaching/feature/functioningClicableKeyframes

  Show description for e26088f
  Ol-Ba

  authored
  e26088f

Commits on Jul 1, 2022

• addedTest1(unfinished)

  

  lka

  committed
  2498fdc

• Merge branch 'deleteMorphButton' of https://github.com/hpi-swa-teaching/AnimationsEditor into localmaster

  

  lka

  committed
  d97f617

Commits on Jul 4, 2022

• refactored the MovingLine class.

  

  Noel Bastubbe

  committed
  6894ec2

• tests for toggling activation of properties

  Ol-Ba

  committed
  a8260c9

Commits on Jul 11, 2022

• clickableMorphtest+ Button(unfinished)

  

  lka

  committed
  031f935

• clickableKeyframe test und deletemorphbutton both unfinished yet

  

  lka

  committed
  ca627fb

Commits on Jul 12, 2022

• refactored the tests for MovingLine class so that they are according to the new implementation

  

  Noel Bastubbe

  committed
  2b4dfd2

• delete button removes morph from the world and tree spec morph from the editor

  Ol-Ba

  committed
  2ab4ef0

• Merge pull request #77 from hpi-swa-teaching/refactoring/testsAndNullObject

  Show description for fbd0300
  Noel-Bastubbe

  authored
  fbd0300

• delete timeline and activete buttons when the morph is deleted (needs refactoring)

  Ol-Ba

  committed
  4efe708

• update with to do comments

  Ol-Ba

  committed
  761549e

Commits on Jul 13, 2022

• delete morph from the world sync

  Ol-Ba

  committed
  6cc9ebd

Commits on Jul 16, 2022

• deactivated synchronization Delete Morph from World. Small refactoring.

  ninaanre

  committed
  78608e5

Commits on Jul 18, 2022

• initial duration

  ninaanre

  committed
  7dacb7c

• Keyframe hover effect

  ninaanre

  committed
  86ca3f8

• Merge branch 'feature/ButtonDelete' into refactoring/testsAndNullObject

  Ol-Ba

  authored
  4ed66a7

• Merge pull request #81 from hpi-swa-teaching/refactoring/testsAndNullObject

  Show description for fbe55e1
  Ol-Ba

  authored
  fbe55e1

• movingLine tests require reworking

  ninaanre

  committed
  1cc38d5

• Merge branch 'testing/activateProperty' into feature/ButtonDelete

  Ol-Ba

  authored
  d5bf5db

• Merge pull request #83 from hpi-swa-teaching/feature/ButtonDelete

  Show description for 5a52d8a
  Ol-Ba

  authored
  5a52d8a

• Activated delete morph from world sync. Test duration

  ninaanre

  committed
  a377c51

Commits on Jul 20, 2022

• Merge pull request #85 from hpi-swa-teaching/feature/ButtonDelete

  Show description for 4455c89
  Noel-Bastubbe

  authored
  4455c89

Commits on Jul 21, 2022

• Messages added for button events when there is no morph exisiting or selected

  

  lka

  committed
  d81eccb

Commits on Jul 30, 2022

• Property stepping changed from process to stepping

  Ol-Ba

  committed
  8923e97

• MassagesButtons

  

  lka

  committed
  2bdf6ed

• Test Morph Closed In World deletes Morph in Editor.

  ninaanre

  committed
  3b5ab1a

• Merge branch 'feature/DeleteMorphFromWorld' into refactoring/catchNoMorphError

  Ol-Ba

  authored
  914425e

• Merge pull request #86 from hpi-swa-teaching/refactoring/catchNoMorphError

  Show description for 8604864
  Ol-Ba

  authored
  8604864

• Fixed null check in test, used capital letters in messages

  Ol-Ba

  committed
  2ed11a2

• Test Button deletes morph from the tree spec

  Ol-Ba

  committed
  9963bff

• Refactored animations editor tests, new test morph stays in world when delete button pressed

  Ol-Ba

  committed
  f4f8ed5

• refactored zero duration test

  Ol-Ba

  committed
  e67fbcf

• Merge pull request #87 from hpi-swa-teaching/testing/activateProperty

  Show description for 134d955
  Ol-Ba

  authored
  134d955

• property activation tests

  Ol-Ba

  committed
  e3c492d

• Merge pull request #88 from hpi-swa-teaching/feature/DeleteMorphFromWorld

  Show description for 2a7ce97
  Ol-Ba

  authored
  2a7ce97

Commits on Jul 31, 2022

• Update README.md

  lorenzkautzsch

  authored
  ba78c67

• Merge pull request #90 from hpi-swa-teaching/lorenzkautzsch-patch-2

  Show description for 75c7280
  lorenzkautzsch

  authored
  75c7280

• wrote tests for clickable frames and refactored partially feature clickable frames

  saragrau

  committed
  8ca512c

Commits on Aug 1, 2022

• Fixed the following tests: testMovingLineStoppedAtEndMargin, testMovingLineInRightPosition, testHeightOfTimeline.

  Show description for 43b00a8
  

  Noel Bastubbe

  committed
  43b00a8

• Fixed the test: testMovingLineInRightPosition for CI

  

  Noel Bastubbe

  committed
  160bcf1

• Merge pull request #91 from hpi-swa-teaching/refactoring/MovingLineTests

  Show description for 9449f78
  Noel-Bastubbe

  authored
  9449f78

• Fix end time upon deletion of morphs in the editor

  luap42

  committed
  785736c

• Use always-incrementing morph number that is kept on delete.

  luap42

  committed
  38bd573

Commits on Aug 2, 2022

• tests for module Keyframes are complete

  saragrau

  committed
  867461d

• deleted redundant assertions

  saragrau

  committed
  4eb59d5

• Add test ensuring time consistency

  luap42

  committed
  ec7aee0

• Add test ensuring time consistency

  Show description for 955b1de
  luap42

  committed
  955b1de

• Remove accidental commit to dev

  luap42

  committed
  d7f3aa4

• Merge branch 'dev' into testing/clickableKeyframes

  saragrau

  authored
  8748e58

• Merge pull request #93 from hpi-swa-teaching/testing/clickableKeyframes

  Show description for 41f8de0
  saragrau

  authored
  41f8de0

• every wrong input for playAnimations is now covered

  

  Noel Bastubbe

  committed
  5ac81d0

• Merge pull request #95 from hpi-swa-teaching/refactoring/MovingLineTests

  Show description for 782a85c
  Noel-Bastubbe

  authored
  782a85c

• Merge pull request #92 from hpi-swa-teaching/ps/deleting-functions

  Show description for 9bc6d1b
  Noel-Bastubbe

  authored
  9bc6d1b

• Update README.md

  lorenzkautzsch

  authored
  21d2dca

• Update README.md

  lorenzkautzsch

  authored
  a23c7c0

• Update README.md

  lorenzkautzsch

  authored
  45f3fbe

• Update README.md

  lorenzkautzsch

  authored
  95b39ac

• Update README.md

  lorenzkautzsch

  authored
  e6df66d

• Update README.md

  lorenzkautzsch

  authored
  3cd8ae7

• Update README.md

  lorenzkautzsch

  authored
  319dec7

• Update README.md

  lorenzkautzsch

  authored
  c7c78ad

• Update README.md

  lorenzkautzsch

  authored
  d61720a

Commits on Aug 3, 2022

• Update README.md

  lorenzkautzsch

  authored
  c69ab7e

• Update README.md

  lorenzkautzsch

  authored
  61a71ad

• morph clean up after test

  Ol-Ba

  committed
  7492290

• Update README.md

  lorenzkautzsch

  authored
  dec03d3

• Update README.md

  lorenzkautzsch

  authored
  8f60302

• Update README.md

  lorenzkautzsch

  authored
  52bd2a2

• Update README.md

  lorenzkautzsch

  authored
  313e756

• Update README.md

  lorenzkautzsch

  authored
  fbbbf83

• Update README.md

  lorenzkautzsch

  authored
  1bcf767

• Update README.md

  lorenzkautzsch

  authored
  9a5abfe

• Update README.md

  lorenzkautzsch

  authored
  840f3c0

• applied coding conventions and refactoring

  NinaMohnke

  committed
  7cda750

• refactoring

  NinaMohnke

  committed
  48bda93

Commits on Aug 5, 2022

• fixed duration update, delete morph button break

  Ol-Ba

  committed
  1368870

• animations editor tests refactoring

  Ol-Ba

  committed
  3d87d0a

• timeline not initialized when no keyframe added

  Ol-Ba

  committed
  ab0519f

• fixed animation played till the last keyframe

  Ol-Ba

  committed
  4700ad6

• reverted animation played till last keyframe

  Ol-Ba

  committed
  ea62112

• Merge branch 'dev' into refactoring2

  Ol-Ba

  authored
  b6a8eb0

• Merge pull request #99 from hpi-swa-teaching/refactoring2

  Show description for 02497cc
  Ol-Ba

  authored
  02497cc