1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:53:21 +08:00
Commit Graph

11277 Commits

Author SHA1 Message Date
Dean Herbert
c346638459
Merge branch 'master' into decoders 2018-03-11 01:04:28 +09:00
Dean Herbert
9233266fe1 Fix login failure for users with no country rank
Closes #2148.
2018-03-11 00:44:16 +09:00
Dean Herbert
19436842de
Merge branch 'master' into editor-hitobject-movement 2018-03-10 23:44:22 +09:00
Dean Herbert
709fcf9552 Update ISSUE_TEMPLATE 2018-03-10 20:01:36 +09:00
Dean Herbert
a9327eac8f
Merge pull request #2194 from smoogipoo/drawableslider-cleanup
Split out the slider head into a separate drawable hitobject
2018-03-10 18:50:55 +09:00
tgi74000
a29189ff84 Merge remote-tracking branch 'upstream/master' 2018-03-10 08:46:00 +01:00
tgi74000
a4dfeff2d7 Renamed ManiaMirrorMod to ManiaModMirror 2018-03-10 08:44:46 +01:00
tgi74000
ed20e31bbe Removed redundant parentheses 2018-03-10 08:39:11 +01:00
Dean Herbert
ac5a2f18c4
Merge branch 'master' into drawableslider-cleanup 2018-03-10 16:34:15 +09:00
smoogipoo
92b302971f Trim whitespace 2018-03-10 01:23:53 +09:00
smoogipoo
24501c37dd Merge branch 'drawableslider-cleanup' into editor-hitobject-movement 2018-03-10 01:15:24 +09:00
smoogipoo
8ed5fce43a Split out the slider head into a separate drawable hitobject 2018-03-10 01:13:59 +09:00
Dean Herbert
5727965431
Merge pull request #2193 from peppy/update-framework-again
Fix major regression (framework revert)
2018-03-10 01:08:17 +09:00
smoogipoo
4103c66cff Move selection overlay to HitObjectOverlayLayer for extensibility 2018-03-10 00:48:57 +09:00
Dean Herbert
7cabc54f64 Fix major regression (framework revert) 2018-03-10 00:48:48 +09:00
smoogipoo
0e8fbc47b7 Give HitObjectOverlayLayer full input state information 2018-03-10 00:03:02 +09:00
smoogipoo
376f6eec58 SetPosition -> OffsetPosition 2018-03-10 00:02:13 +09:00
smoogipoo
ad72d3816b Allow dragging anywhere in a capture box to move objects 2018-03-09 23:43:50 +09:00
smoogipoo
4a48136e4f Make hitobject positions adjustable 2018-03-09 23:12:34 +09:00
smoogipoo
3b766b8ec8 Make CaptureBox account for changes in hitobject states 2018-03-09 23:11:48 +09:00
naoey
56730247e3
Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps 2018-03-09 19:40:00 +05:30
naoey
2c0488b1f1
Invert bool, add test, and handle ruleset change. 2018-03-09 19:39:28 +05:30
Dean Herbert
9ad9fc5aa9
Merge branch 'master' into fix-unplayable-beatmaps 2018-03-09 21:39:48 +09:00
Dean Herbert
df8f89b3d6
Merge branch 'master' into fix-mania-conversion 2018-03-09 21:39:19 +09:00
Dan Balasescu
1ecd051383
Merge pull request #2190 from peppy/framework-too-far-behind
Update framework
2018-03-09 21:38:57 +09:00
Dean Herbert
2b0309b26d Update framework 2018-03-09 21:29:13 +09:00
Dean Herbert
217dd2ecdc Initial push for better decoders 2018-03-09 21:24:15 +09:00
naoey
d04f47718f
Make song select choose random when initial selection fails.
- Revert TestCasePlaySongSelect to master
2018-03-09 17:36:55 +05:30
naoey
25fb527cc7
Remove previous fix and move filtered logic to carousel.
- Add an optional bool parameter to SelectBeatmap to skip selecting
filtered maps
2018-03-09 15:51:00 +05:30
Dan Balasescu
ac9de336db
Merge branch 'master' into fix-mania-conversion 2018-03-09 16:09:14 +09:00
Dean Herbert
6ad962fc8b Interpolate ParallaxContainer's scale
Things were a bit jumpy when a screen was adjusting `ParallaxAmount`. This smoothes the applied scale changes to look great again.

Most noticeable when hitting the retry hotkey (`~`) from gameplay.
2018-03-09 14:35:53 +09:00
tgi74000
1f48cfb79a Added Mirror Mod for Mania 2018-03-08 17:35:20 +01:00
Dean Herbert
c11f6efab5
Merge pull request #2045 from UselessToucan/PlayerBase
Allow previewing background adjustments at player loading screen
2018-03-08 22:26:39 +09:00
Dean Herbert
6d91889ca6 Move player-specific configuration bindables back to player 2018-03-08 22:16:47 +09:00
Dean Herbert
94ed4ab01b Add debouncing to player loading
Allows the mouse to temporarily exit and re-enter overlay elements without triggering a load
2018-03-08 20:28:55 +09:00
Dean Herbert
d3e91024a7 Block player enter when a drag initiates from an overlaying container 2018-03-08 18:16:23 +09:00
TocoToucan
2cb197d0c4 Replace ConfigureBackgroundUpdate with OnEntering 2018-03-08 11:35:00 +03:00
Dean Herbert
8f3f886805
Merge branch 'master' into PlayerBase 2018-03-08 16:12:12 +09:00
Dean Herbert
80bd2a95f6
Merge pull request #2186 from peppy/fix-difficulty-calculator
Fix difficulty calculator regression when applying mods
2018-03-08 15:14:13 +09:00
Dean Herbert
2c0928896b
Merge branch 'master' into fix-difficulty-calculator 2018-03-08 15:03:33 +09:00
Dean Herbert
213d749dab
Merge pull request #2183 from peppy/less-hp-drain
Match HP drain harshness closer to stable
2018-03-08 14:53:15 +09:00
Dan Balasescu
ffc9a7644e
Merge branch 'master' into less-hp-drain 2018-03-08 14:44:40 +09:00
Dean Herbert
81c1ec2005
Merge branch 'master' into fix-unplayable-beatmaps 2018-03-08 13:02:57 +09:00
Dean Herbert
3b56999118 Add drawable to display (and update) relative dates 2018-03-08 12:58:16 +09:00
Dean Herbert
70a16667b6 Fix difficulty calculator regression when applying mods 2018-03-08 12:57:36 +09:00
Dean Herbert
ee96e974a8 Update framework 2018-03-08 09:43:31 +09:00
Dean Herbert
91c984ed97
Merge branch 'master' into rewrite-break-overlay 2018-03-08 09:31:59 +09:00
Dean Herbert
81b778fdcf
Merge branch 'master' into cursor-trail 2018-03-08 09:31:42 +09:00
Dean Herbert
ca249ab866
Merge pull request #2120 from naoey/user-profile-recent
Add recent section to user profile
2018-03-08 01:14:30 +09:00
Dean Herbert
e55a503f79 Tidy up test case 2018-03-08 00:58:16 +09:00