1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 05:02:55 +08:00
Commit Graph

7220 Commits

Author SHA1 Message Date
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
Dean Herbert
d66fb307dc Fix wrong licence header 2017-09-11 19:14:37 +09: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
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
Dean Herbert
512232c1c8 Fix regression causing autoplay to fail 2017-09-11 14:25:01 +09:00
smoogipooo
2c3131d391 Remove green coloration when hit. 2017-09-11 13:56:10 +09:00
smoogipooo
9e3206fef3 Improve test case a little bit. 2017-09-11 13:55:34 +09:00
smoogipooo
3026675f35 Add explosions. 2017-09-11 13:44:39 +09:00
smoogipooo
0cadee998c Set default AccentColour for hit objects 2017-09-11 13:44:05 +09:00
Dean Herbert
9d6571a1cb Merge pull request #1237 from peppy/update-managedbass-retarget
Update framework and target .NET 4.6.1
2017-09-11 12:57:13 +09:00
smoogipooo
10f0d1f20d Pass down OnJudgement to columns. 2017-09-11 12:57:10 +09:00
Dean Herbert
712c6942a9 Update submodules 2017-09-11 12:52:25 +09:00
Dean Herbert
7170fbd087 Target .NET 4.6.1 2017-09-11 12:39:00 +09:00
Dean Herbert
81d04ea959 Merge pull request #1222 from DrabWeb/beatmap-details-rewrite
Beatmap details rewrite
2017-09-11 12:36:44 +09:00
Dean Herbert
adba5b5ba6 Merge branch 'master' into beatmap-details-rewrite 2017-09-11 12:30:32 +09:00
Dean Herbert
71fe39244b Merge pull request #1235 from peppy/nullref-fix
Fix nullref when loading MusicController VisualTest after Player VisualTest
2017-09-11 12:23:29 +09:00
Dan Balasescu
24f7b6823e Merge branch 'master' into nullref-fix 2017-09-11 12:13:43 +09:00
Dan Balasescu
01b294e6b5 Merge pull request #1236 from peppy/ci-refixes
Fix newly occurring CI issues
2017-09-11 12:02:34 +09:00
Dean Herbert
3cacee300a Fix a false resharper positive 2017-09-11 11:41:29 +09:00
Dean Herbert
eedfbdc0e8 Add nullref check in KeyCounterCollection's Add method 2017-09-11 11:41:09 +09:00
Dean Herbert
4f6c93aa0f Update framework 2017-09-11 11:34:40 +09:00