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

9273 Commits

Author SHA1 Message Date
Dean Herbert
751fcf3c7d
Merge pull request #1665 from smoogipoo/beatmap-serialization
Implement a JSON Beatmap decoder
2017-12-23 03:16:30 +09:00
Dean Herbert
4d40004e97
Merge branch 'master' into beatmap-serialization 2017-12-22 22:45:00 +09:00
Dean Herbert
166d6b555b
Merge pull request #1725 from smoogipoo/fix-editor-approachcircles
Make editor discard approach circles
2017-12-22 22:30:10 +09:00
smoogipoo
def2e5bd17 Make editor discard approach circles
Temporary solution for now.
2017-12-22 22:16:54 +09:00
smoogipoo
d54b74e13a Update framework 2017-12-22 21:44:12 +09:00
smoogipoo
6a29f6020a Make HitObjects construct nested hit objects 2017-12-22 21:42:54 +09:00
Dean Herbert
f1d170c390
Merge pull request #1549 from EVAST9919/rank-graph-improvements
Fix profile rank graph being hidden (and improve visually)
2017-12-22 21:32:10 +09:00
Dean Herbert
e5faced9ba Better variable name 2017-12-22 19:25:59 +09:00
Dean Herbert
82909f6585 RankChart -> RankGraph 2017-12-22 19:25:18 +09:00
Dean Herbert
728d1cb7f6 Formatting and more dynamically testable references 2017-12-22 19:24:54 +09:00
Dean Herbert
1a318c5c2b Improve LineGraph invalidation logic 2017-12-22 18:58:35 +09:00
EVAST9919
8c50fa0b84 Add testcase 2017-12-22 18:57:23 +09:00
EVAST9919
938c5feea4 Simplify interaction condition 2017-12-22 18:45:10 +09:00
EVAST9919
94a974a397 Use bindable for a user 2017-12-22 18:45:10 +09:00
EVAST9919
e48c515d52 CI fixes 2017-12-22 18:45:10 +09:00
EVAST9919
5ffdaf711e Remove useless array 2017-12-22 18:45:10 +09:00
EVAST9919
f3c93c894b Rank graph improvements 2017-12-22 18:45:10 +09:00
Dean Herbert
6ef575c005 Update framework 2017-12-22 15:46:45 +09:00
Dan Balasescu
a3d947301b
Merge branch 'master' into beatmap-serialization 2017-12-22 07:38:05 +09:00
Dean Herbert
be526d68e8
Merge pull request #1599 from naoey/leaderboard-scopes
Make leaderboard tabs and active ruleset filter scores
2017-12-22 01:23:24 +09:00
Dean Herbert
aa388885b7 Adjust animation slightly 2017-12-22 00:53:34 +09:00
Dean Herbert
5c9d484395 Adjust debounce a bit 2017-12-22 00:50:32 +09:00
Dean Herbert
40ceaf12f2
Merge branch 'master' into leaderboard-scopes 2017-12-22 00:44:24 +09:00
Dean Herbert
efc790e5c3
Merge pull request #1676 from Aergwyn/add-confirmation-dialog
Added confirmation dialog for "Delete ALL beatmaps"
2017-12-22 00:44:07 +09:00
Dean Herbert
40587411c1
Merge branch 'master' into add-confirmation-dialog 2017-12-22 00:32:25 +09:00
Dean Herbert
68035aa6a6
Merge pull request #1717 from peppy/remove-unnecessary-blocking
Remove manual audio thread synchronisation logic
2017-12-22 00:32:10 +09:00
Dean Herbert
2526ebbbdc
Merge branch 'master' into remove-unnecessary-blocking 2017-12-22 00:18:02 +09:00
Dean Herbert
44e4716a4f
Merge pull request #1715 from peppy/overlays-block-keyboard
Correctly make fullscreen overlays block keyboard input from drawables behind them
2017-12-22 00:16:29 +09:00
Dan Balasescu
ae4abf0f2b
Merge branch 'master' into remove-unnecessary-blocking 2017-12-21 23:55:48 +09:00
Dean Herbert
eb1b1da732
Merge branch 'master' into overlays-block-keyboard 2017-12-21 23:51:46 +09:00
Dean Herbert
5e66212faa
Merge pull request #1718 from peppy/fix-inspectcode-bug
Ignore bugged inspectcode inspection
2017-12-21 23:51:35 +09:00
Dean Herbert
57fdbda16d Remove unnecessary IsLoaded check
We are always loaded at this point.
2017-12-21 23:48:48 +09:00
Dean Herbert
65e6206d06 Use local bindable 2017-12-21 23:48:35 +09:00
Dan Balasescu
0f2646fff2
Merge branch 'master' into fix-inspectcode-bug 2017-12-21 23:21:50 +09:00
Dean Herbert
13fee5402a Remove unnecessary using
visual studio doesn't save
2017-12-21 23:20:11 +09:00
Dean Herbert
0121692919 Ignore bugged inspectcode inspection 2017-12-21 23:14:42 +09:00
smoogipoo
ac1d27e925 Fix possible nullref exceptions 2017-12-21 23:02:46 +09:00
Dean Herbert
38703e6b85
Merge branch 'master' into add-confirmation-dialog 2017-12-21 22:56:31 +09:00
Dean Herbert
572e2d30b1
Merge pull request #1671 from FreezyLemon/undelete-button-add
Added Button to restore recently deleted beatmaps
2017-12-21 22:56:03 +09:00
Dean Herbert
620e9737c3 Avoid many many unnecessary enumerations 2017-12-21 22:33:16 +09:00
Dean Herbert
a9039c71e0 Merge branch 'master' into undelete-button-add 2017-12-21 22:32:08 +09:00
Dean Herbert
87e790080b Remove manual audio thread synchronisation logic
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
Dan Balasescu
5cd2a3950e
Merge branch 'master' into overlays-block-keyboard 2017-12-21 22:15:03 +09:00
smoogipoo
790aa8be2a Merge master into beatmap-serialization 2017-12-21 22:13:53 +09:00
smoogipoo
866d1c6e0f Remove now unused references 2017-12-21 22:13:18 +09:00
Dean Herbert
e3b31f0191
Merge pull request #1709 from DevSDK/dev-overlay-counter
Fix retry count not displaying on pause overlay
2017-12-21 22:09:57 +09:00
Dean Herbert
4bd2c7e95f Fix minor formatting issue 2017-12-21 21:54:46 +09:00
Dean Herbert
abe465358c Fix formatting 2017-12-21 21:46:57 +09:00
naoey
644aaa8167 Unsubscribe from API state change event. 2017-12-21 18:00:10 +05:30
Dean Herbert
63f2436220
Merge branch 'master' into leaderboard-scopes 2017-12-21 21:18:56 +09:00