1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 19:27:31 +08:00
Commit Graph

21109 Commits

Author SHA1 Message Date
Dean Herbert
aa8b7b60de Merge remote-tracking branch 'upstream/master' into update-framework-blending 2019-08-21 13:30:24 +09:00
Dean Herbert
62218613da Merge remote-tracking branch 'smoogipoo/spritetext-glyph-rework' into update-framework-blending 2019-08-21 13:30:19 +09:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Dan Balasescu
f9d35c7e1b
Merge pull request #5775 from peppy/fix-skin-test-regression
Fix LegacySkin not checking for @2x hitcircle when deciding sizing
2019-08-21 12:55:56 +09:00
Dan Balasescu
758f10b9fd
Merge branch 'master' into fix-skin-test-regression 2019-08-21 12:45:47 +09:00
Dan Balasescu
873a984f3b
Merge pull request #5779 from iiSaLMaN/disallow-adding-bonus-judgements-to-statistics
Disallow adding bonus judgements to statistics
2019-08-21 12:21:37 +09:00
iiSaLMaN
439d825dd1 Disallow adding bonus judgements' result to statistics 2019-08-20 18:39:29 +03:00
smoogipoo
0de219dda4 Update with spritetext text builder changes 2019-08-20 19:03:57 +09:00
Dean Herbert
3b7cee2d45 Fix LegacySkin not checking for @2x hitcircle when deciding sizing 2019-08-20 13:50:16 +09:00
Dean Herbert
9ea4921e2b
Merge pull request #5036 from GSculerlor/difficulty-icon-tooltip
Add tooltips to difficulty icons with extra details
2019-08-19 17:23:13 +09:00
Dan Balasescu
e6860319e3
Merge pull request #5768 from peppy/centre-beatmap-panels
Centre beatmap panels in profile overlay
2019-08-19 14:06:45 +09:00
Dan Balasescu
18ee2f5e99
Merge branch 'master' into centre-beatmap-panels 2019-08-19 13:27:40 +09:00
Dan Balasescu
2137cd411f
Merge pull request #5764 from peppy/unpause-on-selection-change
Unpause music when changing selection at song select
2019-08-19 13:26:00 +09:00
Dean Herbert
be51fde292 Centre beatmap panels in profile overlay 2019-08-19 13:22:32 +09:00
Dan Balasescu
9c069f6f22
Merge branch 'master' into unpause-on-selection-change 2019-08-19 13:15:46 +09:00
Dan Balasescu
686942446c
Merge pull request #5763 from peppy/fix-tooltips-not-displaying
Fix osu! default tooltips not displaying
2019-08-19 13:00:51 +09:00
Dan Balasescu
01df3c982a
Merge branch 'master' into fix-tooltips-not-displaying 2019-08-19 12:51:06 +09:00
Ganendra Afrasya
7143497441 Match up tooltip background color with OsuTooltipContainer 2019-08-19 10:32:01 +07:00
Dan Balasescu
0f9c47686f
Merge branch 'master' into difficulty-icon-tooltip 2019-08-19 12:21:23 +09:00
Dan Balasescu
2797833883
Merge pull request #5744 from peppy/refactor-difficulty-colours
Replace DifficultyColouredContainer with a more scalable solution
2019-08-19 11:49:58 +09:00
Dan Balasescu
f20085df54
Merge branch 'master' into refactor-difficulty-colours 2019-08-19 11:39:19 +09:00
Dean Herbert
1f00793891 Unpause music when changing selection at song select 2019-08-19 11:30:04 +09:00
Dean Herbert
a51fbfa31b Fix osu! default tooltips not displaying 2019-08-19 10:46:28 +09:00
Dean Herbert
97580a4117
Add support for /users/ profile URLs (#5758)
Add support for /users/ profile URLs
2019-08-19 10:19:38 +09:00
Andrei Zavatski
015406f4d2 Fix link parser 2019-08-18 22:02:59 +03:00
Dean Herbert
ecc04baf14 Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip 2019-08-17 15:35:28 +09:00
Dean Herbert
87dc6499fa Fix json decoding being a bit too eager to consume 2019-08-17 15:34:02 +09:00
Dean Herbert
097763bb1c Add auto size duration 2019-08-17 15:29:39 +09:00
Dean Herbert
50046d5f69 Use new tooltip style 2019-08-17 15:20:27 +09:00
Dean Herbert
3dc81bdad5 Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip 2019-08-17 15:19:46 +09:00
Dean Herbert
4fa9abeece Replace DifficultyColouredContainer with a more scalable solution 2019-08-17 15:16:24 +09:00
Dean Herbert
f552de6ebc
Merge branch 'master' into difficulty-icon-tooltip 2019-08-17 13:45:20 +09:00
Dean Herbert
8258c4a80a
Merge pull request #5734 from smoogipoo/non-frame-stable-editor
Disable frame-stable playback in the editor

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-16 21:12:25 +09:00
Dean Herbert
152df9f3d5 Remove accidental blank line 2019-08-16 20:23:09 +09:00
Dean Herbert
3a4d65ef8b
Fix checkbox sounds playing too often (#5731)
Fix checkbox sounds playing too often
2019-08-16 20:22:41 +09:00
Dean Herbert
d11b896148 Move FrameStablePlayback handling to early return 2019-08-16 20:21:00 +09:00
Dean Herbert
58d2268b9e Combine conditionals that provide the same behaviour 2019-08-16 19:52:35 +09:00
Dean Herbert
aea4a69942
Update fastlane and dependencies (#5738)
Update fastlane and dependencies
2019-08-16 19:49:58 +09:00
Dean Herbert
132d51a2cc Update tooltip implementation 2019-08-16 19:47:35 +09:00
Dean Herbert
536e7d8757 Update framework 2019-08-16 19:32:17 +09:00
Dean Herbert
d771c271a3 Merge remote-tracking branch 'upstream/master' into fix-checkbox-sounds 2019-08-16 19:32:01 +09:00
Dean Herbert
3c208b709b Reorder functions in Fastfile for readability 2019-08-16 15:44:38 +09:00
Dean Herbert
7843b9c532 Update fastlane plugins 2019-08-16 15:44:17 +09:00
Dean Herbert
b2e05252d7 Update fastlane and dependencies 2019-08-16 14:16:00 +09:00
Dan Balasescu
8a5410eced
Merge pull request #5733 from peppy/reduce-hold-to-confirm-delay
Reduce delay for hold-to-confirm controls
2019-08-16 14:10:57 +09:00
Dan Balasescu
059d90bc42
Merge branch 'master' into reduce-hold-to-confirm-delay 2019-08-16 14:00:43 +09:00
Dan Balasescu
9874235a7f
Merge pull request #5730 from peppy/fix-song-select-context-menus
Fix song select context menus displaying off-screen
2019-08-16 13:58:42 +09:00
Dean Herbert
3949d46383 Add test fix to other test 2019-08-16 13:46:08 +09:00
Dean Herbert
d732d276b1 Make activation delay customisable 2019-08-16 13:21:41 +09:00
Dean Herbert
ff601eefe6 Fix failing test 2019-08-16 13:21:28 +09:00