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
6ae342d1a0
Merge pull request #2929 from smoogipoo/hitobject-samples
...
Add support for HitObject level custom samples
2018-07-05 20:28:07 +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
Dean Herbert
f5b275bc0b
Merge pull request #2867 from LastExceed/fix-BASS-not-being-loaded-on-linux
...
Hint bass library path when running from vscode on linux
2018-07-05 19:41:41 +09:00
Dean Herbert
d825eec364
Merge remote-tracking branch 'upstream/master' into LastExceed-fix-BASS-not-being-loaded-on-linux
2018-07-05 19:30:01 +09:00
Dean Herbert
7328121ef5
Remove LD_PRELOAD as it is now unnecessary
2018-07-05 19:29:49 +09:00
Dean Herbert
ef5fa978c7
Merge pull request #2908 from smoogipoo/legacy-custom-banks
...
Add support for multiple sample banks
2018-07-05 19:14:21 +09:00
ekrctb
bbceac6cda
Apply renaming of wheel -> scroll
2018-07-05 16:50:04 +09:00
Dean Herbert
1d6609d9f3
Add common custom words to dotsettings dictionary
...
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +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
Dan Balasescu
dd7ed7d42e
Merge pull request #2942 from Joehuu/fix-footer-clicking-area
...
Fix FooterButton clicking area
2018-07-05 14:03:04 +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
b02603000e
Merge pull request #2947 from peppy/fix-popup-dialog-regression
...
Fix selecting a button on a dialog causing both that button and exit to animate
2018-07-04 12:04:56 +09: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
8ecd235820
Merge pull request #2931 from smoogipoo/non-null-nestedobjects
...
Tidy up lookups to nested hitobjects
2018-07-03 19:59:00 +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
Dean Herbert
5f33ab579e
Merge pull request #2944 from smoogipoo/fix-beatmap-deserialisation
...
Fix beatmap details not loading for unranked beatmaps
2018-07-03 16:06:46 +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
e37b931a55
Merge pull request #2932 from ekrctb/fix-menu-cursor-crash
...
Fix MenuCursor assertion failure when multiple mouse buttons pressed
2018-07-02 21:29:00 +09:00
Dean Herbert
627a5deff9
Merge branch 'master' into fix-menu-cursor-crash
2018-07-02 18:09:11 +09:00
Dan Balasescu
908f555a64
Merge pull request #2928 from peppy/fix-dialog-popups
...
Standardise input handling of popup dialogs
2018-07-02 18:09:02 +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
8f6ec0e7b1
Merge pull request #2690 from peppy/add-scroll-speed-keybinds
...
Add key bindings for scroll speed
2018-07-02 17:40:16 +09:00
Dan Balasescu
6abb3fa62c
Merge branch 'master' into add-scroll-speed-keybinds
2018-07-02 17:26:05 +09:00
Dan Balasescu
0123c76b3d
Merge pull request #2924 from peppy/fix-leaderboard-placeholder
...
Fix leaderboard showing placeholder briefly when entering song select
2018-07-02 17:25:31 +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
Dean Herbert
7c5ad43d22
Merge pull request #2934 from smoogipoo/fix-skin-crash
...
Fix crash if the skin stored in the config doesn't exist anymore
2018-07-02 17:07:47 +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
