RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,574 Commits 3 Branches 651 Tags 357 MiB
Commit Graph

9574 Commits

Author SHA1 Message Date
Dean Herbert 94449ed597
Merge branch 'master' into notification-verbosity 2017-12-26 20:48:59 +09:00
Dean Herbert 35ae5173cd
Merge branch 'master' into better-notification-delays 2017-12-26 20:48:41 +09:00
Dean Herbert 50bb9d4a01
Merge pull request #1720 from Aergwyn/hide-useless-beatmap-info 
Hide unnecessary lines on empty BeatmapInfoWedge
 2017-12-26 20:47:30 +09:00
Dean Herbert 3182c22c7d Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info 2017-12-26 20:36:22 +09:00
Dean Herbert 7504cd589d Move alpha handling to state 2017-12-26 20:18:47 +09:00
Dan Balasescu f6a5f773c4
Merge pull request #1726 from peppy/fix-info-wedge 
Fix beatmap info wedge not showing up when zero beatmaps are loaded
 2017-12-26 20:16:40 +09:00
Dean Herbert 1c4bcdda96 Fix test race condition 
async loads
 2017-12-26 20:13:55 +09:00
smoogipoo d479955e20 Fix spelling error 2017-12-26 20:01:02 +09:00
smoogipoo 0c4e4012f8 Taiko drumroll ticks should just play the playfield samples 2017-12-26 19:57:40 +09:00
smoogipoo 9690591593 Make taiko use namespaced hitsounds 
This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.
 2017-12-26 19:55:56 +09:00
Aergwyn f5d4ed2a22 add interface to adjust DrawableHitObjects 2017-12-26 11:49:42 +01:00
Dean Herbert ee67e7119d Merge remote-tracking branch 'upstream/master' into fix-info-wedge 2017-12-26 19:44:28 +09:00
Aergwyn 44fbe7859a move anchor and origin so metadata doesn't move if it's partially empty 2017-12-26 11:34:26 +01:00
smoogipoo c74561b3d4 Add test case for InputDrum 2017-12-26 19:33:28 +09:00
smoogipoo 3113a55a98 Make ControlPointInfo return a set default control point 2017-12-26 19:33:01 +09:00
smoogipoo 836d807f4f Give SampleControlPoint a 100% volume by default 2017-12-26 19:32:20 +09:00
Dan Balasescu 2aea729062
Merge pull request #1759 from peppy/quieter-notifications 
Fix notification read lamp and notification count
 2017-12-26 18:35:25 +09:00
Dan Balasescu 460eeafd32
Merge branch 'master' into quieter-notifications 2017-12-26 18:18:28 +09:00
Dean Herbert 2fb619ed2d
Merge pull request #1733 from smoogipoo/fix-taiko-stronghit 
Yet another rework of sound handling in taiko
 2017-12-26 18:15:06 +09:00
Dean Herbert cf71ffdb6c
Merge branch 'master' into fix-taiko-stronghit 2017-12-26 18:06:07 +09:00
Dan Balasescu b7c2461a39
Merge pull request #1742 from peppy/improve-screen-offset 
Add special logic to song select to avoid obvious clipping when notifications are displayed
 2017-12-26 18:01:28 +09:00
Dan Balasescu 11542b697c
Merge branch 'master' into improve-screen-offset 2017-12-26 17:53:13 +09:00
Dan Balasescu e65aba83fa
Merge pull request #1749 from peppy/beatmap-import-prompt 
Add a dialog offering to import beatmaps from stable
 2017-12-26 16:53:45 +09:00
Dean Herbert 3f1ced618a Update framework 2017-12-26 16:15:15 +09:00
Dean Herbert ab6c93fba4
Merge branch 'master' into notification-verbosity 2017-12-26 16:14:24 +09:00
Dean Herbert 3524ad3dc2 Merge remote-tracking branch 'upstream/master' into better-notification-delays 2017-12-26 16:10:57 +09:00
Dean Herbert f737a64189 Remove ScreenChanged 2017-12-26 16:09:40 +09:00
Dan Balasescu f7a54a203b
Merge branch 'master' into beatmap-import-prompt 2017-12-26 16:00:37 +09:00
Dan Balasescu 678ab2a177
Merge pull request #1748 from peppy/popup-word-wrap 
Add word wrapping support for popup dialog text
 2017-12-26 15:56:36 +09:00
Dean Herbert c15b2382a2 Remove unused variable 2017-12-26 15:56:32 +09:00
Dean Herbert 24d8d357d0 Only bounce and flash notification count when increasing 2017-12-26 15:54:37 +09:00
Dean Herbert 45b3acdd6f Fix progress notifications not closing properly when opening their continuation 2017-12-26 15:54:33 +09:00
Dean Herbert ed1df94f77 Fix unread light not turning off 2017-12-26 15:54:28 +09:00
Dan Balasescu ef0031a719
Merge branch 'master' into popup-word-wrap 2017-12-26 15:47:58 +09:00
Dan Balasescu 6c6704e6a6
Merge pull request #1750 from peppy/osu-prefixed-text 
Fix many instances of non-osu-prefixed text classes being used
 2017-12-26 15:47:52 +09:00
Dan Balasescu d089e27cad
Merge branch 'master' into osu-prefixed-text 2017-12-26 15:40:29 +09:00
Dan Balasescu 4340cff697
Merge pull request #1751 from peppy/quieter-notifications 
Quieter notification overlay
 2017-12-26 15:40:24 +09:00
Dean Herbert 024d9a6850 Remove unnecessary null check 2017-12-26 15:33:02 +09:00
Dean Herbert e14ad31a07 Increase wait durations for test stability 2017-12-26 15:32:53 +09:00
Dean Herbert 9ccc49c9b5 Make selection triggering more liberal 2017-12-26 15:32:39 +09:00
Dan Balasescu ad811961a7
Merge branch 'master' into quieter-notifications 2017-12-26 15:30:12 +09:00
Dean Herbert b36dd21f07
Merge branch 'master' into fix-info-wedge 2017-12-26 15:09:21 +09:00
Dean Herbert ed7ae4e956
Merge branch 'master' into fix-info-wedge 2017-12-26 15:08:52 +09:00
Dean Herbert 99a44e6d79 Allow testbrowser's rate adjust to affect TestCasePlayer 2017-12-26 15:03:45 +09:00
Dean Herbert 9fb958eadc Make TestCasePlayer more usable 
No results screen crash, no unnecessary leadin time.
 2017-12-26 14:23:14 +09:00
smoogipoo 35d7fa8a81 Cleanup things that are now not needed with these changes 2017-12-26 14:18:38 +09:00
smoogipoo 14162b5d46 Make InputDrum handle all Normals/Claps, hitobjects all others 2017-12-26 14:18:23 +09:00
Dean Herbert 07d753441d
Merge pull request #1753 from FreezyLemon/fix-hiding-last-map 
Trigger null-selection in SongSelect when the last beatmap is hidden
 2017-12-26 13:51:08 +09:00
Dean Herbert 09ce24a7db Switch to a better way of deciding on null selection 
This avoids `SelectionChanged` potentially being invoked multiple times after `selectedBeatmapSet` is already `null`.
 2017-12-26 13:41:02 +09:00
Dean Herbert 2473f6de46
Merge branch 'master' into fix-hiding-last-map 2017-12-26 13:32:33 +09:00