1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-29 23:32:56 +08:00
Commit Graph

66135 Commits

Author SHA1 Message Date
Dean Herbert
ec7bbd231f Make flash animation last slightly longer. 2016-12-15 22:58:30 +09:00
Dean Herbert
cf8283582b Don't update LifetimeStart on HitObject state change. 2016-12-15 22:58:23 +09:00
Dean Herbert
d8e40d4fb1 Add naive lifetime calculation for drawable HitObjects. 2016-12-15 22:58:22 +09:00
Dean Herbert
0a9e3ce1b0 Don't handle input in triangle particle effect containers. 2016-12-15 22:58:19 +09:00
Dean Herbert
08ef8ed8ea Add comment about future implementation. 2016-12-15 22:58:18 +09:00
Dean Herbert
8d800dac99 Make Player load async. 2016-12-15 22:58:00 +09:00
Dean Herbert
9557821776 Start a map using enter key. 2016-12-15 22:57:28 +09:00
Dean Herbert
21f993d149 Add ability to navigate song select carousel using arrow keys. 2016-12-15 22:57:14 +09:00
Thomas Müller
10de34930b Merge pull request #231 from peppy/hit-samples
Add very basic hitsound support.
2016-12-13 14:24:12 +01:00
Dean Herbert
db5c2efa15 Rename tracking variable and change conditional as per feedback. 2016-12-13 18:12:35 +09:00
Dean Herbert
c420c55291 Merge branch 'master' into hit-samples
# Conflicts:
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
2016-12-13 17:57:24 +09:00
Dean Herbert
73e7aabc72 Merge pull request #243 from peppy/general-fixes
Update framework.
2016-12-12 16:01:12 +09:00
Dean Herbert
b94d11787e Update framework. 2016-12-12 15:38:26 +09:00
Dean Herbert
cc79a183db Merge pull request #235 from Tom94/circular-sliders
Circular sliders
2016-12-11 20:06:27 +09:00
Dean Herbert
658f203c4e Merge pull request #236 from Tom94/fix-carousel-panel-x
Fix panels that are moving off-screen having an incorrect X coordinat…
2016-12-11 19:47:09 +09:00
Dean Herbert
b93ebea5c1 Merge pull request #239 from Tom94/hitobject-improvements
Hitobject improvements
2016-12-11 19:43:17 +09:00
Dean Herbert
a86b74ebea Merge pull request #237 from Tom94/use-moveto-offset
Update framework.
2016-12-11 19:18:06 +09:00
Thomas Müller
eef697d842 Wire up CircleSize to hitobjects.
Note, that circle sizes still are wrong compared to stable osu. In order to fix this, the base radius of hitcircles needs to become 64, but it currently is 72.
2016-12-11 10:11:22 +01:00
Thomas Müller
882d5edf7d Fix dropped input outside of playfield. 2016-12-11 10:09:58 +01:00
Thomas Müller
2ced0a48e0 Update framework. 2016-12-10 14:37:00 +01:00
Thomas Müller
9c4c713aa0 Fix panels that are moving off-screen having an incorrect X coordinate applied. 2016-12-10 11:30:22 +01:00
Thomas Müller
38968ad6d2 Add circular arc approximator for "perfect" sliders. 2016-12-09 18:04:02 +01:00
Thomas Müller
359cb5ac6a Make bezier approximator slightly more correct (without affecting its behaviour). 2016-12-09 18:03:17 +01:00
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