1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 18:52:56 +08:00
Commit Graph

13720 Commits

Author SHA1 Message Date
Dean Herbert
0b30e6eb6a Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system 2018-07-06 17:55:02 +09:00
Dean Herbert
c025158735 Give VisibleState a default rather than nullable 2018-07-06 17:53:06 +09:00
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
a300b5c924
Merge pull request #2946 from peppy/go-forward
Add "Select" action
2018-07-06 16:48:37 +09:00
Dean Herbert
7120408a63 Add fallback "updater", which prompts the user to update 2018-07-06 16:46:22 +09:00
Dean Herbert
b8d314a809 Tidy up updater namespace 2018-07-06 16:39:27 +09:00
Dan Balasescu
8f3f872182
Merge branch 'master' into go-forward 2018-07-06 14:29:26 +09:00
Dan Balasescu
a1d2092cc9
Fix incorrect default drain time 2018-07-06 13:29:40 +09:00
Dan Balasescu
290812cf65
Merge branch 'master' into more-mania-conversion-fixes 2018-07-06 13:29:16 +09:00
Dean Herbert
7da5a2fec9
Merge pull request #2964 from johnneijzen/JSON-format-fix
Remove extra commas in vscode build configuration
2018-07-06 13:20:38 +09:00
Dean Herbert
56196885e6
Merge branch 'master' into JSON-format-fix 2018-07-06 11:41:28 +09:00
Dean Herbert
dffe6af5d9
Merge branch 'master' into fix-menu-cursor-animation 2018-07-06 11:29:53 +09:00
John Neijzen
7a09108387
Remove extra , make this valid JSON file 2018-07-05 22:38:34 +08:00
Dean Herbert
fa6ffe9a34
Merge pull request #2890 from ekrctb/fix-volme-meter
Update volume controls to use mouse wheel actions
2018-07-05 22:59:50 +09: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
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
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
miterosan
d791216505
Merge branch 'master' into Private_Messages 2018-07-03 07:58:15 +02: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