1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 19:13:22 +08:00
Commit Graph

20853 Commits

Author SHA1 Message Date
Andrei Zavatski
ed409d113b Add judgement lines generator 2019-08-11 15:53:15 +03:00
Andrei Zavatski
fd334e0319 Implement basic layout for AccuracyBar 2019-08-11 14:57:21 +03:00
Dean Herbert
126fd4d24b
Merge pull request #5669 from Game4all/overlay-icon-title
Add ScreenTitleIcon class to allow code reuse of overlay header icons
2019-08-11 17:05:02 +09:00
Dean Herbert
684c37bf05 Rename class to better match usage 2019-08-11 16:19:40 +09:00
Lucas A
d55f9404da Fix CI issues 2019-08-10 14:23:37 +02:00
Lucas A
8eb3409a64 Add missing licence header 2019-08-10 14:03:44 +02:00
Lucas A
b0a7177987 Add ScreenTitleIcon class, used for displaying custom specific icons on overlays. 2019-08-10 13:26:19 +02:00
Dean Herbert
59a5df8bca
Update framework (with cached changes) (#5666)
Update framework (with cached changes)
2019-08-09 23:47:40 +09:00
Dean Herbert
caf13ae52d Update framework 2019-08-09 23:29:32 +09:00
Dan Balasescu
9b46a63cae
Merge pull request #5664 from peppy/match-stable-metrics
Adjust slider snaking and hitcircle fading to match stable
2019-08-09 22:35:07 +09:00
Dean Herbert
6264a6a1c9 Adjust slider snaking and hitcircle fading to match stable 2019-08-09 20:18:02 +09:00
Dean Herbert
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +09:00
Dean Herbert
07cf9f319c
Bump NUnit3TestAdapter from 3.13.0 to 3.14.0 (#5658)
Bump NUnit3TestAdapter from 3.13.0 to 3.14.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-08-09 14:15:36 +09:00
Dean Herbert
2d0a3dee6f
Bump ppy.osu.Game.Resources from 2019.702.0 to 2019.731.1 (#5659)
Bump ppy.osu.Game.Resources from 2019.702.0 to 2019.731.1

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-08-09 13:57:02 +09:00
dependabot-preview[bot]
58e98e53d2
Bump NUnit3TestAdapter from 3.13.0 to 3.14.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.13...V3.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-09 03:58:06 +00:00
dependabot-preview[bot]
ca33efead4
Bump ppy.osu.Game.Resources from 2019.702.0 to 2019.731.1
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.702.0 to 2019.731.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.702.0...2019.731.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-09 03:58:06 +00:00
Dean Herbert
dbb3b583cf
Log error for invalid beatmap/storyboard events instead of thro… (#5611)
Log error for invalid beatmap/storyboard events instead of throwing

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-09 12:56:47 +09:00
Dan Balasescu
b849211d2b
Merge pull request #5657 from peppy/apply-new-factors
Apply new resharper refactors
2019-08-09 12:42:40 +09:00
Dean Herbert
7e9c100c9b Apply new resharper refactors 2019-08-09 12:29:33 +09:00
Dean Herbert
0f5af25def
Don't share single scheduler across all model managers (#5647)
Don't share single scheduler across all model managers

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-09 00:10:25 +09:00
Dean Herbert
c02d83e72a
Merge branch 'master' into fix-async-score-imports 2019-08-08 23:34:31 +09:00
Dan Balasescu
f6208db972
Merge pull request #5646 from peppy/system-user-color
Move system user colour assignment to ensure consistency
2019-08-08 19:22:16 +09:00
Dan Balasescu
bb90a273ac
Merge branch 'master' into system-user-color 2019-08-08 19:02:24 +09:00
Dan Balasescu
a9a5d305c5
Merge pull request #5644 from peppy/score-processor-xmldoc
Add mentions linking ScoreProcessor apply/revert methods together
2019-08-08 18:28:03 +09:00
smoogipoo
3ebfa0505c Don't share single scheduler across all model managers 2019-08-08 18:26:07 +09:00
Dan Balasescu
0cd6ba2950
Merge branch 'master' into score-processor-xmldoc 2019-08-08 17:32:14 +09:00
Dean Herbert
a76d3f1218
Add chat /join command (#5602)
Add chat /join command
2019-08-08 17:11:44 +09:00
Dean Herbert
6d5a7041fd Move system user colour assignment to ensure consistency 2019-08-08 17:10:06 +09:00
Max Hübner
0bed3bfece formatting inspection 2 2019-08-08 09:02:09 +02:00
Max Hübner
bcd443a3aa remove /j 2019-08-08 08:56:52 +02:00
smoogipoo
de4ad1f625 Fix bad log message 2019-08-08 14:44:49 +09:00
smoogipoo
ac2060f1cf Throw exceptions and let LegacyDecoder handle them 2019-08-08 14:44:04 +09:00
Dean Herbert
21c2d2b87c
Use bindable break time for checking to instant resume (#5635)
Use bindable break time for checking to instant resume
2019-08-08 14:35:17 +09:00
Dan Balasescu
54ee0cabd8
Merge branch 'master' into beatmap-events 2019-08-08 14:25:41 +09:00
Dean Herbert
2172c5a52b
Merge branch 'master' into use-bindable-break-time-in-player 2019-08-08 14:24:52 +09:00
Dean Herbert
a345955f45 Add mentions linking ScoreProcessor apply/revert methods together 2019-08-08 13:57:04 +09:00
Dean Herbert
f774c46f57
Remove linq usage in BreakOverlay update (#5641)
Remove linq usage in BreakOverlay update
2019-08-08 13:33:23 +09:00
Dean Herbert
f09a542949
Remove unused direct placeholder screen (#5642)
Remove unused direct placeholder screen
2019-08-08 13:28:57 +09:00
Joehu
77df6a0cb7 Remove unused direct placeholder screen 2019-08-07 21:16:36 -07:00
Dean Herbert
7d42561da9 Remove linq usage in BreakOverlay update 2019-08-08 12:58:20 +09:00
Salman Ahmed
3f9f9e7bc9
Merge branch 'master' into use-bindable-break-time-in-player 2019-08-08 05:36:45 +03:00
Dean Herbert
94206f0aaa
Add a bindable for checking if the gameplay is currently in a b… (#5467)
Add a bindable for checking if the gameplay is currently in a break

Co-authored-by: Shane Woolcock <samahnub@gmail.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-08 11:14:00 +09:00
Dean Herbert
99f5ca07ce Remove redundant comment 2019-08-08 10:42:54 +09:00
Dean Herbert
40a33b3382 Move IsLoaded check to more correct place 2019-08-08 10:41:23 +09:00
Dean Herbert
a2e3ab6463
Merge branch 'master' into add-bindable-for-break-times 2019-08-08 10:13:14 +09:00
iiSaLMaN
ba269a49ee Expose break fade duration and add it in the calculation 2019-08-07 16:59:35 +03:00
iiSaLMaN
d3657d82cd Simplify final check for break time 2019-08-07 16:28:16 +03:00
iiSaLMaN
c2b3c28c79 Use IsBreakTime for checking if currently in a break
Rather than iterating over all breaks to find which is in current time
2019-08-07 16:15:53 +03:00
Dean Herbert
73cd7b0cc2
Fix incorrect implementation of old stacking algorithm (#5632)
Fix incorrect implementation of old stacking algorithm
2019-08-07 21:53:33 +09:00
Dean Herbert
ad64e719c4
Merge pull request #5633 from peppy/update-framework
Update framework
2019-08-07 21:52:28 +09:00