1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 05:27:40 +08:00
Commit Graph

7407 Commits

Author SHA1 Message Date
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
Dean Herbert
b38da61ef6 Merge branch 'master' into fix-paused-osu-logo 2017-09-11 19:53:36 +09:00
Damnae
2fb203159f CI fixes. 2017-09-11 12:39:50 +02:00
Damnae
47cd1d486b Merge branch 'master' into storyboards 2017-09-11 12:29:19 +02:00
Dean Herbert
d66fb307dc Fix wrong licence header 2017-09-11 19:14:37 +09:00
Damnae
cd15cfc864 Use case insensitive paths to find storyboard textures. 2017-09-11 12:06:13 +02:00
Damnae
9eaa1cb5cd Fix sprites not being visible when all their commands are inside loops. 2017-09-11 12:06:00 +02:00
Dean Herbert
cf8912b30d Merge branch 'master' into mania-judgement-text 2017-09-11 19:04:22 +09:00
Dean Herbert
719d0fd974 Merge pull request #1239 from smoogipooo/mania-hit-explosions
Initial implementation of osu!mania hit explosions
2017-09-11 19:01:40 +09:00
Shane Woolcock
262aea8b6b Fix osu! logo triangles going super fast when the track is paused 2017-09-11 19:16:44 +09:30
Dean Herbert
ba4b9e3411 Merge branch 'master' into mania-hit-explosions 2017-09-11 18:32:36 +09:00
Dan Balasescu
3f9b682759 Merge pull request #1242 from peppy/maybefix
Ensure WorkingBeatmap's Track is never null
2017-09-11 18:32:16 +09:00
Dean Herbert
18ad0956b4 Merge branch 'master' into maybefix 2017-09-11 18:23:00 +09:00
smoogipooo
df0a31bf2a Add judgement text displays to osu!mania 2017-09-11 17:56:02 +09:00
Dean Herbert
7b92bbfa86 Merge branch 'master' into mania-hit-explosions 2017-09-11 17:34:14 +09:00
Dean Herbert
311f4744f6 Merge pull request #1233 from smoogipooo/mania-holdnote-niceness
Update osu!mania notes + hold notes with glows
2017-09-11 17:33:03 +09:00
smoogipooo
54aff432fe Fix CI error 2017-09-11 15:43:23 +09:00
Dan Balasescu
6ecd530d7b Add missing license header 2017-09-11 15:24:28 +09:00
smoogipooo
e5808d4680 Merge remote-tracking branch 'origin/master' into mania-holdnote-niceness 2017-09-11 15:14:49 +09:00
Dean Herbert
838fcca9c4 Merge branch 'master' into mania-hit-explosions 2017-09-11 15:14:35 +09:00
Dean Herbert
73b5940498 Merge pull request #1231 from smoogipooo/blending-equations
Update BlendingMode usages to reflect framework changes
2017-09-11 15:14:18 +09:00
smoogipooo
f3c6f6f959 Merge branch 'blending-equations' into mania-holdnote-niceness 2017-09-11 15:09:01 +09:00
smoogipooo
de7d50d384 Better variable + comment naming 2017-09-11 15:08:51 +09:00
smoogipooo
6c4f507e39 Update framework. 2017-09-11 15:02:30 +09:00
smoogipooo
58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 15:02:12 +09:00
DrabWeb
4be8899fb2 Move Length to BeatmapOnlineInfo. 2017-09-11 02:55:32 -03:00
DrabWeb
43fa314fe0 Details and more data displaying. 2017-09-11 02:48:48 -03:00
smoogipooo
4683319156 Merge remote-tracking branch 'origin/master' into mania-hit-explosions 2017-09-11 14:48:40 +09:00
Dean Herbert
b01233eddc Fix CI issues 2017-09-11 14:48:01 +09:00
smoogipooo
e8efdcf188 Make tick explosions white and lower scale. 2017-09-11 14:37:34 +09:00
Dean Herbert
5ce76d8023 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-11 14:36:51 +09:00
Dan Balasescu
a9ad02c29f Merge pull request #1238 from peppy/fix-autoplay
Fix regression causing autoplay to fail
2017-09-11 14:32:29 +09:00