1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 05:52:54 +08:00
Commit Graph

68835 Commits

Author SHA1 Message Date
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
Dean Herbert
37edbd355e Fix rulesets not being registered for VisualTests. 2016-11-16 15:49:59 +09:00
Dean Herbert
b61521a93c Tidy up Player.cs. 2016-11-16 15:48:35 +09:00
Dean Herbert
42d2d39ade Merge pull request #171 from huoyaoyuan/improvements
Various improvements
2016-11-16 12:00:55 +09:00
Huo Yaoyuan
95600f872d Expression body and spacing. 2016-11-16 10:53:10 +08:00
Huo Yaoyuan
53deaf2a00 Merge branch 'master' 2016-11-16 10:51:39 +08:00
Dean Herbert
89bb87a6f3 Merge pull request #176 from Tom94/simpler-gradient
Use gradient helper function to create toolbar tooltip gradient.
2016-11-16 11:18:31 +09:00
Dean Herbert
26e9c9fcb6 Update framework. 2016-11-16 09:20:43 +09:00
Dean Herbert
da00c65e50 Merge pull request #175 from Tom94/fix-broken-option-checkbox
Fix option checkbox losing its glow incorrectly in certain cases.
2016-11-16 03:12:23 +09:00
Thomas Müller
e049f8582a Fix option checkbox losing its glow incorrectly in certain cases. 2016-11-15 19:11:36 +01:00
Thomas Müller
746c28246f Use gradient helper function to create toolbar tooltip gradient. 2016-11-15 19:09:30 +01:00
Thomas Müller
696d21f762 Merge pull request #174 from peppy/general-fixes
General fixes
2016-11-15 18:20:48 +01:00
Thomas Müller
eb1b9e73d7 Merge pull request #173 from peppy/options-design-improvements
Add an implementation of the new design of checkboxes.
2016-11-15 18:13:46 +01:00
Dean Herbert
b332ab2c97 Update framework. 2016-11-16 01:36:35 +09:00
Dean Herbert
d846246ef2 ShowToolbar -> ShowOverlays; include MusicController. 2016-11-15 20:55:57 +09:00
Dean Herbert
2af839cdbd Render musicController above toolbar. 2016-11-15 20:55:55 +09:00
Dean Herbert
0b8c307549 Toolbar should block Hover events. 2016-11-15 20:55:53 +09:00
Dean Herbert
a2d505af78 ToolbarButtons should still handle MouseDown events. 2016-11-15 20:55:52 +09:00
Dean Herbert
f415e5820f Add an implementation of the new design of checkboxes. 2016-11-15 19:35:01 +09:00
Dean Herbert
5b1711f797 Update some colour palette discrepancies in options. 2016-11-15 19:34:58 +09:00
Dean Herbert
1f73bb4cf0 Set drag bar to correct orange. 2016-11-15 19:34:55 +09:00
Dean Herbert
a92404413c Adjust padding and fonts of options. 2016-11-15 19:34:53 +09:00