Joehu
77df6a0cb7
Remove unused direct placeholder screen
2019-08-07 21:16:36 -07: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
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
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
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
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
Dean Herbert
38df49995c
Fix cursor scale not matching osu-stable
2019-08-07 18:35:07 +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
Dean Herbert
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
Dean Herbert
c6d481238d
Move QuadBatch to a local variable to stop resharper complaining
2019-08-07 16:56:22 +09:00
Dean Herbert
606e977e2d
Fix twitter link shortener being used
2019-08-07 16:07:41 +09:00
Andrei Zavatski
487979b016
Add Testing
2019-08-07 09:31:07 +03: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
Dean Herbert
6b1132c5ca
Fix Beatmap overlay trying to fetch scores even if beatmap has… ( #5626 )
...
Fix Beatmap overlay trying to fetch scores even if beatmap has no leaderboard
2019-08-07 14:14:35 +09:00
Andrei Zavatski
b9384d7a53
Remove unnecessary null check
2019-08-07 07:00:50 +03:00
Andrei Zavatski
2c9ce4335c
Merge remote-tracking branch 'refs/remotes/ppy/master' into fix-scores-loading
2019-08-07 06:59:26 +03:00
Andrei Zavatski
b1c78c43f3
Simplify target string
2019-08-07 06:57:46 +03:00
Andrei Zavatski
2e3deb46d5
Merge remote-tracking branch 'refs/remotes/ppy/master' into requests-expanded
2019-08-07 06:51:11 +03:00
Dean Herbert
8ea54b98e6
Fix back button hover sounds playing in unclickable area ( #5613 )
...
Fix back button hover sounds playing in unclickable area
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-07 12:46:28 +09:00
Andrei Zavatski
24f9872315
Fix unnecessary scores loading
2019-08-07 06:45:39 +03:00
Dean Herbert
6ed9c983ff
Rename shear variable
2019-08-07 12:36:00 +09:00
Andrei Zavatski
c16e84e5e6
Fix unability to get local user with specific ruleset
2019-08-07 06:35:57 +03:00
Dean Herbert
f2861c0c7d
Merge remote-tracking branch 'upstream/master' into fix-back-button-hover-sounds
2019-08-07 12:34:30 +09:00
Dean Herbert
1bafde6d47
Fix footer button hover sounds playing in unclickable area ( #5612 )
...
Fix footer button hover sounds playing in unclickable area
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-07 12:34:09 +09:00
Andrei Zavatski
2d0f555048
Merge remote-tracking branch 'refs/remotes/ppy/master' into requests-expanded
2019-08-07 06:33:54 +03:00
Dean Herbert
616de1830a
Less sheep
2019-08-07 12:20:49 +09:00
Dean Herbert
9033327923
Merge remote-tracking branch 'upstream/master' into fix-footer-button-hover-sounds
2019-08-07 12:19:25 +09:00
Dean Herbert
9dbf4b75ad
Remove now unnecessary .gitmodules and .travis.yml ( #5625 )
...
Remove now unnecessary .gitmodules and .travis.yml
2019-08-07 11:01:43 +09:00
Joehu
91b9a496f5
Remove now unnecessary .gitmodules and .travis.yml
2019-08-06 18:29:07 -07:00
Dean Herbert
16f627a0b3
Fix player completion action potentially being executed twice ( #5617 )
...
Fix player completion action potentially being executed twice
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-07 00:11:11 +09:00
Andrei Zavatski
3cfbbac5dc
Expand requests
2019-08-06 17:47:31 +03:00
Dean Herbert
dda078277a
Minor variable name changes
2019-08-06 23:05:12 +09:00
Dean Herbert
5cbd887ee8
Merge branch 'master' into safely-cancel-completion-event
2019-08-06 22:59:06 +09:00
