1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 21:22:56 +08:00
Commit Graph

218 Commits

Author SHA1 Message Date
Dean Herbert
a61fb5ef5d Initial updates to make generic containers work. 2016-11-07 21:13:56 +09:00
Dean Herbert
f14a35d480 Update FontAwesome definitions. 2016-11-07 17:59:00 +09:00
Thomas Müller
90c889a7ce Smoothen wedged buttons in main menu and the wedges on song select background. 2016-11-06 19:34:44 +01:00
Thomas Müller
103176826f Ensure transformations are never used prior to being added to the Drawable tree. 2016-11-06 11:13:52 +01:00
Thomas Müller
32ee20b843 Merge branch 'master' of github.com:ppy/osu into better-clocks
# Conflicts:
#	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
2016-11-06 10:08:24 +01:00
Thomas Müller
5f2bf165a2 Remove now obsolete clock usages. 2016-11-06 10:06:09 +01:00
Thomas Müller
a6c0fd29f2 Make use of new timing system in Drawables and Transforms. 2016-11-06 08:25:21 +01: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
a11d534067 Add beatmap backgrounds. 2016-11-05 20:00:14 +09:00
Dean Herbert
2ee5e2efb7 Bring framework up-to-date.
# Conflicts:
#	osu-framework
2016-11-05 18:18:52 +09:00
Dean Herbert
92b85b251e Fix scale more. 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
788cba6f4d Add autoplay toggle (const). 2016-11-04 15:43:53 +09:00
Dean Herbert
f3d461e318 Fix some events not firing correctly. 2016-11-04 12:27:43 +09:00
Dean Herbert
439204b4fa Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow 2016-11-03 16:44:49 +09:00
Dean Herbert
3d611dd57b Improve coodination of startup sequence. 2016-11-02 01:02:48 +09:00
Dean Herbert
c78e3efc66 Schedule some illegal calls. 2016-11-02 01:02:34 +09:00
Drew DeVault
0edfeaaff9 Move wedgeContainer transition to OnEntering 2016-11-01 09:22:49 -06:00
Dean Herbert
b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Drew DeVault
e5f948dccc Fade song select wedges in 2016-10-31 16:16:11 -06:00
Adonais Romero González
fd0900eb3c I knew I forgot something >:( 2016-10-29 18:42:40 -05:00
Adonais Romero González
ef9d2b5b3c Minor improvements to combo counters 2016-10-29 18:26:12 -05:00
Dean Herbert
d8ca11bf0d Use Any instead of First to avoid potential throw. 2016-10-29 04:29:43 +09:00
Dean Herbert
a2f995ebe0 Remove forgotten parens. 2016-10-29 03:44:27 +09:00
Dean Herbert
c969e0b4f0 Remove forced disposal of WorkingBeatmap. 2016-10-29 03:31:40 +09:00
Dean Herbert
f0e4a252a5 Add some warning comments. 2016-10-28 23:35:49 +09:00
Dean Herbert
42ad96778e Tidy shit up; reduce number of unnecssesary events being fired. 2016-10-28 23:29:21 +09:00
Dean Herbert
5dc495e41d Avoid accessing the beatmap too early. 2016-10-28 21:08:32 +09: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
Dean Herbert
74f1a9622f Add initial game-wide beatmap flow. 2016-10-28 19:55:48 +09:00
Dean Herbert
0f5614ffa2 Only allow osu! mode maps to be played for now. 2016-10-28 18:07:42 +09:00
Dean Herbert
13b5fb0578 Update transforms to not accept clock. 2016-10-28 17:42:00 +09: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
012c29addb Minor fixes to player flow. 2016-10-27 22:27:45 +09:00
Dean Herbert
d6ed055682 Don't hard-crash on failing to load a beatmap. 2016-10-27 20:37:01 +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
Dean Herbert
c828b1bc7b Add comment about optional database parameter. 2016-10-27 17:53:47 +09:00
Dean Herbert
9074bc3396 Allow Player to load from BeatmapInfo. 2016-10-27 17:53:37 +09:00
Dean Herbert
a764a97602 Use memory database again, local to TestCasePlaySongSelect. 2016-10-27 17:35:00 +09:00
Dean Herbert
f16cc430f8 Stop using memory database. Load sample data local to TestCase.
Also makes the connection private.
2016-10-27 17:08:53 +09:00
Dean Herbert
debea59bab Merge pull request #61 from SirCmpwn/song-select
Song select
2016-10-27 13:54:34 +09:00
Dean Herbert
456169f182 Move BeatmapGroupState to outside class definition. 2016-10-27 13:42:37 +09:00
Dean Herbert
ba5b2f2d73 Remove difficulty width offsets and tidy up flow of information. 2016-10-27 12:31:45 +09:00
Dean Herbert
f846505a92 Tidy namespaces. 2016-10-27 12:01:13 +09:00
Drew DeVault
9c27c33e18 Use IStateful and improve collapse logic 2016-10-26 12:49:16 -04:00
Drew DeVault
55e5ec6fae General cleanup per PR feedback 2016-10-26 10:52:40 -04: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
Drew DeVault
5e9495d21d Fix performance issues with song select 2016-10-25 16:49:10 -04:00
Drew DeVault
a1019f91ba Fix auto size on BeatmapSetBox difficulties 2016-10-24 11:39:53 -04:00