Commit Graph

424 Commits

Author SHA1 Message Date
099b309645 Introduce back the concept of Rulesets. 2016-11-12 18:26:21 +09:00
8d56a881d0 Merge pull request #157 from SirCmpwn/string-options
Add TextBoxOption and wire it up
2016-11-12 16:11:09 +09:00
00cc4278da Split off SidebarButton 2016-11-12 01:53:20 -05:00
a81f099d40 Add TextBoxOption and wire it up 2016-11-10 18:17:15 -05:00
788c11de10 Merge pull request #103 from huoyaoyuan/music-controller
Music controller
2016-11-10 12:54:56 +09:00
8c68f9ba93 OptionsSideNav -> OptionsSidebar. 2016-11-08 19:17:09 +09:00
1bca78f4b6 Wire up one of the settings to the config
One step at a time, right
2016-11-07 22:36:24 -05:00
4d04eb6fb1 Rearrange some options a bit, update framework 2016-11-07 22:15:48 -05:00
1ce6a7285a Rearrange options namespaces 2016-11-07 21:24:41 -05:00
e6c3fc1091 Implement scrolling to each section 2016-11-07 17:07:55 -05:00
c470140d64 Merge branch 'master' 2016-11-06 00:11:30 +08:00
2d86cb1e81 Merge branch 'master' 2016-11-05 16:21:59 +08:00
b40ccccbe4 Add HitObject colours back in the mix. 2016-11-04 15:43:53 +09:00
cb40b7079f Rework how references are passed about 2016-11-03 22:43:00 -04:00
af8e4415c3 Split out [Sub]sections into seperate files 2016-11-03 19:06:22 -04:00
1d8c6db0a7 Add remaining options 2016-11-03 19:06:22 -04:00
c7fa0a5ab0 Add more options 2016-11-03 19:06:22 -04:00
7e77efcfdc Add Graphics options 2016-11-03 19:06:22 -04:00
6c0cef894e Add OsuButton with sane defaults 2016-11-03 19:06:22 -04:00
2aa85a4b18 Split up options into subclasses 2016-11-03 19:06:22 -04:00
7e2350cb13 Merge remote-tracking branch 'refs/remotes/peppy/lets-play' 2016-10-28 19:07:29 +08:00
0e39c5cc9c Move Results to own namespace. 2016-10-28 16:10:10 +09:00
feccb7286c Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect. 2016-10-28 14:14:45 +09:00
d9dfc324c1 Rewrite a lot of Song Select to share logic between panels and consolidate logic inside classes where possible. 2016-10-27 19:52:48 +09:00
35b1d0ae50 Seperated DragBar class. 2016-10-27 18:14:50 +08:00
e1f6ab1a42 Create MusicController UI class and visual test. 2016-10-27 13:34:43 +08:00
debea59bab Merge pull request #61 from SirCmpwn/song-select
Song select
2016-10-27 13:54:34 +09:00
f846505a92 Tidy namespaces. 2016-10-27 12:01:13 +09:00
104cedba19 Merge pull request #109 from peppy/volume-control-input-fix
Fix volume control input handling.
2016-10-27 11:45:09 +09:00
55e5ec6fae General cleanup per PR feedback 2016-10-26 10:52:40 -04:00
157512b45f Merge branch 'master' into song-select 2016-10-26 10:37:18 -04:00
3f23900347 Framework & OpenTK updates. 2016-10-26 23:13:44 +09:00
ee8b678989 Fix volume controls handling mouse wheel at a higher level than anything else game-wide. 2016-10-26 18:45:48 +09:00
d3a857edb9 Make importing work properly.
Moves import code to BeatmapDatabase.
2016-10-24 11:39:53 -04:00
bc959f74a5 Add background textures to beatmap sets
Needs osu-framework#189
2016-10-24 11:39:18 -04:00
bc6e705e2b Add test case for song selection 2016-10-24 11:39:18 -04:00
1ce16afa23 Update nuget package versions. 2016-10-24 22:46:44 +09:00
43f0409893 Start to structure flow of information in Player.
- Allow basic clicking of hitobjects.
- Break non-osu! game modes temporarily.
- Fix some issues with RollingCounters.
- Add the ability to increment counters.
2016-10-19 19:44:03 +09:00
ee463dc65c Merge pull request #77 from NeoAdonis/counters-a
Rolling counters
2016-10-19 15:06:00 +09:00
7bdf1fe1bf Drop BeatmapSet, only BeatmapSetInfo is necessary 2016-10-18 15:48:24 -04:00
8ca4a2067e $(SolutionDir) 2016-10-18 13:58:24 -04:00
449f04c07b Refactor the database code 2016-10-18 13:38:27 -04:00
5abc3ba898 Merge remote-tracking branch 'upstream/master' into counters-a 2016-10-17 20:36:04 -05:00
f4c381f745 Use OverlayContainer in framework. 2016-10-16 17:14:17 +08:00
0ceb72ba42 More refactoring 2016-10-15 15:16:02 -05:00
9241287c79 Merge branch 'master' into counters-a 2016-10-15 13:45:55 -05:00
6bd3eaf37d Changes according to review + Refactor 2016-10-14 18:23:27 -05:00
c3b745bfef Merge pull request #57 from UselessToucan/VolumeControl
VolumeControl: add controls for Effects and Music
2016-10-14 15:50:45 +09:00
53cd698b3a Merge branch 'master' into counters-a 2016-10-13 22:57:24 -05:00
f10a03dcef Merge with master 2016-10-13 17:20:35 -05:00