Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

PlayWallDesktop
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

0163e8b3

Commit 0163e8b3 authored Nov 30, 2020 by Tobias Ullerich

Downloads
- Plain Diff

Merge branch 'develop' into feature/led

parents 84107cab 4bcd5a30

No related branches found

No related tags found

Loading

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

PlayWall/src/main/java/de/tobias/playpad/pad/content/AudioContent.java 5 additions, 5 deletions

...main/java/de/tobias/playpad/pad/content/AudioContent.java
PlayWall/src/main/java/de/tobias/playpad/view/FileDragOptionView.java 1 addition, 1 deletion

.../main/java/de/tobias/playpad/view/FileDragOptionView.java
PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/AbstractFadeController.java 6 additions, 26 deletions

...va/de/tobias/playpad/pad/fade/AbstractFadeController.java
PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/FadeControllerDelegate.java 1 addition, 1 deletion

...va/de/tobias/playpad/pad/fade/FadeControllerDelegate.java
PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/LogarithmicFadeController.java 40 additions, 0 deletions

...de/tobias/playpad/pad/fade/LogarithmicFadeController.java
PlayWallCore/src/main/java/de/tobias/playpad/project/page/Page.java 12 additions, 4 deletions

...re/src/main/java/de/tobias/playpad/project/page/Page.java
PlayWallPlugins/PlayWallPluginWebAPI/src/main/resources/plugin/webapi/lang/base_de.properties 1 addition, 1 deletion

.../src/main/resources/plugin/webapi/lang/base_de.properties

with 66 additions and 38 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment