Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
44b52eb
Add Editor superclass
lukas-w Dec 7, 2014
c6ee614
Clean up ToolButton class
lukas-w Dec 7, 2014
02006f9
Use Editor superclass in AutomationEditor
lukas-w Dec 7, 2014
3e9cc61
SongEditor: Use Editor superclass
lukas-w Dec 7, 2014
86f2c86
Move play, record and stop signals to superclass
lukas-w Dec 7, 2014
d8db894
Editor: Don't delete on close
lukas-w Dec 8, 2014
ec9158c
PianoRoll: Use Editor superclass
lukas-w Dec 8, 2014
e9d841d
Migrate Timeline::addToolButtons to QToolBar
lukas-w Dec 8, 2014
4b27569
ToolBar css fixes
lukas-w Dec 8, 2014
d029c85
BBEditor: Use Editor superclass
lukas-w Dec 8, 2014
11898a5
Move Timeline.cpp to gui directory
lukas-w Dec 8, 2014
7a21d69
SongEditor: Some renames
lukas-w Dec 8, 2014
f131fbd
Editors: Add to workspace in MainWindow class, not in themselves
lukas-w Dec 8, 2014
32da8cb
Editor: Don't use ToolButton
lukas-w Dec 8, 2014
968e581
Editors: Don't use ToolButton
lukas-w Dec 8, 2014
b661e08
PianoRoll: Slot renames
lukas-w Dec 8, 2014
47cbc9e
AutomationEditor + PianoRoll: Move Copy/Paste shortcuts
lukas-w Dec 8, 2014
409e8f2
AutomationEditor style updates
lukas-w Dec 8, 2014
51f5929
Rename Timeline to TimeLineWidget
lukas-w Dec 8, 2014
b25765d
Move Editors to src/gui/editors subdirectory
lukas-w Dec 8, 2014
7c508f7
Merge master into ed_refac
lukas-w Dec 8, 2014
1d07a91
PianoRoll: Coding style updates
lukas-w Dec 11, 2014
ebbec2f
Editor: Add edit mode support
lukas-w Dec 11, 2014
9b6612c
PianoRoll rename fix
lukas-w Dec 11, 2014
02869b1
Editors: Some cleanups
lukas-w Dec 11, 2014
7877888
Introduce ActionGroup subclass
lukas-w Dec 11, 2014
11cb8b5
Automation Editor tension fix
lukas-w Dec 12, 2014
657fb06
More Automation refactoring
lukas-w Dec 17, 2014
eb79701
Merge branch 'master' into ed_refac
lukas-w Dec 17, 2014
1ee9340
Move Engine' GUI code to new GuiApplication class
lukas-w Dec 17, 2014
0df3998
Move some gui initialization to GuiApplication's constructor
lukas-w Jan 6, 2015
834be94
Merge commit 'f7741f184f83e6b9e2f081d39efffb2c499962f6' into ed_refac
lukas-w Jan 6, 2015
1706279
Merge commit '25ab7260f5cc57075360c976826e13434ade058c' into ed_refac
lukas-w Jan 6, 2015
0680669
Merge commit 'b5538c7da818cbcdde5ff1c885ce4eee5b626f3b' into ed_refac
lukas-w Jan 6, 2015
23e0e0f
Merge branch 'master' into ed_refac
lukas-w Jan 6, 2015
0c4833c
Adjust automation editor flip implementation
lukas-w Jan 6, 2015
748cccd
Merge branch 'gui_application' into ed_refac
lukas-w Jan 6, 2015
e0dbfa6
Remove Engine's has_gui option
lukas-w Jan 6, 2015
7f2f9f2
Merge branch 'master' into ed_refac
lukas-w Jan 8, 2015
23dbe95
Stop on second space key press
lukas-w Jan 11, 2015
56055b3
Merge branch 'master' into ed_refac
lukas-w Jan 11, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into ed_refac
  • Loading branch information
lukas-w committed Dec 17, 2014
commit eb79701accfc9aefe18f915b51fd7f071bcb6c88

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.