1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 13:27:25 +08:00
Commit Graph

6498 Commits

Author SHA1 Message Date
Dan Balasescu
68f3a1ea9a
Merge branch 'master' into collection-database 2020-09-08 18:30:01 +09:00
smoogipoo
f581df47c8 Add "New collection..." item to dropdown 2020-09-08 18:25:09 +09:00
Dean Herbert
c3123bf117 Rename drag blueprint selection method for discoverability 2020-09-08 17:22:59 +09:00
smoogipoo
1260e30cde Make ShowDragHandle into a bindable 2020-09-08 16:36:36 +09:00
smoogipoo
c2da3d9c84 Fix button input and tests 2020-09-08 14:36:38 +09:00
smoogipoo
8a3c8a6185 Show button when selected or preselected 2020-09-08 14:03:49 +09:00
smoogipoo
32e3f5d091 Adjust button styling 2020-09-08 13:45:26 +09:00
Dean Herbert
8b770626fa Add missing '...' from some popup menu items 2020-09-08 12:18:08 +09:00
Dean Herbert
b15bbc882a Move items up in menu 2020-09-08 12:04:35 +09:00
Dean Herbert
3e5ea6c42f Change "Add to" to "Collections"
Doesn't make send to be 'add to' when it can also remove
2020-09-08 12:00:00 +09:00
Dean Herbert
9e559cb9ac
Merge branch 'master' into editor-new-beatmap 2020-09-08 02:58:38 +09:00
smoogipoo
ca4423af74 Fix tests 2020-09-08 00:07:12 +09:00
smoogipoo
e37c04cb6d Change back to solid icon 2020-09-08 00:04:03 +09:00
smoogipoo
a1214512bc Add filter control tests 2020-09-07 23:57:49 +09:00
smoogipoo
98e9c4dc25 General refactorings 2020-09-07 21:08:48 +09:00
smoogipoo
c1d255a04c Split filter control into separate class 2020-09-07 20:44:39 +09:00
smoogipoo
120dfd50a6 Fix collection names not updating in dropdown 2020-09-07 20:29:28 +09:00
smoogipoo
b91a376f0a Split dropdown into separate file 2020-09-07 20:06:38 +09:00
smoogipoo
6cc4517600 Merge branch 'master' into collection-database 2020-09-07 20:03:11 +09:00
Dan Balasescu
f19d9a29c5
Merge pull request #10077 from peppy/editor-bpm-usability
Improve usability of BPM modifying in timing setup view
2020-09-07 20:02:49 +09:00
Dean Herbert
6b50d44dde Merge branch 'master' into editor-new-beatmap 2020-09-07 18:43:16 +09:00
Dean Herbert
4792b44911 Merge branch 'master' into editor-new-beatmap 2020-09-07 18:42:51 +09:00
Dean Herbert
1468b9589f Increase max sane BPM value 2020-09-07 18:20:47 +09:00
Dean Herbert
98676af7bb Move default declarations for readability 2020-09-07 18:18:50 +09:00
Dean Herbert
86512d6e8d Add BPM entry textbox 2020-09-07 18:18:50 +09:00
Dean Herbert
6091714f15 Limit BPM entry via slider to a sane range 2020-09-07 18:18:50 +09:00
Dean Herbert
4680728b9c Merge branch 'master' into update-dcc-exclusions 2020-09-07 18:01:44 +09:00
Dan Balasescu
476c325626
Merge branch 'master' into gameplay-disable-overlays 2020-09-07 15:34:02 +09:00
smoogipoo
9ab6d584d3 Merge branch 'master' into editor-new-beatmap 2020-09-07 14:30:41 +09:00
Dan Balasescu
e17ccdfe9f
Merge branch 'master' into combo-colors 2020-09-07 13:55:41 +09:00
Bartłomiej Dach
f138b92078
Merge branch 'master' into editor-new-beatmap 2020-09-06 18:24:02 +02:00
smoogipoo
4b4dd02942 Make collection name a bindable 2020-09-05 04:43:59 +09:00
smoogipoo
345fb9d8e0 Rename classes 2020-09-05 03:55:43 +09:00
smoogipoo
ebd11ae0b7 Add a collection management dialog 2020-09-05 03:52:07 +09:00
smoogipoo
1143d5d992 Update class exclusion for dynamic compilation 2020-09-04 20:41:08 +09:00
Dan Balasescu
743c888986
Merge branch 'master' into expose-wedge-icons 2020-09-04 16:22:14 +09:00
Dan Balasescu
b631430a5b
Merge pull request #10045 from peppy/add-info-wedge-icons
Update and add missing beatmap statistic icons to info wedge
2020-09-04 16:22:01 +09:00
smoogipoo
4399f5976c Fix global mods being retained by rooms 2020-09-04 15:20:55 +09:00
Dean Herbert
25e142965d Strongly type and expose default beatmap information icon implementations for other rulesets 2020-09-04 15:01:32 +09:00
Dean Herbert
fba253f131 Take user argument in CreateNew method parameters 2020-09-04 13:17:43 +09:00
Dean Herbert
1f2f21e07a Merge branch 'master' into editor-new-beatmap 2020-09-04 13:11:59 +09:00
Dean Herbert
cd253ab055 Further tweaks to get closer to design originals 2020-09-04 13:05:39 +09:00
Dean Herbert
d6b46936a0 Adjust sizing to match updated textures with less padding 2020-09-04 12:55:28 +09:00
Lucas A
82e314da59 Fix merge conflicts. 2020-09-03 21:56:47 +02:00
Dean Herbert
a99e7a1dc2 Merge branch 'master' into add-info-wedge-icons 2020-09-03 21:57:58 +09:00
Dan Balasescu
4d9a5f7ba8
Merge branch 'master' into update-icons 2020-09-03 20:19:51 +09:00
Dean Herbert
7a0c1411b6
Merge branch 'master' into timeshift-leaderboard-topscore 2020-09-03 18:11:04 +09:00
Dean Herbert
72cb65c22f Update and add missing beatmap statistic icons to info wedge 2020-09-03 17:52:22 +09:00
Dean Herbert
942276d88f Remove outdated SearchableList classes 2020-09-03 16:34:58 +09:00
Dean Herbert
4c011a88ce
Merge branch 'master' into update-framework 2020-09-03 15:08:18 +09:00
Dean Herbert
fe524ec491 Merge branch 'master' into update-framework 2020-09-03 14:58:32 +09:00
Dan Balasescu
cf89a6e1a4
Merge pull request #10043 from peppy/better-outro-music-fade
Improve music fade on game exit
2020-09-03 14:24:46 +09:00
Dan Balasescu
84b3604192
Merge branch 'master' into game-overlay-activation-mode 2020-09-03 13:34:22 +09:00
Dean Herbert
d849f7f2b5 Use the local user's username when saving a new beatmap 2020-09-03 13:20:23 +09:00
Dean Herbert
e032844570 Start with a fresh beatmap when entering editor from main menu 2020-09-03 13:20:23 +09:00
Dean Herbert
2f42c57f4b Add safeties to ensure the current track doesn't loop or change 2020-09-03 13:15:23 +09:00
Dean Herbert
547c8090e5 Improve game exit music fade 2020-09-03 13:15:23 +09:00
Lucas A
754274a146 Fix and add XMLDoc 2020-09-02 20:55:26 +02:00
Lucas A
3fc6a74fdf Expose an immutable bindable in interface. 2020-09-02 19:55:46 +02:00
smoogipoo
fca0324264 Disallow being able to add dummy beatmap 2020-09-02 23:34:38 +09:00
smoogipoo
d83264f538 Add max height 2020-09-02 22:56:13 +09:00
smoogipoo
7fcbc3a814 Respond to changes in beatmap 2020-09-02 22:06:17 +09:00
smoogipoo
661eac8f1d Add add/remove button to dropdown items 2020-09-02 22:03:38 +09:00
smoogipoo
02a908752f Fix stackoverflow 2020-09-02 21:52:56 +09:00
smoogipoo
5ebead2bfd Prevent ValueChanged binds to external bindable 2020-09-02 21:44:07 +09:00
smoogipoo
d363a5d164 Add basic ordering 2020-09-02 21:19:15 +09:00
smoogipoo
094ddecc95 Add dropdowns to carousel items 2020-09-02 21:08:31 +09:00
smoogipoo
6d5e155106 Change to BindableList to notify of changes 2020-09-02 20:44:26 +09:00
smoogipoo
9dde37fe40 Hook up collection filter 2020-09-02 20:25:42 +09:00
smoogipoo
bb090a55e0 Add dropdown to filter control 2020-09-02 20:25:25 +09:00
Dean Herbert
6a765d2d76 Add smooth fading between audio tracks on transition 2020-09-02 20:04:56 +09:00
Dean Herbert
c964e4036e Merge branch 'master' into update-framework 2020-09-02 15:49:19 +09:00
Dean Herbert
249ae5df1b
Merge branch 'master' into beatmap-track-rework 2020-09-02 15:24:46 +09:00
smoogipoo
7a6e02c558 Allow null rank 2020-09-02 14:28:31 +09:00
Craftplacer
c2ade44656 Change types back 2020-09-01 17:58:06 +02:00
Craftplacer
9835d98942 Merge remote-tracking branch 'upstream/master' into combo-colors 2020-09-01 17:39:35 +02:00
smoogipoo
7e1844ed77 Fix track adjusments being reset incorrectly 2020-09-01 18:07:19 +09:00
smoogipoo
26b4226b55 Fix ModTimeRamp not working 2020-09-01 16:55:10 +09:00
Dan Balasescu
f08e7828da
Merge branch 'master' into beatmap-track-rework 2020-09-01 16:06:38 +09:00
smoogipoo
9e3b809cab Rename to user_score to match API 2020-09-01 15:42:47 +09:00
Dean Herbert
d1f79a6a48 Fix potentially incorrect zoom level getting set on very short audio
track
2020-09-01 15:41:36 +09:00
Dean Herbert
d45a1521a1 Update BindableList usages 2020-09-01 11:56:23 +09:00
Dean Herbert
44c02d7d58
Merge branch 'master' into wedge-star-difficulty 2020-09-01 09:33:28 +09:00
Bartłomiej Dach
876fd21230 Apply shear to right-anchored items 2020-08-31 19:31:47 +02:00
Bartłomiej Dach
2e2f26449d Change anchoring to TopRight 2020-08-31 19:23:19 +02:00
Bartłomiej Dach
3ca2a7767a Exclude misses and empty window hits from UR calculation 2020-08-31 14:29:37 +02:00
Bartłomiej Dach
3b22b891d1 Add failing test cases 2020-08-31 14:29:18 +02:00
smoogipoo
5e77e8cfcf Reduce min size of chat 2020-08-31 20:21:57 +09:00
smoogipoo
61d580b6ba Don't highlight top score 2020-08-31 20:17:23 +09:00
smoogipoo
8cf26979fb Allow null user score 2020-08-31 20:16:28 +09:00
smoogipoo
6ed191786f Add support for position 2020-08-31 20:01:59 +09:00
smoogipoo
77698ec31e Add support for showing own top score in timeshift 2020-08-31 19:54:57 +09:00
smoogipoo
d1ceb81797 Rename request 2020-08-31 19:54:41 +09:00
smoogipoo
ed74c39b55 Move UserTopScoreContainer into base leaderboard 2020-08-31 19:54:22 +09:00
Bartłomiej Dach
88ae9ca91d
Merge branch 'master' into fix-unhide-hud-not-updating-stats 2020-08-31 11:48:19 +02:00
Dan Balasescu
cccf5b8a35
Merge pull request #10017 from peppy/fix-first-editor-scroll-wheel
Fix first scroll wheel in editor incorrectly advancing twice
2020-08-31 18:32:34 +09:00
Lucas A
dd093f44d8 Cast base immutable bindable to mutable for testing purposes and make InitialOverlayActivationMode property protected 2020-08-31 11:26:55 +02:00
Dean Herbert
a171d0e292 Remove unused methods and classes 2020-08-31 18:14:22 +09:00
Bartłomiej Dach
7d273d631b Do not show star difficulty on wedge if zero 2020-08-31 11:05:42 +02:00
Dean Herbert
bee01bdd38 Fix first scroll wheel in editor incorrectly advancing twice 2020-08-31 18:01:16 +09:00