Dean Herbert
|
29870c773c
|
Merge branch 'master' into stop-counting-to-score-after-fail
|
2019-08-09 14:16:34 +09:00 |
|
smoogipoo
|
a9c4b5ac4e
|
Add tests
|
2019-08-09 14:04:56 +09:00 |
|
smoogipoo
|
33f4b628a5
|
Make HasFailed private set
|
2019-08-09 13:42:02 +09:00 |
|
smoogipoo
|
88fa06efba
|
Refactor as proposed
|
2019-08-09 13:38:04 +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 |
|
Dean Herbert
|
c02d83e72a
|
Merge branch 'master' into fix-async-score-imports
|
2019-08-08 23:34:31 +09:00 |
|
iiSaLMaN
|
566d874641
|
Prevent failing when reverting to a hasFailedAtJudgement
|
2019-08-08 15:25:07 +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
|
c77e6074f6
|
Disallow adding to score after the player has failed
|
2019-08-07 19:58:26 +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 |
|
David Zhao
|
bde89adcb7
|
show exception message
|
2019-08-07 19:45:29 +09:00 |
|
Dan Balasescu
|
df784e1d8e
|
Merge branch 'master' into mod-icon-improvements
|
2019-08-07 19:43:52 +09:00 |
|
David Zhao
|
b8ccba02f2
|
Log to runtime instead
|
2019-08-07 19:33:54 +09:00 |
|
David Zhao
|
15a592e25e
|
Just assert doesn't throw and don't catch at LegacyDecoder
|
2019-08-07 19:25:40 +09:00 |
|
Dean Herbert
|
ec13143ab3
|
Add further xmldoc
|
2019-08-07 18:45:56 +09:00 |
|
David Zhao
|
da15e19912
|
return on storyboard side
|
2019-08-07 18:40:58 +09:00 |
|
Dan Balasescu
|
18ac5b31a1
|
Merge branch 'master' into move-quadbatch-local
|
2019-08-07 18:01:56 +09:00 |
|
Dean Herbert
|
b0e0659715
|
Dispose instead
|
2019-08-07 17:33:30 +09:00 |
|
David Zhao
|
7bcec31ea3
|
mention that the event was the type
|
2019-08-07 17:08:41 +09:00 |
|
Dean Herbert
|
c6d481238d
|
Move QuadBatch to a local variable to stop resharper complaining
|
2019-08-07 16:56:22 +09:00 |
|
David Zhao
|
669c2462ec
|
Don't consider the type
|
2019-08-07 16:25:38 +09:00 |
|
Andrei Zavatski
|
67e009b000
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into requests-expanded
|
2019-08-07 09:08:58 +03:00 |
|
Andrei Zavatski
|
1d42f0959a
|
ModIcon improvements
|
2019-08-07 08:46:27 +03:00 |
|
Andrei Zavatski
|
b9384d7a53
|
Remove unnecessary null check
|
2019-08-07 07:00:50 +03:00 |
|