RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
868 Commits 3 Branches 650 Tags 350 MiB
Commit Graph

130 Commits

Author SHA1 Message Date
Dean Herbert d3f810f72f Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading). 2016-11-14 22:03:39 +09:00
Dean Herbert 5dd4e31011 Move DrawableHitObject. 2016-11-14 19:49:29 +09:00
Dean Herbert 4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +09:00
Dean Herbert 06f4f93918 Move play modes to Modes namespace. 2016-11-14 18:03:20 +09:00
Dean Herbert 0f4538f69f Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
Dean Herbert 75be78752b Merge remote-tracking branch 'refs/remotes/upstream/master' into options-sidebar-tracking 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2016-11-12 22:30:15 +09:00
Dean Herbert 099b309645 Introduce back the concept of Rulesets. 2016-11-12 18:26:21 +09:00
Dean Herbert 8d56a881d0 Merge pull request #157 from SirCmpwn/string-options 
Add TextBoxOption and wire it up
 2016-11-12 16:11:09 +09:00
Drew DeVault 00cc4278da Split off SidebarButton 2016-11-12 01:53:20 -05:00
Drew DeVault a81f099d40 Add TextBoxOption and wire it up 2016-11-10 18:17:15 -05:00
Dean Herbert 788c11de10 Merge pull request #103 from huoyaoyuan/music-controller 
Music controller
 2016-11-10 12:54:56 +09:00
Dean Herbert 8c68f9ba93 OptionsSideNav -> OptionsSidebar. 2016-11-08 19:17:09 +09:00
Drew DeVault 1bca78f4b6 Wire up one of the settings to the config 
One step at a time, right
 2016-11-07 22:36:24 -05:00
Drew DeVault 4d04eb6fb1 Rearrange some options a bit, update framework 2016-11-07 22:15:48 -05:00
Drew DeVault 1ce6a7285a Rearrange options namespaces 2016-11-07 21:24:41 -05:00
Drew DeVault e6c3fc1091 Implement scrolling to each section 2016-11-07 17:07:55 -05:00
Huo Yaoyuan c470140d64 Merge branch 'master' 2016-11-06 00:11:30 +08:00
Huo Yaoyuan 2d86cb1e81 Merge branch 'master' 2016-11-05 16:21:59 +08:00
Dean Herbert b40ccccbe4 Add HitObject colours back in the mix. 2016-11-04 15:43:53 +09:00
Drew DeVault cb40b7079f Rework how references are passed about 2016-11-03 22:43:00 -04:00
Drew DeVault af8e4415c3 Split out [Sub]sections into seperate files 2016-11-03 19:06:22 -04:00
Drew DeVault 1d8c6db0a7 Add remaining options 2016-11-03 19:06:22 -04:00
Drew DeVault c7fa0a5ab0 Add more options 2016-11-03 19:06:22 -04:00
Drew DeVault 7e77efcfdc Add Graphics options 2016-11-03 19:06:22 -04:00
Drew DeVault 6c0cef894e Add OsuButton with sane defaults 2016-11-03 19:06:22 -04:00
Drew DeVault 2aa85a4b18 Split up options into subclasses 2016-11-03 19:06:22 -04:00
Huo Yaoyuan 7e2350cb13 Merge remote-tracking branch 'refs/remotes/peppy/lets-play' 2016-10-28 19:07:29 +08:00
Dean Herbert 0e39c5cc9c Move Results to own namespace. 2016-10-28 16:10:10 +09:00
Dean Herbert feccb7286c Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect. 2016-10-28 14:14:45 +09:00
Dean Herbert 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
Huo Yaoyuan 35b1d0ae50 Seperated DragBar class. 2016-10-27 18:14:50 +08:00
Huo Yaoyuan e1f6ab1a42 Create MusicController UI class and visual test. 2016-10-27 13:34:43 +08:00
Dean Herbert debea59bab Merge pull request #61 from SirCmpwn/song-select 
Song select
 2016-10-27 13:54:34 +09:00
Dean Herbert f846505a92 Tidy namespaces. 2016-10-27 12:01:13 +09:00
Dean Herbert 104cedba19 Merge pull request #109 from peppy/volume-control-input-fix 
Fix volume control input handling.
 2016-10-27 11:45:09 +09:00
Drew DeVault 55e5ec6fae General cleanup per PR feedback 2016-10-26 10:52:40 -04:00
Drew DeVault 157512b45f Merge branch 'master' into song-select 2016-10-26 10:37:18 -04:00
Dean Herbert 3f23900347 Framework & OpenTK updates. 2016-10-26 23:13:44 +09:00
Dean Herbert ee8b678989 Fix volume controls handling mouse wheel at a higher level than anything else game-wide. 2016-10-26 18:45:48 +09:00
Dean Herbert d3a857edb9 Make importing work properly. 
Moves import code to BeatmapDatabase.
 2016-10-24 11:39:53 -04:00
Drew DeVault bc959f74a5 Add background textures to beatmap sets 
Needs osu-framework#189
 2016-10-24 11:39:18 -04:00
Drew DeVault bc6e705e2b Add test case for song selection 2016-10-24 11:39:18 -04:00
Dean Herbert 1ce16afa23 Update nuget package versions. 2016-10-24 22:46:44 +09:00
Dean Herbert 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
Dean Herbert ee463dc65c Merge pull request #77 from NeoAdonis/counters-a 
Rolling counters
 2016-10-19 15:06:00 +09:00
Drew DeVault 7bdf1fe1bf Drop BeatmapSet, only BeatmapSetInfo is necessary 2016-10-18 15:48:24 -04:00
Drew DeVault 8ca4a2067e $(SolutionDir) 2016-10-18 13:58:24 -04:00
Drew DeVault 449f04c07b Refactor the database code 2016-10-18 13:38:27 -04:00
Adonais Romero González 5abc3ba898 Merge remote-tracking branch 'upstream/master' into counters-a 2016-10-17 20:36:04 -05:00
Huo Yaoyuan f4c381f745 Use OverlayContainer in framework. 2016-10-16 17:14:17 +08:00