1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 20:07:26 +08:00
Commit Graph

7160 Commits

Author SHA1 Message Date
smoogipooo
6682c3a736 Override instead of re-binding event 2017-09-13 16:15:11 +09: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
Dan Balasescu
08d3472c0a Merge branch 'master' into more-note-glows 2017-09-12 12:05:09 +09:00
smoogipooo
585e2399bf Add license headers. 2017-09-12 12:02:56 +09:00
smoogipooo
27e3c9e778 Remove usings. 2017-09-12 11:51:19 +09:00
smoogipooo
57ee97e27d Add lane glows. 2017-09-12 11:39:34 +09:00
smoogipooo
0765027cb5 Move note glow to a separate class + make it match the design a bit more. 2017-09-12 11:14:16 +09:00
smoogipooo
d6bf5c38b7 Move Kiai bool to HitObject. 2017-09-12 10:01:07 +09:00
Dean Herbert
19c8b2fef9 Merge pull request #1245 from smoogipooo/fix-mania-masking
Fix osu!mania note masking resulting in miss judgements not occurring.
2017-09-12 09:58:10 +09:00
smoogipooo
3c98bc065f Fix osu!mania note masking resulting in miss judgements not occurring. 2017-09-12 09:48:17 +09:00
Dean Herbert
19b048ef4a Merge pull request #1244 from peppy/fix-incorrect-icon-state
Fix icon states being updated incorrectly when being set too early
2017-09-11 22:13:22 +09:00
Dean Herbert
95dfbb4f06 Update framework 2017-09-11 21:41:39 +09:00
Dean Herbert
7c7849f189 Fix icon states being updated incorrectly when being set too early 2017-09-11 21:40:58 +09:00
Dean Herbert
de20615df9 Merge pull request #1241 from smoogipooo/mania-judgement-text
Implement judgement text for osu!mania
2017-09-11 20:47:17 +09:00
Dean Herbert
ec8639177e Merge branch 'master' into mania-judgement-text 2017-09-11 19:58:40 +09:00
Dean Herbert
e707eab9ce Merge pull request #1243 from swoolcock/fix-paused-osu-logo
Fix osu! logo triangles going super fast when the track is paused
2017-09-11 19:58:30 +09:00