Commit Graph

13424 Commits

Author SHA1 Message Date
49e94850b6 Fix being able to trigger player before carousel is ready
Causes an eventual crash.
2018-07-09 18:43:20 +09:00
ce0a7d7760 Merge pull request #2978 from HoutarouOreki/removeAge
Remove unused age display code
2018-07-09 18:17:12 +09:00
6ced51bb67 Merge branch 'master' into removeAge 2018-07-09 17:43:23 +09:00
10cc95427d Merge pull request #2977 from smoogipoo/fix-nullrefs
Fix some possible null reference exceptions
2018-07-09 17:43:01 +09:00
10aae3b0ee Remove age from User class 2018-07-09 10:33:46 +02:00
930667d0f9 Remove unused age display code 2018-07-09 10:12:10 +02:00
0a67e5a274 Fix some possible null reference exceptions 2018-07-09 17:09:17 +09:00
1444715641 Merge pull request #1 from ppy/master
Sync to upstream repo
2018-07-09 09:07:59 +02:00
27311ce1fc Update nuget restore instructions 2018-07-08 11:21:18 +09:00
f92a90c098 Update README.md 2018-07-08 02:03:42 +09:00
c194618df3 Merge pull request #2876 from smoogipoo/more-mania-conversion-fixes
Fix more instances of osu!mania beatmap conversion failing
2018-07-08 01:54:59 +09:00
ad51d95c1a Merge branch 'master' into more-mania-conversion-fixes 2018-07-08 01:44:06 +09:00
d1846e6128 Merge pull request #2933 from ekrctb/fix-menu-cursor-animation
Fix menu cursor not highlighting when pressing multiple buttons
2018-07-06 17:56:38 +09:00
c4952569cc Merge branch 'master' into fix-menu-cursor-animation 2018-07-06 17:46:29 +09:00
54db287791 Remove casting 2018-07-06 17:45:39 +09:00
a300b5c924 Merge pull request #2946 from peppy/go-forward
Add "Select" action
2018-07-06 16:48:37 +09:00
8f3f872182 Merge branch 'master' into go-forward 2018-07-06 14:29:26 +09:00
a1d2092cc9 Fix incorrect default drain time 2018-07-06 13:29:40 +09:00
290812cf65 Merge branch 'master' into more-mania-conversion-fixes 2018-07-06 13:29:16 +09:00
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
56196885e6 Merge branch 'master' into JSON-format-fix 2018-07-06 11:41:28 +09:00
dffe6af5d9 Merge branch 'master' into fix-menu-cursor-animation 2018-07-06 11:29:53 +09:00
7a09108387 Remove extra , make this valid JSON file 2018-07-05 22:38:34 +08:00
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
7e28a993f7 Update framework 2018-07-05 21:08:53 +09:00
e5001b84bd Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter 2018-07-05 21:04:19 +09:00
5f5790f566 Merge branch 'master' into fix-menu-cursor-animation 2018-07-05 21:04:06 +09:00
6ae342d1a0 Merge pull request #2929 from smoogipoo/hitobject-samples
Add support for HitObject level custom samples
2018-07-05 20:28:07 +09:00
8f04acc506 Add missing xmldoc 2018-07-05 20:16:55 +09:00
4f894969df Merge branch 'master' into hitobject-samples 2018-07-05 19:43:19 +09:00
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
d825eec364 Merge remote-tracking branch 'upstream/master' into LastExceed-fix-BASS-not-being-loaded-on-linux 2018-07-05 19:30:01 +09:00
7328121ef5 Remove LD_PRELOAD as it is now unnecessary 2018-07-05 19:29:49 +09:00
ef5fa978c7 Merge pull request #2908 from smoogipoo/legacy-custom-banks
Add support for multiple sample banks
2018-07-05 19:14:21 +09:00
bbceac6cda Apply renaming of wheel -> scroll 2018-07-05 16:50:04 +09:00
44aecdc3a0 Rename method to EquivalentTo 2018-07-05 15:00:02 +09:00
d11ba2df0e Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks 2018-07-05 14:53:31 +09:00
dd7ed7d42e Merge pull request #2942 from Joehuu/fix-footer-clicking-area
Fix FooterButton clicking area
2018-07-05 14:03:04 +09:00
aea1299762 Merge branch 'master' into fix-footer-clicking-area 2018-07-05 13:39:53 +09:00
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
7a4d3f9ffa Merge branch 'master' into fix-popup-dialog-regression 2018-07-04 11:15:18 +09:00
8ecd235820 Merge pull request #2931 from smoogipoo/non-null-nestedobjects
Tidy up lookups to nested hitobjects
2018-07-03 19:59:00 +09:00
1e1ff8339e Merge branch 'master' into non-null-nestedobjects 2018-07-03 19:43:46 +09:00
5fc17bacf3 Add "Select" action
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
b33206c212 Fix selecting a button on a dialog causing both that button and exit to animate 2018-07-03 18:35:09 +09:00
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
73851fb194 Fix beatmap details not working for unranked beatmaps 2018-07-03 15:57:05 +09:00
f9f192ce34 Modify MenuCursor hightlight animation 2018-07-03 15:15:03 +09:00
d476842c44 Fix FooterButton clicking area 2018-07-02 22:03:17 -07:00
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