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

14919 Commits

Author SHA1 Message Date
Dean Herbert
a918e83b1e Add drawings screen 2018-11-04 04:58:59 +09:00
Dean Herbert
b610095ff5 Update drawings design 2018-11-04 04:58:40 +09:00
Dean Herbert
5006dc47a3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-04 02:26:17 +09:00
Dean Herbert
7473349a9a
Merge pull request #3674 from FreezyLemon/binary-bmfont
Use binary bitmap fonts
2018-11-04 02:23:38 +09:00
FreezyLemon
56ff2686ac Update osu-resources and osu-framework to use binary fonts 2018-11-03 18:09:11 +01:00
Dean Herbert
9f5546fd62 Fix API regression in direct 2018-11-02 21:13:46 +09:00
Dean Herbert
54fede4559
Merge pull request #3644 from smoogipoo/slider-placement
Implement slider placement
2018-11-02 20:27:58 +09:00
Dean Herbert
63cbc8e0e8
Merge branch 'master' into slider-placement 2018-11-02 19:45:34 +09:00
Dean Herbert
e2c520770e
Merge pull request #3657 from smoogipoo/spinner-placement-2
Implement spinner placements
2018-11-02 19:45:09 +09:00
Dean Herbert
ad49dca86e
Merge branch 'master' into spinner-placement-2 2018-11-02 19:32:52 +09:00
Dean Herbert
16d9ab2a0e
Merge pull request #3656 from smoogipoo/spinner-selection
Implement spinner selections
2018-11-02 19:32:33 +09:00
Dean Herbert
e6ee3dc73e Use framework helper functions for path approximation 2018-11-02 19:26:29 +09:00
Dean Herbert
79611eee7d
Merge branch 'master' into spinner-selection 2018-11-02 19:24:09 +09:00
Dean Herbert
edd7feda20
Merge pull request #3668 from peppy/fix-path-control-point-drag
Fix not being able to drag control points mid-snake
2018-11-02 13:45:12 +09:00
Dan Balasescu
7b9afe9cf7
Merge branch 'master' into fix-path-control-point-drag 2018-11-02 13:04:04 +09:00
Dean Herbert
ef1416c297
Merge pull request #3663 from peppy/fix-disk-space-errors
Don't log disk space related IO errors
2018-11-02 13:03:08 +09:00
Dan Balasescu
173d2904b8
Merge branch 'master' into fix-disk-space-errors 2018-11-02 12:15:13 +09:00
Dean Herbert
7f1ee3bcb4 Disallow spinner movement for now 2018-11-02 12:06:53 +09:00
Dean Herbert
0a0023920f Fix not being able to drag control points mid-snake 2018-11-02 04:09:33 +09:00
smoogipoo
2ac4f2b6af Lock spinners to centre of screen 2018-11-01 19:24:58 +09:00
smoogipoo
d78348f178 Reduce duplicate code 2018-11-01 19:23:37 +09:00
smoogipoo
1aae123ff5 Make approximators share an interface 2018-11-01 19:16:44 +09:00
Dean Herbert
1265d5ac0b
Merge branch 'master' into spinner-placement-2 2018-11-01 18:05:44 +09:00
Dean Herbert
c1304eca1b Merge remote-tracking branch 'upstream/master' into slider-placement 2018-11-01 17:59:37 +09:00
Dean Herbert
0f1ffe392f Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-01 17:52:24 +09:00
Dean Herbert
5fd21d35dc
Merge branch 'master' into spinner-selection 2018-11-01 17:47:59 +09:00
Dean Herbert
e13e4b7308
Merge pull request #3655 from smoogipoo/slider-controlpoint-masks
Implement slider controlpoint visualisation
2018-11-01 17:39:27 +09:00
Dean Herbert
bb2f8deb18 ControlPoint -> PathControlPoint
Also Curve -> Path.
2018-11-01 03:56:51 +09:00
Dean Herbert
9cb4374b51
Merge branch 'master' into slider-controlpoint-masks 2018-11-01 02:37:31 +09:00
smoogipoo
ffec532079 Fix segment control points not changing in unison 2018-10-31 19:02:47 +09:00
smoogipoo
d2fbf05137 Reduce size of control point 2018-10-31 18:01:53 +09:00
Dan Balasescu
4c358a3d4d
Merge pull request #3664 from peppy/fix-scroll-handling
Fix placement masks handling scroll events
2018-10-31 17:38:18 +09:00
Dean Herbert
85a7325911 Fix placement masks handling scroll events 2018-10-31 17:23:27 +09:00
Dean Herbert
9aa88293e2 Use HResult 2018-10-31 17:07:05 +09:00
Dean Herbert
29a1d092fa Don't log disk space related IO errors 2018-10-31 16:43:35 +09:00
Dean Herbert
d38bf38606
Merge branch 'master' into slider-controlpoint-masks 2018-10-31 15:23:30 +09:00
Dean Herbert
f6666e6ecc
Merge pull request #3643 from smoogipoo/editor-mask-placement
Implement editor hitobject placement
2018-10-31 15:14:23 +09:00
Dean Herbert
d7f3e51050
Merge branch 'master' into editor-mask-placement 2018-10-31 15:00:38 +09:00
Dan Balasescu
a67abcaeb8
Merge pull request #3662 from qwewqa/editor-track-playing-fix
Fix track being played when entering editor
2018-10-31 14:21:49 +09:00
Kyle Chang
214ed43b81 Check if SongSelect is current screen before playing selected song 2018-10-30 23:47:54 -04:00
Dean Herbert
5eaf80ab76 Add missing newline 2018-10-31 12:07:06 +09:00
Dean Herbert
3207a585c6 Add missing xmldoc 2018-10-31 12:01:10 +09:00
Dean Herbert
b28c0cd128
Merge branch 'master' into editor-mask-placement 2018-10-31 06:46:48 +09:00
Dean Herbert
6851696f63
Merge pull request #3642 from smoogipoo/selection-mask-testcase
Add testcases for selection masks
2018-10-31 06:28:08 +09:00
Dean Herbert
7e88b8b457
Merge branch 'master' into selection-mask-testcase 2018-10-31 06:14:33 +09:00
Dean Herbert
72d0b5b46b
Merge pull request #3641 from smoogipoo/mask-separation
Separate hitobject mask visuals from selection logic
2018-10-31 06:14:14 +09:00
Dean Herbert
5f5e30c378
Merge branch 'master' into mask-separation 2018-10-31 05:59:07 +09:00
Dean Herbert
98633f02f3
Merge pull request #3611 from plankp/reduce-handle-height
Reduce height of song progress handle
2018-10-31 03:28:12 +09:00
Dean Herbert
6f1ef3243d Proportionally adjust width in line with change 2018-10-31 02:56:25 +09:00
Dean Herbert
4502fa39e9 Merge remote-tracking branch 'upstream/master' into reduce-handle-height 2018-10-31 02:55:38 +09:00