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

134 Commits

Author SHA1 Message Date
Thomas Müller b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
Dean Herbert ce13d813b7 Remove unnecessary null check. 2016-11-28 22:46:07 +09:00
Dean Herbert 54fc25e163 Fix disposal logic. 2016-11-28 12:25:20 +09:00
Dean Herbert cfb2285312 TestCasePlayer uses an actual beatmap if available. 2016-11-28 11:38:32 +09:00
Dean Herbert 82a708d2c0 Merge pull request #189 from SirCmpwn/general-fixes 
General fixes
 2016-11-26 16:56:07 +09:00
Dean Herbert 396ca9fe91 Remove HitJudgementResolver; reimplement in DrawableHitObject. 2016-11-26 16:51:51 +09:00
Drew DeVault c85454d034 Reset db on dispose 2016-11-25 05:12:01 -05:00
Dean Herbert ef0f975960 Fix TestCaseHitObjects. 2016-11-25 16:41:00 +09:00
Dean Herbert f9f72f25a2 Add basic flow for hitobject judgement. 2016-11-25 16:26:50 +09:00
Drew DeVault 89effca12e Remove need for PlaySongSelect ctor to take a db 2016-11-25 00:44:46 -05:00
Thomas Müller c6d688898f Initial implementation of a beatmap carousell and various minor improvements to song select. 
No big optimizations yet, but groundwork is laid out.
 2016-11-20 20:34:16 +01:00
Thomas Müller 57e7c7097d Update framework and add rudimentary fading to song select screen. 2016-11-20 12:16:54 +01:00
Dean Herbert 3ac89216bd Standardise some naming and make hitcircles feel better. 2016-11-19 19:07:57 +09:00
Dean Herbert acb85d0140 Fix regressions in combo counters and tidy up naming of SpriteTexts. 2016-11-19 16:19:54 +09:00
Dean Herbert 4c61a13e71 Make slider parsing kind of exist. 2016-11-18 17:40:06 +09:00
Dean Herbert fba748b24e DrawableCircle -> DrawableHitCircle. 2016-11-16 16:20:58 +09:00
Dean Herbert da1f6eeab5 Circle -> HitCircle. 2016-11-16 16:16:45 +09:00
Dean Herbert 37edbd355e Fix rulesets not being registered for VisualTests. 2016-11-16 15:49:59 +09:00
Dean Herbert abdfe42388 Merge branch 'refs/heads/master' into better-anchors 
# Conflicts:
#	osu.Game.Mode.Osu/UI/OsuComboCounter.cs
#	osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
 2016-11-15 14:33:13 +09:00
Tom94 c860eb25f9 Migrate to new anchor system without x/y reversal. 2016-11-14 17:22:20 +01: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
Thomas Müller ac99e2d488 Avoid using load to construct the drawable hierarchy whereever possible. 2016-11-12 18:34:36 +01:00
Dean Herbert cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection 
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
 2016-11-12 20:18:26 +09:00
Drew DeVault 0d4560a054 Update to latest DI stuff 2016-11-10 17:40:42 -05:00
Drew DeVault fe9034323b Get the game running, though not perfectly 2016-11-10 16:42:29 -05:00
Drew DeVault ee24cd310c Convert everything to DI pattern 2016-11-10 16:41:18 -05:00
Drew DeVault dc03f36793 Use DI for Player 2016-11-10 16:38:44 -05:00
Dean Herbert 788c11de10 Merge pull request #103 from huoyaoyuan/music-controller 
Music controller
 2016-11-10 12:54:56 +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
Huo Yaoyuan c470140d64 Merge branch 'master' 2016-11-06 00:11:30 +08:00
Thomas Müller 07e74068e7 Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
 2016-11-05 13:35:15 +01:00
Dean Herbert 8fe63689a4 Fix thread safety issue when accessing files in beatmap (zip) files. 2016-11-05 18:19:01 +09:00
Huo Yaoyuan 2d86cb1e81 Merge branch 'master' 2016-11-05 16:21:59 +08:00
Dean Herbert da18e2d4f6 Fix off-by-one colour retrieval. 2016-11-04 15:43:53 +09:00
Dean Herbert b40ccccbe4 Add HitObject colours back in the mix. 2016-11-04 15:43:53 +09:00
Dean Herbert e939746159 Fix scale ratio of gamefield. 2016-11-04 15:43:53 +09:00
Dean Herbert 7e6d5a28b1 Scale up TestCaseHitObjects so detail is a bit more visible. 2016-11-04 15:43:53 +09:00
Drew DeVault 55821a1a2b Fix OpenTK reference in osu.Desktop.VisualTests 2016-11-03 19:06:22 -04:00
Drew DeVault 2aa85a4b18 Split up options into subclasses 2016-11-03 19:06:22 -04:00
Drew DeVault 9f78f8607b Implement General options section 2016-11-03 19:06:22 -04:00
Huo Yaoyuan f2a8cc0c29 Merge branch 'master' 2016-11-03 20:38:34 +08:00
Dean Herbert b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Huo Yaoyuan 7d14e6e6cf Make prev and next work again. 2016-10-28 20:08:27 +08:00
Huo Yaoyuan b7ada4866e Merge remote-tracking branch 'peppy/lets-play' into music-controller 2016-10-28 19:47:35 +08:00
Dean Herbert 10ef34b805 Lazy parse beatmap; Don't reload audio track if it hasn't changed. 2016-10-28 20:24:14 +09:00
Huo Yaoyuan 7e2350cb13 Merge remote-tracking branch 'refs/remotes/peppy/lets-play' 2016-10-28 19:07:29 +08: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