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

11781 Commits

Author SHA1 Message Date
smoogipoo
1bab601cbc Comments + xmldocs 2018-04-20 13:51:36 +09:00
smoogipoo
ea0683adb2 Fix hitobject lengths not being calculated for overlapping speed changes
Fixes #2359
2018-04-16 20:34:59 +09:00
Dean Herbert
af154e66a2
Merge pull request #2402 from FreezyLemon/fix-button-kb-input
Make buttons only accept input when expanded
2018-04-16 03:20:31 +09:00
Dean Herbert
c3086531e0 Update framework 2018-04-16 02:54:24 +09:00
Dean Herbert
9eb04a5fc8
Merge branch 'master' into fix-button-kb-input 2018-04-16 02:48:51 +09:00
Dean Herbert
0490c523a6
Merge pull request #2397 from smoogipoo/instant-hide-screenshot
Hide menu cursor when taking screenshots by default
2018-04-16 01:05:49 +09:00
Dean Herbert
2eefe722f3 Move cache to a slightly more familiar place and add comment 2018-04-16 00:38:32 +09:00
Dean Herbert
96ef564f44 Remove unused field 2018-04-16 00:25:09 +09:00
Dean Herbert
c095fe1919 Update framework 2018-04-16 00:21:03 +09:00
Dean Herbert
c9615f837a Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot 2018-04-16 00:20:06 +09:00
Dean Herbert
779d5a578b
Merge pull request #2383 from DrabWeb/wave-container
Wave container
2018-04-15 21:22:54 +09:00
Dean Herbert
ae77c010e2 Merge remote-tracking branch 'upstream/master' into wave-container 2018-04-15 21:03:18 +09:00
Dean Herbert
e512e4bacb
Merge pull request #2360 from UselessToucan/profile_multiple_audio_previews
Handle multiple song previews playing in different beatmap categories…
2018-04-15 16:22:52 +09:00
Dean Herbert
fd54ae3c87 Simplify logic 2018-04-15 16:12:42 +09:00
Dean Herbert
069d48ac14 Remove unused variable 2018-04-15 15:29:00 +09:00
TocoToucan
671de4f6c2 Resolve merge conflicts 2018-04-14 15:11:28 +03:00
FreezyLemon
3ece54e1c3 make buttons only accept input when expanded
both other states are "inactive"/invisible so should never accept keyboard input
2018-04-14 00:08:54 +02:00
Dan Balasescu
f59eef072d
Merge pull request #2389 from UselessToucan/ignored_input_handler
Fix new input handlers not being enabled by default
2018-04-13 22:36:04 +09:00
smoogipoo
a6dfe0d4c9 Final framework update 2018-04-13 22:24:19 +09:00
smoogipoo
fe77417e03 Merge remote-tracking branch 'origin/master' into ignored_input_handler 2018-04-13 22:23:33 +09:00
Dan Balasescu
aadde08396
Merge pull request #2399 from FreezyLemon/update-nunit-3.10.1
Update NUnit to version 3.10.1
2018-04-13 22:22:37 +09:00
Dan Balasescu
258e17566c
Merge branch 'master' into update-nunit-3.10.1 2018-04-13 22:05:26 +09:00
Dean Herbert
a0f9f8d512 Update frramework again 2018-04-13 21:47:50 +09:00
smoogipoo
cf65833572 Reword xmldoc 2018-04-13 21:15:08 +09:00
smoogipoo
733f70cbd5 Merge remote-tracking branch 'origin/master' into instant-hide-screenshot 2018-04-13 21:13:09 +09:00
smoogipoo
34adb2527c A lot more protection from outsiders 2018-04-13 21:12:33 +09:00
smoogipoo
cd594ce12b BDL cache screenshot manager 2018-04-13 20:46:01 +09:00
FreezyLemon
4b3a129738 bump NUnit to version 3.10.1 2018-04-13 13:19:52 +02:00
Dean Herbert
9f5a52b641 Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler 2018-04-13 19:54:15 +09:00
Dean Herbert
e962bc312e Update framework 2018-04-13 19:53:29 +09:00
Dan Balasescu
632befb210
Merge pull request #2378 from peppy/fix-line-endings
Normalize line endings to LF
2018-04-13 19:47:30 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
f99503b60c Add new gitattributes 2018-04-13 18:19:38 +09:00
Dean Herbert
5f020074e0
Merge pull request #2332 from LittleEndu/alt-eagerselect
Make beatmap carousel select a random beatmap when there was no previous selection
2018-04-13 18:11:45 +09:00
Dean Herbert
a1a7e63646
Merge branch 'master' into ignored_input_handler 2018-04-13 18:05:12 +09:00
Endrik Tombak
d9f587edff Merge remote-tracking branch 'upstream/master' into alt-eagerselect 2018-04-13 11:55:35 +03:00
smoogipoo
0235eba9de Make TakeScreenshotAsync await on the internal task 2018-04-13 17:51:09 +09:00
smoogipoo
2e5bbe7074 Don't expose CursorOverrideContainer via DI + internalise access 2018-04-13 17:36:38 +09:00
smoogipoo
826a8552e5 Reword options item to include "screenshot" 2018-04-13 17:30:02 +09:00
smoogipoo
ebe36f0612 Instantly hide cursor for required frames while taking screenshot 2018-04-13 17:27:10 +09:00
Dean Herbert
06efddd4b4
Merge pull request #2394 from UselessToucan/beatmap_set_overlay_difficulties_ordering
Fix incorrect ordering of difficulties retrieved from API
2018-04-13 17:09:48 +09:00
Dean Herbert
f7c50dee65
Merge branch 'master' into beatmap_set_overlay_difficulties_ordering 2018-04-13 16:48:43 +09:00
Dan Balasescu
0871c16075
Merge pull request #2390 from Joehuu/lowercase-back-button
Lowercase back button
2018-04-13 14:25:23 +09:00
Dan Balasescu
2699ad8c89
Merge branch 'master' into lowercase-back-button 2018-04-13 14:14:18 +09:00
Dean Herbert
68d865bbd1
Merge pull request #2396 from Joehuu/remove-composer-from-player-loader
Remove composer from player loader
2018-04-13 13:08:13 +09:00
Joehu
128446e51d Remove composer from player loader 2018-04-12 16:46:46 -07:00
TocoToucan
9acea6eab0 Order beatmap difficulty icons correctly 2018-04-12 19:33:30 +03:00
Joehu
61d6f52a53 Lowercase back button 2018-04-12 08:26:25 -07:00
Dean Herbert
ea24006a66
Merge pull request #2372 from smoogipoo/remove-gamefield-test
Remove TestCaseGamefield
2018-04-12 23:50:16 +09:00
TocoToucan
7c3441e2d0 ActiveInputHandlers -> IgnoredInputHandler 2018-04-12 17:06:35 +03:00