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

21300 Commits

Author SHA1 Message Date
Dan Balasescu
0cd6ba2950
Merge branch 'master' into score-processor-xmldoc 2019-08-08 17:32:14 +09:00
Dean Herbert
a3dbaef4ca Adjust background gradient 2019-08-08 17:29:50 +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
Andrei Zavatski
8668bce25d Fix preview can be played on start 2019-08-08 09:52:42 +03:00
Andrei Zavatski
cbcdc28900 Fix hard crash when clicking on a preview button 2019-08-08 09:04:24 +03:00
Andrei Zavatski
f5cd0eae48 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-08 09:04:06 +03: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
Andrei Zavatski
4a38c4f9d1 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-08 07:36:53 +03: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
Andrei Zavatski
a4459972b6 Remove ViewBeatmapButton 2019-08-08 07:15:30 +03:00
Andrei Zavatski
ffed642929 Implement MatchBeatmapPanel 2019-08-08 07:08:51 +03: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
d5b26b86da Fix storyboard not showing on disabled user dim 2019-08-07 22:18:10 +03:00
jorolf
167a81f40a add special skin hit "animations" 2019-08-07 18:12:11 +02: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
Dean Herbert
ab252b27d5
Merge branch 'master' into update-framework 2019-08-07 21:27:02 +09:00
Dan Balasescu
cbb227757f
Merge pull request #5631 from peppy/fix-cursor-scale
Fix cursor scale not matching osu-stable
2019-08-07 20:49:58 +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
Dan Balasescu
07983877db
Merge pull request #5629 from EVAST9919/mod-icon-improvements
Change Highlighted property in ModIcon to a Bindable
2019-08-07 19:57:08 +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
smoogipoo
bc3a340286 Fix incorrect path position being used for old stacking algorithm 2019-08-07 19:35:39 +09:00
David Zhao
b8ccba02f2 Log to runtime instead 2019-08-07 19:33:54 +09:00
smoogipoo
42de5934f6 Fix incorrect hitobject indices 2019-08-07 19:33:35 +09:00
smoogipoo
994c1f21ec Output stacked positions for conversion values 2019-08-07 19:33:20 +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
6df671ff7f
Merge pull request #5630 from peppy/move-quadbatch-local
Dispose flashlight quad batch
2019-08-07 18:49:30 +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