Dean Herbert
c4952569cc
Merge branch 'master' into fix-menu-cursor-animation
2018-07-06 17:46:29 +09:00
Dean Herbert
54db287791
Remove casting
2018-07-06 17:45:39 +09:00
Dean Herbert
79af5cb0a0
Limit shake duration to ensure it doesn't overlap miss window
2018-07-06 17:24:30 +09:00
Dan Balasescu
8f3f872182
Merge branch 'master' into go-forward
2018-07-06 14:29:26 +09:00
Dan Balasescu
290812cf65
Merge branch 'master' into more-mania-conversion-fixes
2018-07-06 13:29:16 +09:00
Dean Herbert
98410dbb6d
Reduce shake transform count by one for more aesthetic behaviour
2018-07-06 13:24:02 +09:00
Dean Herbert
48d90a67ae
xmldoc and formatting
2018-07-06 12:13:23 +09:00
Dean Herbert
0ecbc5945f
Adjust transform to look better
2018-07-06 12:07:39 +09:00
Dean Herbert
aa96d91762
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
2018-07-06 11:57:32 +09:00
Dean Herbert
dffe6af5d9
Merge branch 'master' into fix-menu-cursor-animation
2018-07-06 11:29:53 +09:00
tgi74000
558b2622a7
Move the Shake logic to a new ShakeContainer
2018-07-05 15:48:54 +02:00
Dean Herbert
7e28a993f7
Update framework
2018-07-05 21:08:53 +09:00
Dean Herbert
e5001b84bd
Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter
2018-07-05 21:04:19 +09:00
Dean Herbert
5f5790f566
Merge branch 'master' into fix-menu-cursor-animation
2018-07-05 21:04:06 +09:00
Dean Herbert
625b9ead4c
Fix links from profile top scores to beatmaps not working correctly
2018-07-05 21:00:23 +09:00
Dean Herbert
8f04acc506
Add missing xmldoc
2018-07-05 20:16:55 +09:00
Dean Herbert
4f894969df
Merge branch 'master' into hitobject-samples
2018-07-05 19:43:19 +09:00
ekrctb
bbceac6cda
Apply renaming of wheel -> scroll
2018-07-05 16:50:04 +09:00
Dean Herbert
44aecdc3a0
Rename method to EquivalentTo
2018-07-05 15:00:02 +09:00
Dean Herbert
d11ba2df0e
Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks
2018-07-05 14:53:31 +09:00
Dean Herbert
aea1299762
Merge branch 'master' into fix-footer-clicking-area
2018-07-05 13:39:53 +09:00
Dean Herbert
e28a610757
Fix mods not correctly resetting when changing ruleset at song select
2018-07-05 13:22:52 +09:00
Jacob Odgård Tørring
2979cb96a6
attemptSeek accesses beatmap Disabled directly
2018-07-04 21:09:28 +02:00
Jacob Odgård Tørring
9248340df8
Merge branch 'master' into master
2018-07-04 20:51:05 +02:00
Dan Balasescu
7a4d3f9ffa
Merge branch 'master' into fix-popup-dialog-regression
2018-07-04 11:15:18 +09:00
naoey
6ea6a10def
Reduce size of download button in list view to fit hover effect
2018-07-03 20:26:49 +05:30
naoey
2a0b1f3615
Update direct panel download button for new design
...
- Add a download failed event to BeatmapManager
- Make DownloadButton aware of all 3 possible download states
- Change button appearance based on each state
2018-07-03 20:18:09 +05:30
ekrctb
d71b61c122
Rewrite disable mouse buttons logic
2018-07-03 20:04:15 +09:00
Dean Herbert
1e1ff8339e
Merge branch 'master' into non-null-nestedobjects
2018-07-03 19:43:46 +09:00
Dean Herbert
5fc17bacf3
Add "Select" action
...
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
Dean Herbert
b33206c212
Fix selecting a button on a dialog causing both that button and exit to animate
2018-07-03 18:35:09 +09:00
Dean Herbert
2aae528e1c
Improve code quality of main menu button system
2018-07-03 18:23:41 +09:00
smoogipoo
73851fb194
Fix beatmap details not working for unranked beatmaps
2018-07-03 15:57:05 +09:00
ekrctb
f9f192ce34
Modify MenuCursor hightlight animation
2018-07-03 15:15:03 +09:00
Joehu
d476842c44
Fix FooterButton clicking area
2018-07-02 22:03:17 -07:00
Dean Herbert
627a5deff9
Merge branch 'master' into fix-menu-cursor-crash
2018-07-02 18:09:11 +09:00
Dean Herbert
6c848f135c
Add comment about last button invocation
2018-07-02 17:48:16 +09:00
Dan Balasescu
e99c05c85e
Merge branch 'master' into fix-dialog-popups
2018-07-02 17:41:16 +09:00
Dan Balasescu
6abb3fa62c
Merge branch 'master' into add-scroll-speed-keybinds
2018-07-02 17:26:05 +09:00
smoogipoo
f0ec117bcb
Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds
...
# Conflicts:
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-07-02 17:21:18 +09:00
Dan Balasescu
118366303c
Merge branch 'master' into fix-leaderboard-placeholder
2018-07-02 17:17:40 +09:00
smoogipoo
9f405b0894
Don't hard-bail if config skin doesn't exist anymore
2018-07-02 16:49:07 +09:00
ekrctb
ae6fdd8e29
whitespace
2018-07-02 16:20:44 +09:00
smoogipoo
45a4187923
Tidy up lookups to NestedHitObjects
2018-07-02 16:10:56 +09:00
ekrctb
63746876c2
typo
2018-07-02 16:09:33 +09:00
ekrctb
341ffa4667
Fix MenuCursor crash
2018-07-02 16:07:52 +09:00
Dan Balasescu
e5947cc969
Merge branch 'master' into non-null-ruleset
2018-07-02 15:32:55 +09:00
smoogipoo
b61fe10f62
Adapt to IBindables
2018-07-02 15:07:18 +09:00
smoogipoo
4070c1a888
Merge remote-tracking branch 'origin/master' into non-null-ruleset
...
# Conflicts:
# osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
Dan Balasescu
2c19790a97
Merge branch 'master' into fix-background-screen-crash
2018-07-02 15:01:59 +09:00