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

28150 Commits

Author SHA1 Message Date
Dean Herbert
0c60dbe796
Merge branch 'master' into editor-undo-redo 2020-04-13 16:03:53 +09:00
Dean Herbert
c9d007a0a1
Merge pull request #8731 from LittleEndu/present-from-overlay
Make beatmap info overlay present selected difficulty
2020-04-13 15:34:18 +09:00
Dean Herbert
142cddfb10 Rename CurrentBeatmap to SelectedBeatmap 2020-04-13 15:13:35 +09:00
Dean Herbert
72fb466a0b
Merge branch 'master' into present-from-overlay 2020-04-13 15:01:24 +09:00
Dean Herbert
886914cfe9
Merge pull request #8733 from TheWildTree/remove-old-comments
Remove unused changelog comments class
2020-04-13 13:15:31 +09:00
Bartłomiej Dach
3efb4aba25 Use BindTarget 2020-04-12 19:48:15 +02:00
Endrik Tombak
1cf240b5ff Test new predicate behaviour 2020-04-12 20:04:25 +03:00
Endrik Tombak
3b9e0fa67d Use readonly IBindable 2020-04-12 19:42:28 +03:00
Endrik Tombak
ed28e8c8f5 Rename param 2020-04-12 19:38:09 +03:00
Endrik Tombak
ecd25e567d Present selected difficulty 2020-04-12 16:00:05 +03:00
TheWildTree
07dc277321 Remove unused changelog comments class 2020-04-12 14:55:42 +02:00
Dean Herbert
2393ce5f51
Merge pull request #8337 from smoogipoo/add-notelock
Block out-of-order judgements from occurring (aka "note lock")
2020-04-12 00:34:21 +09:00
Dean Herbert
3b6d893dcf
Merge branch 'master' into add-notelock 2020-04-11 23:42:00 +09:00
Dean Herbert
4d0454f2bf
Merge pull request #8712 from peppy/update-framework
Update framework
2020-04-11 17:29:11 +09:00
smoogipoo
a84fe2525b Fix nested hitobjects potentially indirectly masked away 2020-04-11 16:53:45 +09:00
Dean Herbert
eb1fbdacde Remove unintentional edge effect 2020-04-11 15:29:52 +09:00
Dean Herbert
12c21cba7e Add missing masking specification 2020-04-11 15:20:27 +09:00
Dean Herbert
e206df479b Update framework 2020-04-11 15:13:20 +09:00
Dean Herbert
3a36c0008f
Merge pull request #8703 from smoogipoo/fix-editorbeatmap-updates
Fix EditorBeatmap potentially not updating hitobjects
2020-04-10 23:36:12 +09:00
smoogipoo
41caa37856 Add tests 2020-04-10 13:29:49 +09:00
smoogipoo
ee7e2b0854 Fix editor beatmap potentially not updating hitobjects 2020-04-10 13:29:46 +09:00
smoogipoo
6988df30bd Rename variable, add comment 2020-04-10 03:12:13 +09:00
smoogipoo
15a92d1451 Rename test scene 2020-04-10 03:07:44 +09:00
smoogipoo
42b3ff805b Rename methods + fix incorrect method usage 2020-04-10 03:07:44 +09:00
smoogipoo
b54bbc5f6a Improve commenting + refactor 2020-04-10 02:41:48 +09:00
smoogipoo
10e849d196 Separate into separate class 2020-04-10 02:02:09 +09:00
smoogipoo
ea1bec85ae Simplify code/language 2020-04-10 01:41:00 +09:00
smoogipoo
b8d7b78b55 Remove unnecessary null set 2020-04-10 01:21:37 +09:00
smoogipoo
116b952dfe Change param to hitobject rather than result 2020-04-10 01:20:43 +09:00
smoogipoo
a2f5a469cf Merge branch 'master' into add-notelock 2020-04-10 01:18:54 +09:00
smoogipoo
e208251fc6 Wait for timeline to also load 2020-04-09 23:18:43 +09:00
smoogipoo
2e33d38cd7 Merge branch 'master' into editor-undo-redo 2020-04-09 22:02:28 +09:00
smoogipoo
ed4ce54ac3 Add tests 2020-04-09 21:56:36 +09:00
Dean Herbert
cc0bcea6e5
Merge pull request #8693 from smoogipoo/editorbeatmap-update-cleanup
Cleanup handling of hitobject updates
2020-04-09 21:32:58 +09:00
smoogipoo
14eca3655b Add change state handling to the editor 2020-04-09 21:22:07 +09:00
Dean Herbert
a457880eaa
Merge pull request #8695 from smoogipoo/fix-timeline-crash
Fix crash when trying to edit long beatmaps
2020-04-09 21:05:25 +09:00
smoogipoo
ecd7ce4b98 Fix test scene 2020-04-09 21:00:23 +09:00
smoogipoo
86243d463f Add legacy beatmap diffing 2020-04-09 20:48:59 +09:00
Dean Herbert
f961ae862a
Merge pull request #8694 from smoogipoo/fix-encoder-nullref
Fix possible legacy beatmap encoder nullref
2020-04-09 20:44:08 +09:00
smoogipoo
e58bf8a0d0 Add DiffPlex package 2020-04-09 20:38:38 +09:00
smoogipoo
aad0ada20b Merge branch 'fix-encoder-nullref' into editor-undo-redo 2020-04-09 20:37:00 +09:00
smoogipoo
fde5cd34b2 Merge branch 'editorbeatmap-update-cleanup' into editor-undo-redo 2020-04-09 20:36:57 +09:00
smoogipoo
683302a77d Fix crash when trying to edit long beatmaps 2020-04-09 20:25:26 +09:00
smoogipoo
b900f229e7 Fix possible legacy beatmap encoder nullref 2020-04-09 20:21:42 +09:00
smoogipoo
ee6ea08cf8 Cleanup handling of hitobject updates 2020-04-09 20:16:44 +09:00
Dean Herbert
e8f836a410
Merge pull request #8454 from TheWildTree/update-overlay-headers
Update overlay header elements to match osu-web
2020-04-09 17:17:03 +09:00
Dean Herbert
4217484799
Merge pull request #8676 from smoogipoo/mania-stage-background-skinning
Implement mania stage bottom/left/right images
2020-04-09 16:57:12 +09:00
Dean Herbert
e10576325c
Merge branch 'master' into update-overlay-headers 2020-04-09 16:29:34 +09:00
Dean Herbert
cb6372acac
Merge branch 'master' into mania-stage-background-skinning 2020-04-09 15:37:48 +09:00
Dean Herbert
4bfc738f5b
Merge pull request #7639 from santerinogelainen/master
Add top rank to the beatmap carousel
2020-04-08 23:36:47 +09:00