Commit Graph

1751 Commits

Author SHA1 Message Date
20e2e7a8c8 Sort on SortTabs ValueChanged 2017-03-14 20:19:41 -07:00
755fb260db Updated TabControl Usage 2017-03-14 19:52:21 -07:00
ee3d3b682f Updated usage for DropDownHeader of FilterTabControl 2017-03-14 19:49:40 -07:00
40bcc63a90 Added and styled FilterTabControls 2017-03-14 19:49:40 -07:00
2629f78afc Add FilterControl and FilterTabControl 2017-03-14 19:49:40 -07:00
e008574697 Merge branch 'master' into more-songselect 2017-03-15 11:24:14 +09:00
37ff1f3971 Control footer by virtual property. 2017-03-15 10:10:59 +08:00
b5a8ef07fe Update framework. 2017-03-15 09:46:03 +09:00
8c991eae01 Fix CI issues. 2017-03-14 22:27:24 +08:00
a8d15e616b Remove parameter of OnSelected. 2017-03-14 22:22:23 +08:00
b2dd9afcf3 Update editor workflow and make edit button works. 2017-03-14 22:18:40 +08:00
f068f7c4bd No footer in EditSongSelect. 2017-03-14 21:51:26 +08:00
259d39c6ad Stop playing the track in editor
to avoid unused member warning
2017-03-14 21:28:33 +08:00
f97e8ae97f Fix typo and warnings. 2017-03-14 21:20:38 +08:00
c939897a8a Revert "Auto assign hotkeys for BeatmapOptionsButton."
This reverts commit beb0a8ff03.
2017-03-14 21:13:57 +08:00
e1cc74bb40 Merge branch 'master' into more-songselect 2017-03-14 20:50:53 +08:00
beb0a8ff03 Auto assign hotkeys for BeatmapOptionsButton. 2017-03-14 20:50:43 +08:00
35a60a8f7d Use depth to arrange buttons. 2017-03-14 20:19:05 +08:00
618e8e822b Implement EditSongSelect and MatchSongSelect. 2017-03-14 19:53:20 +08:00
3871a350f8 Move BeatmapOptions buttons to derived class and simplify. 2017-03-14 19:38:21 +08:00
c4e5eac35b Move footer stuff to derived. 2017-03-14 18:38:06 +08:00
9a4247f67e Make Footer handles hotkey. 2017-03-14 18:16:04 +08:00
c3a0549cdd Move player specific stuff to derived PlaySongSelect. 2017-03-14 16:58:34 +08:00
fae6afa9e3 Create basic SongSelect class. 2017-03-14 16:44:35 +08:00
0198593697 Make BeatmapInfoWedge:OverlayContainer and unify transforms. 2017-03-14 16:29:20 +08:00
14b22445fa Merge remote-tracking branch 'upstream/master' into general-fixes
# Conflicts:
#	osu.Game/Modes/UI/HitRenderer.cs
2017-03-14 16:15:26 +09:00
1f68731a09 Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter). 2017-03-14 16:00:35 +09:00
db8cbba8d5 Okay resharper u da boss. 2017-03-14 12:52:12 +09:00
879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
6ebd88060a Simplify foreach. 2017-03-14 12:38:30 +09:00
bc5912eab5 Applyable -> Applicable. 2017-03-14 12:32:31 +09:00
0da950beac Fix KeyCounter M1 M2 display. 2017-03-14 12:31:09 +09:00
1eacafc7b4 Merge branch 'master' into general-fixes 2017-03-14 12:02:24 +09:00
4fa037c0b2 Update framework. 2017-03-14 12:01:58 +09:00
ba10c3a8db Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
2017-03-14 11:46:34 +09:00
e1bd168c16 Remaining GameMode -> Screen. 2017-03-14 07:22:46 +08:00
3913a0a9ee Fix removal of the last one beatmap. 2017-03-14 05:35:58 +08:00
14a22f032f Fix beatmap panel removal. 2017-03-14 04:35:43 +08:00
db104d04d3 Use AutoGenerateBindingRedirects instead of explicit app.config. 2017-03-14 03:20:33 +08:00
2756d5f09f Merge branch 'master' into mod_application 2017-03-13 23:00:11 +09:00
c51e97e8cc Merge pull request #471 from smoogipooo/beatmap_conversion
Beatmap conversion
2017-03-13 22:17:22 +09:00
b2981fb729 Merge branch 'master' into mod_application 2017-03-13 22:15:26 +09:00
842f938439 General fixes. 2017-03-13 21:05:34 +09:00
c84a9d56f5 Fix namespace, comply with naming rules 2017-03-13 11:36:21 +01:00
caa6e9c82b General improvements 2017-03-13 11:29:24 +01:00
971d8eb7c5 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-13 10:56:31 +01:00
35ddca78f5 Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter). 2017-03-13 14:50:55 +09:00
7d129ebd6d Attempt to fix things. 2017-03-12 22:38:50 +09:00
447cc17de8 Merge branch 'beatmap_conversion' into mod_application
Conflicts:
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Taiko/TaikoRuleset.cs
2017-03-12 22:20:52 +09:00
5be1839710 Remove unused method. 2017-03-12 22:19:35 +09:00