1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 19:32:54 +08:00
Commit Graph

27556 Commits

Author SHA1 Message Date
Thomas Müller
20be2f4628 Terminate loop through beatmap groups when having found a selection. 2016-11-22 19:00:42 +01:00
Thomas Müller
b22762d0e1 Merge branch 'master' of github.com:ppy/osu into better-song-select 2016-11-22 18:55:13 +01:00
Thomas Müller
420ed08119 Merge pull request #183 from peppy/general-fixes
Explicit disposal via using() to WorkingBeatmap.
2016-11-22 16:56:42 +01:00
Dean Herbert
d71550d22a Don't do a recursive fill by default, we don't need it. 2016-11-22 22:07:28 +09:00
Dean Herbert
4cf2dd90d6 Standardise and simplify the amount of beatmap information passed around song select. 2016-11-22 22:07:15 +09:00
Dean Herbert
ccb00aeb94 Add comment about wedgedBeatmapInfo performance issues. 2016-11-22 21:43:35 +09:00
Dean Herbert
b73cdba08c Change the structure of BeatmapSetHeader to allow for bufferedcontainer invalidation. 2016-11-22 21:38:46 +09:00
Dean Herbert
a3234a5269 Avoid synchronous queries in BackgroundModeBeatmap. 2016-11-22 21:22:12 +09:00
Dean Herbert
3bc38268a0 Make MusicController more async. 2016-11-22 20:47:28 +09:00
Dean Herbert
f576b4bf82 Don't use texture atlases for beatmap backgrounds. 2016-11-22 20:14:58 +09:00
Dean Herbert
0109c79cae Async load of panel backgrounds (failing for on-screen panels). 2016-11-22 19:48:51 +09:00
Dean Herbert
2ba365657e Tidy up some linq. 2016-11-22 17:21:42 +09:00
Dean Herbert
a251db804c Stop adding beatmaps to song select when disposed. 2016-11-22 16:13:38 +09:00
Dean Herbert
7df8324957 Explicit disposal via using() to WorkingBeatmap. 2016-11-22 14:57:53 +09:00
Thomas Müller
ba84904150 Merge pull request #182 from peppy/input-handler-improvements
Update input handler logic to match framework changes.
2016-11-22 06:46:55 +01:00
Dean Herbert
070c7dc621 Merge remote-tracking branch 'refs/remotes/upstream/master' into input-handler-improvements 2016-11-22 12:37:57 +09:00
Dean Herbert
caf7199857 Merge pull request #181 from peppy/general-fixes
Fix unit tests failing.
2016-11-22 12:30:49 +09:00
Dean Herbert
b0dfcf5429 Update framework. 2016-11-22 12:26:18 +09:00
Dean Herbert
3e9c398652 Update input handler logic to match framework changes. 2016-11-21 21:36:11 +09:00
Dean Herbert
41a84ba00c Add finalizer logic for WorkingBeatmap for now. 2016-11-21 21:35:10 +09:00
Thomas Müller
d32f11b5e2 Smoother movement within song select. 2016-11-21 07:59:46 +01:00
Dean Herbert
027d71ffd8 Fix unit tests failing. 2016-11-21 12:34:03 +09:00
Dean Herbert
ac8c180168 Merge remote-tracking branch 'refs/remotes/Tom94/song-select-wedged-box'
# Conflicts:
#	osu-framework
2016-11-21 12:07:07 +09:00
Dean Herbert
0e27d2ba2f Merge pull request #179 from Tom94/beatmap-backgrounds
Update the background according to the currently selected beatmap and…
2016-11-21 11:57:17 +09:00
Thomas Müller
318fe2f9d6 Fix broken VisualTests SongSelect. 2016-11-20 20:43:43 +01: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
40805ad32c Adjust size of wedged background overlay. 2016-11-20 12:29:38 +01:00
Thomas Müller
57e7c7097d Update framework and add rudimentary fading to song select screen. 2016-11-20 12:16:54 +01:00
Thomas Müller
0fdd505807 Add wedged background overlay to song select. 2016-11-20 10:02:20 +01:00
Dean Herbert
b13cfd43e9 Update framework. 2016-11-20 09:38:11 +09:00
Thomas Müller
f8788bb24b Update the background according to the currently selected beatmap and blur it within song select. 2016-11-19 17:39:43 +01:00
Thomas Müller
9d88bb4736 Merge pull request #177 from peppy/play-mode-improvements
Add simple implementation of HitExplosions.
2016-11-19 13:38:56 +01:00
Dean Herbert
616f3375a4 Update framework. 2016-11-19 19:35:37 +09:00
Dean Herbert
d3bf1a3a9e Fit HitExplosion regression. 2016-11-19 19:14:55 +09:00
Dean Herbert
3ac89216bd Standardise some naming and make hitcircles feel better. 2016-11-19 19:07:57 +09:00
Dean Herbert
d359057db6 Make HitCircles work without using ChildScale. 2016-11-19 16:32:48 +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
1242ae3f2a Add the concept of a HitJudgementResolver. 2016-11-19 16:19:26 +09:00
Dean Herbert
bed50a53a7 Clean up usings. 2016-11-19 13:20:05 +09:00
Dean Herbert
7ce9eca773 Merge remote-tracking branch 'refs/remotes/upstream/master' into play-mode-improvements 2016-11-18 19:28:00 +09:00
Dean Herbert
340e1b3a9c Merge pull request #178 from peppy/general-fixes
Update framework.
2016-11-18 19:27:22 +09:00
Dean Herbert
75e1c2ffbf Update framework. 2016-11-18 19:12:37 +09:00
Dean Herbert
4db2a1e693 Split ApproachCircle out into its own class. 2016-11-18 17:47:47 +09:00
Dean Herbert
4c61a13e71 Make slider parsing kind of exist. 2016-11-18 17:40:06 +09:00
Dean Herbert
bd8856611a Shuffle namespaces and make hitcircle pieces reusable by other objects. 2016-11-17 17:21:23 +09:00
Dean Herbert
885df47864 Add simple implementation of HitExplosions. 2016-11-16 19:24:48 +09:00
Dean Herbert
4e2e7ec8ba Don't initialise children in load(). 2016-11-16 16:59:34 +09:00
Dean Herbert
353b9c0789 Fix incorrect blending mode on triangles. 2016-11-16 16:29:19 +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