Andrei Zavatski
|
2bbac7cdfc
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-scope-selector
|
2019-08-12 12:18:32 +03:00 |
|
dependabot-preview[bot]
|
1bbd0ca54e
|
Bump ppy.osu.Game.Resources from 2019.731.1 to 2019.809.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.731.1 to 2019.809.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.731.1...2019.809.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-08-12 08:30:26 +00:00 |
|
Dean Herbert
|
75cb0d093b
|
Use description correctly
Required for localisation
|
2019-08-12 16:10:48 +09:00 |
|
Dean Herbert
|
a83afd00b5
|
Merge branch 'master' into beatmap-scope-selector
|
2019-08-12 15:48:53 +09:00 |
|
Dean Herbert
|
d0f2d22995
|
Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim
|
2019-08-12 05:46:15 +09:00 |
|
Dean Herbert
|
ff4b271f64
|
Add extra quotations around output
|
2019-08-12 01:42:05 +09:00 |
|
Dean Herbert
|
ce62f6b56e
|
ToString should never return null
|
2019-08-12 01:40:11 +09:00 |
|
Unknown
|
cc4ee2df05
|
add ToString() override to Beatmap class
|
2019-08-11 16:41:56 +02: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
|
caf13ae52d
|
Update framework
|
2019-08-09 23:29:32 +09:00 |
|
Dean Herbert
|
90b1fe81f3
|
Update cached usage in line with framework changes
|
2019-08-09 19:12:29 +09: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 |
|
Dean Herbert
|
7e9c100c9b
|
Apply new resharper refactors
|
2019-08-09 12:29:33 +09:00 |
|
iiSaLMaN
|
565034e658
|
Remove unnecessary using directive
|
2019-08-08 22:14:51 +03:00 |
|
iiSaLMaN
|
0fcc6c1676
|
Add DimLevel property
|
2019-08-08 22:13:48 +03:00 |
|
Dean Herbert
|
c02d83e72a
|
Merge branch 'master' into fix-async-score-imports
|
2019-08-08 23:34:31 +09:00 |
|
iiSaLMaN
|
a3d90da7d4
|
Remove unnecessary check
|
2019-08-08 17:29:52 +03:00 |
|
iiSaLMaN
|
bedb744a2e
|
Add parentheses
|
2019-08-08 17:11:26 +03:00 |
|
iiSaLMaN
|
88b9942b2a
|
Move EnableUserDim check to defualt value of ShowDimContent
|
2019-08-08 17:07:06 +03:00 |
|
Dan Balasescu
|
bb90a273ac
|
Merge branch 'master' into system-user-color
|
2019-08-08 19:02:24 +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 |
|
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 |
|
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
|
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
|
d5b26b86da
|
Fix storyboard not showing on disabled user dim
|
2019-08-07 22:18:10 +03: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
|
ab252b27d5
|
Merge branch 'master' into update-framework
|
2019-08-07 21:27:02 +09:00 |
|
Dan Balasescu
|
1454c1320f
|
Merge branch 'master' into fix-cursor-scale
|
2019-08-07 20:05:24 +09:00 |
|
Dean Herbert
|
754fbf3acf
|
Merge branch 'master' into update-framework
|
2019-08-07 19:58:37 +09:00 |
|
Dean Herbert
|
2ab2889027
|
Update framework
|
2019-08-07 19:56:17 +09:00 |
|