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

7176 Commits

Author SHA1 Message Date
Dean Herbert
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
Dean Herbert
deb701e874 Merge pull request #1252 from smoogipooo/fix-sliderhead-depth
Fix osu! slider initial circles being placed at the wrong depth.
2017-09-13 16:28:11 +09:00
Dean Herbert
e37a354db0 Merge branch 'master' into fix-sliderhead-depth 2017-09-13 16:19:37 +09:00
smoogipooo
093d82ac45 Set depths from playfield add methods instead of DrawableHitObject 2017-09-13 16:17:01 +09:00
smoogipooo
6682c3a736 Override instead of re-binding event 2017-09-13 16:15:11 +09:00
Dean Herbert
0312d7afae Merge pull request #1227 from MrTheMake/channelselection-minimum-size
Reduce the size of chat when channel selection overlay is displayed
2017-09-13 15:58:06 +09:00
Dean Herbert
f4f7ae12b3 Merge branch 'master' into channelselection-minimum-size 2017-09-13 15:40:22 +09:00
Thomas Müller
53afa7f49c Merge pull request #1255 from peppy/fix-profile-typo
Fix typo in user profile header
2017-09-13 08:40:05 +02:00
Dean Herbert
7681d97f10 Fix typo in user profile header
Replays watched, not replay watched.
2017-09-13 15:21:04 +09:00
Dean Herbert
7835269f95 Merge branch 'master' into channelselection-minimum-size 2017-09-13 14:21:44 +09:00
Dan Balasescu
ea9d10976b Merge pull request #1254 from peppy/fix-beatmapinfo-comparator
Fix BeatmapInfo's comparator when not being sourced from database
2017-09-13 11:13:18 +09:00
Dean Herbert
1de1b882e3 Fix BeatmapInfo's comparator when not being sourced from database 2017-09-13 10:36:58 +09:00
MrTheMake
a30bd90641 Merge branch 'channelselection-minimum-size' of https://github.com/MrTheMake/osu into channelselection-minimum-size 2017-09-12 18:48:11 +02:00
MrTheMake
9839a3b937 Smoothly transform the chat height when opening the channel selection 2017-09-12 18:47:21 +02:00
MrTheMake
c78695cfe0 Removed redundant call 2017-09-12 18:26:52 +02:00
smoogipooo
7b30fc8a09 Fix osu! slider initial circles being placed at the wrong depth. 2017-09-13 00:43:30 +09:00
Dean Herbert
452506d982 Merge pull request #1240 from peppy/judgement-revamp
Judgement revamp
2017-09-12 19:19:04 +09:00
Dan Balasescu
f4a2ffbeea Merge branch 'master' into judgement-revamp 2017-09-12 19:13:33 +09:00
Dean Herbert
09bb5f3c54 Merge pull request #1249 from peppy/workingbeatmap-track-disposal
Improve beatmap track disposal logic
2017-09-12 19:08:19 +09:00
smoogipooo
112429051e Fix XMLDoc CI errors 2017-09-12 19:05:37 +09:00
Dan Balasescu
ee8ec31c6e Merge branch 'master' into judgement-revamp 2017-09-12 18:57:37 +09:00
smoogipooo
d5bd005c01 Remove unused code for now
I don't think we'll ever be using this anyway.
2017-09-12 18:52:15 +09:00
smoogipooo
92b3e203e8 judgementOccurred should be passed upwards
So only one hit object is ever judged in a single frame.
2017-09-12 18:50:30 +09:00
smoogipooo
a38e0062a4 Fix checking judgements even if we don't provide a judgement, if we have a result, or if a nested hit object handled a judgement. 2017-09-12 18:49:50 +09:00
smoogipooo
3ef65a1e5d Cleanup TaikoPlayfield a bit 2017-09-12 18:49:31 +09:00
Dan Balasescu
d25c382adf Merge branch 'master' into workingbeatmap-track-disposal 2017-09-12 18:44:52 +09:00
smoogipooo
fb05552ac4 Fix one more case of incorrect offset. 2017-09-12 18:36:31 +09:00
Dean Herbert
86de4fa2e2 Apply CI fixes 2017-09-12 18:36:19 +09:00
Dean Herbert
e44b6e1ced Merge pull request #1248 from smoogipooo/mania-autoplay
Implement auto play for osu!mania
2017-09-12 18:34:43 +09:00
Dean Herbert
3e3411dc9d Update framework 2017-09-12 18:34:15 +09:00
Dean Herbert
b21c080121 Make mania readable again 2017-09-12 18:22:02 +09:00
Dean Herbert
f32d444d68 Remove generics from Playfield (fixes catch) 2017-09-12 18:19:28 +09:00
Dean Herbert
d7ac02d090 Ensure judgements aren't updated when ArmedState is not idle 2017-09-12 18:00:41 +09:00
Dean Herbert
1194e46ef1 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-12 17:46:21 +09:00
Dean Herbert
20dae5ee11 Minor refactors 2017-09-12 17:36:46 +09:00
Dean Herbert
160ad1924f Remove unneeded reference 2017-09-12 17:01:40 +09:00
smoogipooo
6a815d343c Remove unneeded class. 2017-09-12 16:58:06 +09:00
Dean Herbert
5b9d906ad5 Improve beatmap track disposal logic
- [ ] Depends on https://github.com/ppy/osu-framework/pull/1035
2017-09-12 16:56:46 +09:00
Dan Balasescu
3be9d3c747 Merge branch 'master' into mania-autoplay 2017-09-12 16:44:05 +09:00
smoogipooo
7ad982b540 Fix ordering of license header. 2017-09-12 16:21:32 +09:00
smoogipooo
a22dd80b23 Expire HitExplosions. 2017-09-12 16:20:15 +09:00
smoogipooo
af4cc7aada Accuracy starts at 100% for mania. 2017-09-12 16:15:04 +09:00
smoogipooo
a7b93822d7 Add initial frame 2017-09-12 16:14:52 +09:00
smoogipooo
a1baefe20e Add 20ms delay to release frames. 2017-09-12 16:09:53 +09:00
smoogipooo
8737a1b1a5 Implement osu!mania auto replay generation. 2017-09-12 15:52:32 +09:00
smoogipooo
78764082dc Remove taiko project reference from mania project. 2017-09-12 15:52:02 +09:00
Dan Balasescu
2f1af3812d Merge pull request #1247 from peppy/update-player-testcase
Update player testcase to be usable
2017-09-12 13:38:02 +09:00
Dean Herbert
32940e3040 Merge branch 'master' into update-player-testcase 2017-09-12 13:28:11 +09:00
Dean Herbert
638f5e5714 Merge pull request #1246 from smoogipooo/more-note-glows
Add more glows to osu!mania notes
2017-09-12 13:27:59 +09:00
Dean Herbert
4113e141a2 Update player testcase to be usable
Includes a real .osu file with slight modifications for easier testing.
2017-09-12 12:20:42 +09:00