1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 21:02:55 +08:00
Commit Graph

1159 Commits

Author SHA1 Message Date
Dean Herbert
8329022a2e Merge remote-tracking branch 'refs/remotes/upstream/master' into hit-samples 2016-12-08 21:41:02 +09:00
Dean Herbert
068b413225 Merge pull request #232 from peppy/general-fixes
Folder fix.
2016-12-08 21:39:44 +09:00
Dean Herbert
40ea6e0d72 Fix incorrect folder name. 2016-12-08 21:36:34 +09:00
Dean Herbert
f8395c4d3f Fix slider ball not tracking when mouse hasn't been moved since slider appeared. 2016-12-08 21:07:20 +09:00
Dean Herbert
6cfb174f02 Fix exiting results screen returning to player. 2016-12-08 20:03:18 +09:00
Dean Herbert
c53743ca7d Fix unit test regression. 2016-12-08 20:00:24 +09:00
Dean Herbert
391767e01d Add very basic hitsound support. 2016-12-08 19:54:22 +09:00
Dean Herbert
63da7e5ea4 Merge pull request #225 from peppy/hitobject-improvements
Slider & other hit object improvements.
2016-12-08 16:11:50 +09:00
Dean Herbert
01a35ed448 Merge pull request #229 from peppy/general-fixes
General improvements
2016-12-08 13:32:27 +09:00
Dean Herbert
3224abfa90 Update framework. 2016-12-08 13:30:13 +09:00
Dean Herbert
0538681f3b Merge branch 'refs/heads/master' into general-fixes 2016-12-08 13:29:59 +09:00
Dean Herbert
bd51befa78 Merge pull request #214 from SirCmpwn/even-moar-options
Even moar options
2016-12-08 13:00:08 +09:00
Drew DeVault
bf7ec397dd Wire dropdowns back to bindables 2016-12-07 09:42:53 -05:00
Drew DeVault
bf33bded24 Update star min/max type, just use sliders for now 2016-12-07 09:42:53 -05:00
Drew DeVault
9db8e63f83 Make star display min/max a double 2016-12-07 09:42:53 -05:00
Drew DeVault
b06f412ffb Use styled dropdown 2016-12-07 09:42:53 -05:00
Drew DeVault
0e07ce26bc Remove Height from dropdown 2016-12-07 09:42:53 -05:00
Drew DeVault
cf60c52f00 Switch to System.ComponentModel.Description 2016-12-07 09:42:53 -05:00
Drew DeVault
5456e0102c s/OptionsDropdown/DropdownOption/g 2016-12-07 09:42:52 -05:00
Drew DeVault
4757a1c433 Wire up enum-backed dropdowns 2016-12-07 09:42:52 -05:00
Drew DeVault
0378de8346 Add DisplayName 2016-12-07 09:42:37 -05:00
Drew DeVault
9daf524120 Add OptionsDropdown<T> and wire up one example 2016-12-07 09:42:37 -05:00
Drew DeVault
ff7ec88e66 s/OptionsSlider/SliderOption/g 2016-12-07 09:42:37 -05:00
Drew DeVault
b97902d006 Add missing sliders 2016-12-07 09:42:37 -05:00
Drew DeVault
92cf841589 Add and wire up all sliderbar-based options 2016-12-07 09:42:37 -05:00
Drew DeVault
3aefa4d6a5 Wire up remaining sliders, except for ints 2016-12-07 09:42:37 -05:00
Drew DeVault
a350e95e40 Add OptionsSlider and wire up volume sliders 2016-12-07 09:41:28 -05:00
Dean Herbert
112b2983ac Make start circle always follow current progress for now, not snaking. 2016-12-07 21:46:19 +09:00
Dean Herbert
08f8eb649c Make counters closer to what they should be looking like. 2016-12-07 21:05:29 +09:00
Dean Herbert
bbc11c77ca Add (temporary) transitions to songselect and player. 2016-12-07 20:47:28 +09:00
Dean Herbert
bc6c57c619 Make toolbar icons the same width as options icons. 2016-12-07 19:14:05 +09:00
Dean Herbert
87ad44b901 Fix HitObject test case not displaying properly. 2016-12-07 18:46:47 +09:00
Dean Herbert
83e7e67cc5 Improve repeat point visual. 2016-12-07 17:21:59 +09:00
Dean Herbert
b5e3dcbd1c Improve visuals of temporary sliderball. 2016-12-07 16:37:03 +09:00
Dean Herbert
41b9a55460 Simplify variables for snake start/end. 2016-12-07 16:00:29 +09:00
Dean Herbert
2ba77746c0 Manually create slider textures rather than relying on draw calls. 2016-12-07 15:45:17 +09:00
Dean Herbert
1fff21dc12 Make initial circles of sliders follow snaking out. 2016-12-07 14:52:34 +09:00
Dean Herbert
27fafe419b Add warnings. 2016-12-07 00:03:02 +09:00
Dean Herbert
7ab08945e4 Add repeat graphics, fine-tune scale of various elements. 2016-12-07 00:02:27 +09:00
Dean Herbert
ae72f91975 Reshuffle hit explosions to be on their own layer.
Style misses better.
2016-12-06 21:14:38 +09:00
Dean Herbert
4042a9e71e Add preliminary (correctly) textured sliders; split out components into their own files. 2016-12-06 19:54:52 +09:00
Dean Herbert
783ef6829e Merge pull request #224 from peppy/general-fixes
Add missing licence headers.
2016-12-06 19:10:37 +09:00
Dean Herbert
f356640cb7 Add missing licence headers. 2016-12-06 19:07:15 +09:00
Dean Herbert
421dd19aaf Move initial state updates to DrawableHitObject. 2016-12-06 18:35:08 +09:00
Dean Herbert
29d15c3ab8 Fix incorrect snaking on non-repeat sliders. 2016-12-06 16:58:12 +09:00
Dean Herbert
d05a1ea1c5 Merge pull request #223 from peppy/more-sound-effects
Add various sound effects.
2016-12-06 00:17:19 +09:00
Dean Herbert
ef8793ff24 Merge branch 'refs/heads/master' into more-sound-effects 2016-12-06 00:08:45 +09:00
Dean Herbert
e33aaa95a8 Merge pull request #222 from peppy/better-exit-process
Move the actual outro sequence into Intro rather than MainMenu.
2016-12-06 00:06:42 +09:00
Dean Herbert
d1cb9b90d5 Merge pull request #221 from peppy/general-fixes
Update framework.
2016-12-05 23:22:16 +09:00
Dean Herbert
3cb9cb647d Tidy up BackButton and adjust transitions a bit. 2016-12-05 21:36:42 +09:00