-
- Downloads
Merge branch 'paging' into dev-6-0
Conflicts: PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties PlayWall/src/application.yml PlayWall/src/de/tobias/playpad/PlayPadImpl.java PlayWall/src/de/tobias/playpad/PlayPadMain.java PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java PlayWall/src/de/tobias/playpad/viewcontroller/cell/ProjectCell.java PlayWall/src/de/tobias/playpad/viewcontroller/cell/errordialog/FixCell.java PlayWall/src/de/tobias/playpad/viewcontroller/dialog/NewProjectDialog.java PlayWall/src/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java PlayWall/src/de/tobias/playpad/viewcontroller/option/global/KeysTabViewController.java PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/AudioTabViewController.java PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/DesignTabViewController.java PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/MidiTabViewController.java PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/PlayerTabViewController.java PlayWall/src/de/tobias/playpad/viewcontroller/option/project/GeneralTabViewController.java PlayWall/src/de/tobias/playpad/viewcontroller/pad/PadDragListener.java PlayWallCore/src/de/tobias/playpad/action/Mapping.java PlayWallCore/src/de/tobias/playpad/design/GlobalDesign.java PlayWallCore/src/de/tobias/playpad/pad/Pad.java PlayWallCore/src/de/tobias/playpad/project/Project.java PlayWallCore/src/de/tobias/playpad/project/ProjectReference.java PlayWallCore/src/de/tobias/playpad/project/ProjectReferenceList.java PlayWallCore/src/de/tobias/playpad/project/ProjectReferenceSerializer.java PlayWallCore/src/de/tobias/playpad/viewcontroller/option/GlobalSettingsTabViewController.java PlayWallCore/src/de/tobias/playpad/viewcontroller/option/ProfileSettingsTabViewController.java PlayWallCore/src/de/tobias/playpad/viewcontroller/option/ProjectSettingsTabViewController.java PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java
No related branches found
No related tags found
Showing
- PlayWall/assets/de/tobias/playpad/assets/lang/_de.properties 1 addition, 1 deletionPlayWall/assets/de/tobias/playpad/assets/lang/_de.properties
- PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties 2 additions, 0 deletions...all/assets/de/tobias/playpad/assets/lang/ui_de.properties
- PlayWall/assets/de/tobias/playpad/assets/view/option/pad/trigger/cartTrigger.fxml 7 additions, 1 deletion...s/playpad/assets/view/option/pad/trigger/cartTrigger.fxml
- PlayWall/src/application.yml 3 additions, 3 deletionsPlayWall/src/application.yml
- PlayWall/src/de/tobias/playpad/PlayPadImpl.java 1 addition, 0 deletionsPlayWall/src/de/tobias/playpad/PlayPadImpl.java
- PlayWall/src/de/tobias/playpad/PlayPadMain.java 1 addition, 1 deletionPlayWall/src/de/tobias/playpad/PlayPadMain.java
- PlayWall/src/de/tobias/playpad/action/cartaction/CartAction.java 1 addition, 3 deletions...l/src/de/tobias/playpad/action/cartaction/CartAction.java
- PlayWall/src/de/tobias/playpad/audio/JavaFXAudioHandler.java 1 addition, 1 deletionPlayWall/src/de/tobias/playpad/audio/JavaFXAudioHandler.java
- PlayWall/src/de/tobias/playpad/audio/TinyAudioHandler.java 1 addition, 1 deletionPlayWall/src/de/tobias/playpad/audio/TinyAudioHandler.java
- PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java 1 addition, 1 deletion...de/tobias/playpad/design/classic/ClassicGlobalDesign.java
- PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java 1 addition, 1 deletion...c/de/tobias/playpad/design/modern/ModernGlobalDesign.java
- PlayWall/src/de/tobias/playpad/layout/desktop/DesktopButtonEditView.java 103 additions, 0 deletions.../tobias/playpad/layout/desktop/DesktopButtonEditView.java
- PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java 32 additions, 24 deletions...ypad/layout/desktop/DesktopMenuToolbarViewController.java
- PlayWall/src/de/tobias/playpad/layout/desktop/DesktopSearchController.java 23 additions, 30 deletions...obias/playpad/layout/desktop/DesktopSearchController.java
- PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java 0 additions, 1 deletion...Wall/src/de/tobias/playpad/layout/touch/TouchPadView.java
- PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java 1 addition, 2 deletionsPlayWall/src/de/tobias/playpad/pad/content/AudioContent.java
- PlayWall/src/de/tobias/playpad/pad/drag/MoveDragMode.java 2 additions, 1 deletionPlayWall/src/de/tobias/playpad/pad/drag/MoveDragMode.java
- PlayWall/src/de/tobias/playpad/pad/drag/ReplaceDragMode.java 3 additions, 2 deletionsPlayWall/src/de/tobias/playpad/pad/drag/ReplaceDragMode.java
- PlayWall/src/de/tobias/playpad/trigger/CartTriggerItem.java 20 additions, 68 deletionsPlayWall/src/de/tobias/playpad/trigger/CartTriggerItem.java
- PlayWall/src/de/tobias/playpad/trigger/VolumeTriggerItem.java 1 addition, 1 deletion...Wall/src/de/tobias/playpad/trigger/VolumeTriggerItem.java
Loading
Please register or sign in to comment