Commit Graph

21744 Commits

Author SHA1 Message Date
2172c5a52b Merge branch 'master' into use-bindable-break-time-in-player 2019-08-08 14:24:52 +09:00
a345955f45 Add mentions linking ScoreProcessor apply/revert methods together 2019-08-08 13:57:04 +09:00
4a38c4f9d1 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-08 07:36:53 +03:00
f774c46f57 Remove linq usage in BreakOverlay update (#5641)
Remove linq usage in BreakOverlay update
2019-08-08 13:33:23 +09:00
f09a542949 Remove unused direct placeholder screen (#5642)
Remove unused direct placeholder screen
2019-08-08 13:28:57 +09:00
77df6a0cb7 Remove unused direct placeholder screen 2019-08-07 21:16:36 -07:00
a4459972b6 Remove ViewBeatmapButton 2019-08-08 07:15:30 +03:00
ffed642929 Implement MatchBeatmapPanel 2019-08-08 07:08:51 +03:00
7d42561da9 Remove linq usage in BreakOverlay update 2019-08-08 12:58:20 +09:00
3f9f9e7bc9 Merge branch 'master' into use-bindable-break-time-in-player 2019-08-08 05:36:45 +03:00
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
99f5ca07ce Remove redundant comment 2019-08-08 10:42:54 +09:00
40a33b3382 Move IsLoaded check to more correct place 2019-08-08 10:41:23 +09:00
a2e3ab6463 Merge branch 'master' into add-bindable-for-break-times 2019-08-08 10:13:14 +09:00
d5b26b86da Fix storyboard not showing on disabled user dim 2019-08-07 22:18:10 +03:00
c77e6074f6 Disallow adding to score after the player has failed 2019-08-07 19:58:26 +03:00
167a81f40a add special skin hit "animations" 2019-08-07 18:12:11 +02:00
ba269a49ee Expose break fade duration and add it in the calculation 2019-08-07 16:59:35 +03:00
d3657d82cd Simplify final check for break time 2019-08-07 16:28:16 +03:00
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
73cd7b0cc2 Fix incorrect implementation of old stacking algorithm (#5632)
Fix incorrect implementation of old stacking algorithm
2019-08-07 21:53:33 +09:00
ad64e719c4 Merge pull request #5633 from peppy/update-framework
Update framework
2019-08-07 21:52:28 +09:00
ab252b27d5 Merge branch 'master' into update-framework 2019-08-07 21:27:02 +09:00
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
1454c1320f Merge branch 'master' into fix-cursor-scale 2019-08-07 20:05:24 +09:00
754fbf3acf Merge branch 'master' into update-framework 2019-08-07 19:58:37 +09:00
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
2ab2889027 Update framework 2019-08-07 19:56:17 +09:00
bde89adcb7 show exception message 2019-08-07 19:45:29 +09:00
df784e1d8e Merge branch 'master' into mod-icon-improvements 2019-08-07 19:43:52 +09:00
bc3a340286 Fix incorrect path position being used for old stacking algorithm 2019-08-07 19:35:39 +09:00
b8ccba02f2 Log to runtime instead 2019-08-07 19:33:54 +09:00
42de5934f6 Fix incorrect hitobject indices 2019-08-07 19:33:35 +09:00
994c1f21ec Output stacked positions for conversion values 2019-08-07 19:33:20 +09:00
15a592e25e Just assert doesn't throw and don't catch at LegacyDecoder 2019-08-07 19:25:40 +09:00
6df671ff7f Merge pull request #5630 from peppy/move-quadbatch-local
Dispose flashlight quad batch
2019-08-07 18:49:30 +09:00
ec13143ab3 Add further xmldoc 2019-08-07 18:45:56 +09:00
da15e19912 return on storyboard side 2019-08-07 18:40:58 +09:00
38df49995c Fix cursor scale not matching osu-stable 2019-08-07 18:35:07 +09:00
18ac5b31a1 Merge branch 'master' into move-quadbatch-local 2019-08-07 18:01:56 +09:00
b0e0659715 Dispose instead 2019-08-07 17:33:30 +09:00
c65505df62 Merge branch 'beatmap-events' of https://github.com/nyquillerium/osu into beatmap-events 2019-08-07 17:09:07 +09:00
7bcec31ea3 mention that the event was the type 2019-08-07 17:08:41 +09:00
801f458684 Expand GetUser and GetUserScores requests by adding RulesetInfo… (#5621)
Expand GetUser and GetUserScores requests by adding RulesetInfo parameter
2019-08-07 16:58:36 +09:00
c6d481238d Move QuadBatch to a local variable to stop resharper complaining 2019-08-07 16:56:22 +09:00
c0d3d47c29 Don't consider type for storyboards either 2019-08-07 16:49:53 +09:00
669c2462ec Don't consider the type 2019-08-07 16:25:38 +09:00
606e977e2d Fix twitter link shortener being used 2019-08-07 16:07:41 +09:00
487979b016 Add Testing 2019-08-07 09:31:07 +03:00
67e009b000 Merge remote-tracking branch 'refs/remotes/ppy/master' into requests-expanded 2019-08-07 09:08:58 +03:00