iiSaLMaN
2f3fb8cf88
Add Stop + RemoveAdjustment functions
2019-08-28 13:10:11 +03:00
iiSaLMaN
cb8fe89b8b
Allow setting looping to existing channels
2019-08-28 13:09:53 +03:00
iiSaLMaN
d1cbd11d28
Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound
2019-08-28 13:09:07 +03:00
Dean Herbert
4c2a6b755f
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-28 18:44:23 +09:00
Dean Herbert
9a98f39f06
Share logic with other rulesets (and make default)
2019-08-28 18:12:47 +09:00
Dean Herbert
bb22c2d6e4
Tidy up text construction
2019-08-28 17:29:18 +09:00
Dean Herbert
b1f523dae3
Merge remote-tracking branch 'upstream/master' into kudosu-info
2019-08-28 17:13:57 +09:00
Dean Herbert
fcf770c744
Merge branch 'master' into update-framework
2019-08-28 17:04:44 +09:00
Dean Herbert
70da25cfca
Update framework
2019-08-28 17:03:54 +09:00
Dean Herbert
7ea55a5cdd
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-28 16:36:20 +09:00
Dean Herbert
bef44b8e58
item -> model
2019-08-28 13:31:12 +09:00
Dean Herbert
3942c83c18
Simplify schedule layout
2019-08-28 13:28:57 +09:00
Dean Herbert
27633c8dbd
T -> TModel
2019-08-28 13:28:21 +09:00
Dean Herbert
f18b5a3c02
Remove "AllowCreate" function by instead handling nulls
2019-08-28 13:27:44 +09:00
Dean Herbert
c4aaab20c7
Merge remote-tracking branch 'upstream/master' into simplify-paginated-container
2019-08-28 13:15:57 +09:00
Dean Herbert
1aa09ff05c
Merge pull request #5795 from iiSaLMaN/allow-fallback-to-samples-without-bank
...
Try retrieving samples without bank names
2019-08-28 13:12:51 +09:00
Dean Herbert
4add1727b7
Fix hitsounds not updating immediately after switching skins
2019-08-28 03:25:57 +09:00
iiSaLMaN
18431a42e6
Resolve merge conflicts
2019-08-27 20:06:17 +03:00
iiSaLMaN
4ef991b973
Loop over lookup names on default-samples retrieval
2019-08-27 19:42:17 +03:00
Andrei Zavatski
5fd43d42f4
CI fixes
2019-08-27 16:09:37 +03:00
Andrei Zavatski
9a383eee1a
Add AllowCreate function
2019-08-27 15:58:57 +03:00
Andrei Zavatski
22ee7db805
Refactor PaginatedContainer to avoid code duplication
2019-08-27 15:47:37 +03:00
Andrei Zavatski
ed827d514f
Add comments
2019-08-27 15:36:08 +03:00
Andrei Zavatski
f49b58c102
Simplify text building
2019-08-27 15:30:41 +03:00
Andrei Zavatski
7f0a4fbef9
Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info
2019-08-27 15:11:55 +03:00
Dean Herbert
b59973c712
Update in line with framework changes
2019-08-27 18:43:58 +09:00
Dean Herbert
0fba446c01
Obsolete legacy UpdateState() method ( #5853 )
...
Obsolete legacy UpdateState() method
2019-08-27 18:34:16 +09:00
Dean Herbert
7ccc409df7
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-27 18:27:26 +09:00
Dean Herbert
7aeeb65ae7
Tidy up Player's container loading logic
...
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
2019-08-27 18:27:21 +09:00
Dean Herbert
0ea10a4922
Fix skin sample reading failing
2019-08-27 17:18:32 +09:00
smoogipoo
9e926d44c0
Obsolete legacy UpdateState() method
2019-08-27 16:09:47 +09:00
Dean Herbert
66223b9954
Merge branch 'master' into allow-fallback-to-samples-without-bank
2019-08-27 14:44:16 +09:00
Dean Herbert
7885c79467
Make bindables private
2019-08-27 14:31:34 +09:00
Dean Herbert
69145eb83a
Merge branch 'master' into select-filters-persistence
2019-08-27 14:12:59 +09:00
smoogipoo
6368189d46
Refactor
2019-08-27 11:59:25 +09:00
Dean Herbert
6aab7168d4
Merge branch 'master' into relative-beat-lengths
2019-08-27 10:59:52 +09:00
Andrei Zavatski
9321f20884
Move arrow to the first line
2019-08-26 14:32:27 +03:00
Andrei Zavatski
fd0f42eee4
Fix filtered grouped difficulty items in DrawableCarouselBeatmapSet aren't hidden on first load
2019-08-26 14:11:24 +03:00
Dean Herbert
07380af877
Merge branch 'master' into scrolling-lifetime-safety
2019-08-26 19:07:05 +09:00
Dean Herbert
0422c19c2f
Group lifetime setters together
2019-08-26 19:06:23 +09:00
Dean Herbert
dffb2d6474
Merge branch 'master' into relative-beat-lengths
2019-08-26 18:59:50 +09:00
Dean Herbert
28dc51279a
Allow RulesetConfigCache to return null configs ( #5835 )
...
Allow RulesetConfigCache to return null configs
2019-08-26 18:59:26 +09:00
Dean Herbert
b41bed8ba0
Add nullref safety to FrameStablePlayback boolean ( #5834 )
...
Add nullref safety to FrameStablePlayback boolean
2019-08-26 18:58:27 +09:00
Dean Herbert
62641c149d
Fx component lookups being incorrect for non-databased legacy skins
2019-08-26 18:20:45 +09:00
smoogipoo
fd4c6e08ca
Merge remote-tracking branch 'origin/master'
2019-08-26 17:37:06 +09:00
smoogipoo
fb1cd9e5e7
Add a sane default lifetime end for scrolling hitobjects
2019-08-26 16:47:23 +09:00
smoogipoo
6dfe95db74
Allow RulesetConfigCache to return null configs
2019-08-26 16:34:12 +09:00
smoogipoo
6596d7fc46
Add nullref safety to FrameStablePlayback boolean
2019-08-26 16:33:24 +09:00
smoogipoo
1cfe2b7de8
Fix timing points beyond the end time potentially becoming dominant
2019-08-26 16:31:34 +09:00
Dean Herbert
289bd8e6b0
Don't return DefaultSkin on beatmap skin parsing failure
2019-08-26 14:25:35 +09:00
smoogipoo
d99c60adc7
Provide a way to scale beat lengths relative to each other
2019-08-26 12:51:13 +09:00
Dean Herbert
5e362d10b1
Add ruleset-specific legacy skin providers
...
This moves implementation of osu! skinnables to OsuLegacySkin.
2019-08-26 12:21:49 +09:00
Dean Herbert
de2c6aa23d
Rename and expand usability of SkinProvidingContainer
2019-08-26 12:21:11 +09:00
Dean Herbert
9881d3677d
Simplify icon creation
2019-08-25 12:05:46 +09:00
Dean Herbert
ef397434f6
use GroupBy instead of Distinct+FindAll
2019-08-25 12:00:06 +09:00
Dean Herbert
1d34124667
Revert all DifficultyIcon changes
2019-08-25 11:56:07 +09:00
Dean Herbert
2e21fbcf6a
Fix incorrect colour usage
2019-08-25 11:44:56 +09:00
Dean Herbert
a19a9b90ed
Simplify group filter display
2019-08-25 11:39:26 +09:00
Dean Herbert
524547adbf
Merge branch 'master' into implement-grouped-difficulty-icons
2019-08-24 17:34:58 +09:00
Lucas A
b204e4419a
Rename SelectSortingMode & SelectGroupingMode -> SongSelectSortingMode & SongSelectGroupingMode
2019-08-24 10:34:54 +02:00
Dean Herbert
c4d203cb5c
Merge branch 'master' into allow-contents-in-difficulty-icon
2019-08-24 17:22:24 +09:00
iiSaLMaN
af4adb6339
Add xmldoc
2019-08-24 09:43:55 +03:00
iiSaLMaN
0bcd323d17
Remove unnecessary string literal
2019-08-24 09:30:43 +03:00
iiSaLMaN
008e39b738
Remove redundant using directive
2019-08-24 01:40:40 +03:00
iiSaLMaN
8ccbe84f67
Loop on distinct rulesets of beatmap instead of all
2019-08-24 01:30:33 +03:00
iiSaLMaN
f6feef6b56
Remove redundant using directive
2019-08-24 00:33:14 +03:00
iiSaLMaN
87340061e1
Add logic to create grouped difficulty icons in carousel beatmap set
2019-08-24 00:06:28 +03:00
iiSaLMaN
63e6aca61b
Add logic to create grouped difficulty icons in direct panel
2019-08-23 23:40:41 +03:00
iiSaLMaN
83b6e0f30c
Implement grouped difficulty icon
2019-08-23 23:36:23 +03:00
iiSaLMaN
d4236c574f
Allow difficulty icon to be updateable
2019-08-23 23:30:54 +03:00
iiSaLMaN
f639df849f
Allow for difficulty icon to contain content
2019-08-23 23:11:36 +03:00
iiSaLMaN
1295ec490f
Fix difficulty icon not wrapping correctly in beatmap set overlay
2019-08-23 17:57:31 +03:00
Lucas A
ce5ee095b9
Fetch config bindables in BDL.
2019-08-23 14:03:56 +02:00
iiSaLMaN
da72806693
Remove lookup logic from SkinnableSound
2019-08-23 14:55:38 +03:00
iiSaLMaN
b6b050d5e9
Add sample path to the lookup names
2019-08-23 14:55:06 +03:00
iiSaLMaN
7b04fb1690
StoryboardSample -> StoryboardSampleInfo
2019-08-23 14:54:39 +03:00
Andrei Zavatski
0cde0982e5
Use cansellation token
2019-08-23 14:52:26 +03:00
Andrei Zavatski
7e34afeab8
Conver to method group
2019-08-23 14:38:18 +03:00
iiSaLMaN
d8535574d1
Pass sample info to Skin.GetSample
2019-08-23 14:32:43 +03:00
Lucas A
6bf31e8f91
Make song select grouping & sorting filters persistent
2019-08-23 13:15:38 +02:00
Andrei Zavatski
45c0826314
Remove repetitive code
2019-08-23 14:14:39 +03:00
Andrei Zavatski
050130e159
Refactor PaginatedContainer to centralise repetitive logic
2019-08-23 14:11:21 +03:00
Andrei Zavatski
9616eedcfc
Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info
2019-08-23 13:53:48 +03:00
Dean Herbert
0f4d79b5d9
Merge branch 'master' into dependabot/nuget/ppy.osu.Game.Resources-2019.823.0
2019-08-23 19:24:58 +09:00
Andrei Zavatski
87379a42c8
Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info
2019-08-23 13:05:19 +03:00
dependabot-preview[bot]
c836ef5721
Bump ppy.osu.Game.Resources from 2019.809.0 to 2019.823.0
...
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources ) from 2019.809.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-resources/releases )
- [Commits](https://github.com/ppy/osu-resources/compare/2019.809.0...2019.823.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 10:04:00 +00:00
dependabot-preview[bot]
11a61b953b
Bump ppy.osu.Framework from 2019.821.0 to 2019.823.0
...
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework ) from 2019.821.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-framework/releases )
- [Commits](https://github.com/ppy/osu-framework/compare/2019.821.0...2019.823.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 09:43:34 +00:00
Dean Herbert
a502cd4b63
Merge remote-tracking branch 'upstream/master' into fix-mute-button-alignment-and-size
2019-08-23 17:43:12 +09:00
Dean Herbert
c55d237db6
Use BindValueChanged
2019-08-23 17:42:40 +09:00
Joehu
c41b1e9eb4
Fix alignment and size of mute button
2019-08-22 21:36:21 -07:00
Dean Herbert
900df5d72f
Fix crash on closing game
2019-08-23 13:02:50 +09:00
smoogipoo
a30567394e
Remove bottom margin from show more button
2019-08-23 12:39:33 +09:00
Andrei Zavatski
f4d2bb036b
Expand KudosuAction list
2019-08-22 16:50:54 +03:00
Andrei Zavatski
67e0a2e35e
Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info
2019-08-22 16:33:25 +03:00
iiSaLMaN
66d8440167
Move non-bank samples logic to LegacySkin
2019-08-22 12:50:47 +03:00
Dean Herbert
82209aed82
Merge branch 'master' into humanizer-fallback
2019-08-22 17:58:40 +09:00
Shane Woolcock
f19b5ba570
Merge branch 'master' into fix-decoding-loop
2019-08-22 17:02:13 +09:30
Dean Herbert
8018aba852
Merge branch 'master' into kudosu-info
2019-08-22 14:30:26 +09:00
Dean Herbert
db1ff6d211
Fix video decoding loop running permanently in the background
2019-08-22 13:48:27 +09:00
Dean Herbert
4f98361da3
One more offset removed
2019-08-21 22:22:03 +09:00
Dean Herbert
acc07c1d65
Remove mod icon offset
2019-08-21 22:18:29 +09:00
Dean Herbert
7bf430afd5
Add padding back to difficulty icons on carousel
2019-08-21 21:16:06 +09:00
iiSaLMaN
87f3184fcc
Try retrieving samples without bank names
...
Fallback for spinner bonus samples
2019-08-21 15:14:33 +03:00
Dean Herbert
6797f92b96
Merge branch 'master' into dependabot/nuget/SharpCompress-0.24.0
2019-08-21 20:15:23 +09:00
Andrei Zavatski
727a6abaf7
Simplify caching
2019-08-21 12:16:30 +03:00
dependabot-preview[bot]
fb8d8f9438
Bump SharpCompress from 0.23.0 to 0.24.0
...
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress ) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases )
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.23...0.24 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-21 08:27:56 +00:00
Andrei Zavatski
0ccfaeb8d9
Simplify moving average
2019-08-21 10:13:59 +03:00
Andrei Zavatski
a5acc913ea
CI fixes
2019-08-21 09:58:47 +03:00
Andrei Zavatski
a994ad9c84
Use moving average to calculate arrow position
2019-08-21 09:40:15 +03:00
Andrei Zavatski
336f979480
Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
2019-08-21 09:39:28 +03:00
Dean Herbert
fd26ef739a
Merge remote-tracking branch 'upstream/master' into back-button-part-2
2019-08-21 15:23:54 +09:00
Andrei Zavatski
71cbc3525d
Add/remove displays only if necessary
2019-08-21 09:16:09 +03:00
Andrei Zavatski
ed2002f717
Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
2019-08-21 09:15:48 +03:00
Dean Herbert
28dfe072a5
Update one more blending mode change post-master merge
2019-08-21 15:11:46 +09:00
Dean Herbert
4186d2566a
Remove unnecessary null checks
2019-08-21 15:11:33 +09:00
Dean Herbert
745bd58f37
Merge remote-tracking branch 'upstream/master' into update-framework-blending
2019-08-21 15:10:08 +09:00
Dean Herbert
8917f7cc95
Merge pull request #5776 from peppy/animated-slider-ball
...
Add slider ball animation support
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-21 15:02:35 +09:00
Dean Herbert
444f2b9387
Specify font size in a saner way
2019-08-21 15:01:50 +09:00
Andrei Zavatski
ab1586ff33
Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
2019-08-21 08:56:34 +03:00
Dean Herbert
6a48819055
Merge branch 'master' into update-framework-blending
2019-08-21 14:27:57 +09:00
Dean Herbert
66a2eecb7a
Merge remote-tracking branch 'upstream/master' into music-playback-improvements
2019-08-21 14:01:11 +09:00
Dean Herbert
724365c6d1
Minor tidying
2019-08-21 14:01:07 +09:00
Dean Herbert
cca64771dd
Add comment about placement of default loading
2019-08-21 13:56:49 +09:00
Dean Herbert
aa8b7b60de
Merge remote-tracking branch 'upstream/master' into update-framework-blending
2019-08-21 13:30:24 +09:00
Dean Herbert
62218613da
Merge remote-tracking branch 'smoogipoo/spritetext-glyph-rework' into update-framework-blending
2019-08-21 13:30:19 +09:00
Dean Herbert
48716f8f2b
Update framework
2019-08-21 13:29:50 +09:00
Dan Balasescu
33083bcf40
Merge branch 'master' into animated-slider-ball
2019-08-21 13:15:45 +09:00
Dan Balasescu
82fe506f97
Merge branch 'master' into animated-legacy-skins
2019-08-21 13:03:11 +09:00
Dan Balasescu
758f10b9fd
Merge branch 'master' into fix-skin-test-regression
2019-08-21 12:45:47 +09:00
iiSaLMaN
439d825dd1
Disallow adding bonus judgements' result to statistics
2019-08-20 18:39:29 +03:00
Andrei Zavatski
426c7a4898
Fix incorrect templates
2019-08-20 16:19:21 +03:00
Andrei Zavatski
5c7cb4dc21
Simplify text creation
2019-08-20 16:11:59 +03:00
Andrei Zavatski
c4344f3f7c
CI fixes
2019-08-20 15:29:32 +03:00
Andrei Zavatski
f1d02d8169
Update design in line with web
2019-08-20 15:00:14 +03:00
smoogipoo
0de219dda4
Update with spritetext text builder changes
2019-08-20 19:03:57 +09:00
Lucas A
33946f0458
Fix CI issues and update comments.
2019-08-20 11:18:41 +02:00
Dean Herbert
4bffb0df84
Merge branch 'animated-legacy-skins' into animated-slider-ball
2019-08-20 18:14:17 +09:00
Dean Herbert
1616b4528d
Merge branch 'master' into animated-legacy-skins
2019-08-20 17:40:18 +09:00
Dean Herbert
6dd638b327
Further improve legibility of texture lookup
2019-08-20 17:39:24 +09:00
Andrei Zavatski
f72edb8bf8
Add missing blank line
2019-08-20 09:03:31 +03:00
Dean Herbert
84530b7839
Colour the correct layer
2019-08-20 15:02:07 +09:00
Andrei Zavatski
596ee150c6
Add xmldoc for not obvious const
2019-08-20 08:51:41 +03:00
Andrei Zavatski
9f64e09625
Move HitErrorDisplayOverlay back to the HUD
2019-08-20 08:45:51 +03:00
Dean Herbert
f7ce7c7d99
Merge branch 'fix-skin-test-regression' into animated-slider-ball
2019-08-20 14:09:53 +09:00
Andrei Zavatski
d337f9b482
DefaultHitErrorDisplay -> BarHitErrorDisplay
2019-08-20 08:03:17 +03:00
Andrei Zavatski
c4251d512e
Simplify bar building
2019-08-20 08:00:09 +03:00
Dean Herbert
3b7cee2d45
Fix LegacySkin not checking for @2x hitcircle when deciding sizing
2019-08-20 13:50:16 +09:00
Dean Herbert
b5cb59faf2
Add default skin sprites and specular/diffuse layer support
2019-08-20 13:19:32 +09:00
Dean Herbert
caf8354f50
Merge branch 'master' into music-playback-improvements
2019-08-20 11:49:39 +09:00
Andrei Zavatski
415f180261
Delete extra semicolon
2019-08-19 22:53:28 +03:00
Andrei Zavatski
50c47568e4
Don't present Meh hit windows if it has no value
2019-08-19 22:45:27 +03:00
Andrei Zavatski
f1c3a60660
Add ability to select side
2019-08-19 22:04:27 +03:00
Andrei Zavatski
1bff103d32
CI fixes
2019-08-19 21:25:14 +03:00
Andrei Zavatski
6d3aa0520b
Make HitErrorDisplay an abstract class
2019-08-19 20:44:06 +03:00
Andrei Zavatski
70084b5553
Move HitErrorDisplay outside of the HUD
2019-08-19 20:28:03 +03:00
Andrei Zavatski
f70a7abea3
Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
2019-08-19 19:36:28 +03:00
Andrei Zavatski
6b8fbf0eb1
Change link format back
...
Due to unavaliability to handle round brackets
2019-08-19 17:59:55 +03:00
Andrei Zavatski
daeefc449c
Use another link format to avoid representation issues
2019-08-19 17:49:53 +03:00
Desconocidosmh
b3556403aa
Make GetNextObject() a virtual method
2019-08-19 16:18:25 +02:00
Andrei Zavatski
fd21e06389
Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info
2019-08-19 17:16:50 +03:00
Dean Herbert
d0766fa1cd
Add slider ball animation support
2019-08-19 19:55:47 +09:00
Dean Herbert
539a27a557
Refactor texture lookup code
2019-08-19 19:23:54 +09:00
Dean Herbert
d02b8d14f7
Avoid unnecessary texture retrieval for non-animated sprites
2019-08-19 17:47:59 +09:00
Dean Herbert
d224405bc6
Rename const and make more available
2019-08-19 17:46:05 +09:00
Dean Herbert
4356f2ef9f
Add sample usage of looping skinnable
2019-08-19 17:45:54 +09:00
Dean Herbert
9ea4921e2b
Merge pull request #5036 from GSculerlor/difficulty-icon-tooltip
...
Add tooltips to difficulty icons with extra details
2019-08-19 17:23:13 +09:00
Dan Balasescu
18ee2f5e99
Merge branch 'master' into centre-beatmap-panels
2019-08-19 13:27:40 +09:00
Dean Herbert
be51fde292
Centre beatmap panels in profile overlay
2019-08-19 13:22:32 +09:00
Dan Balasescu
9c069f6f22
Merge branch 'master' into unpause-on-selection-change
2019-08-19 13:15:46 +09:00
Dan Balasescu
01df3c982a
Merge branch 'master' into fix-tooltips-not-displaying
2019-08-19 12:51:06 +09:00
Ganendra Afrasya
7143497441
Match up tooltip background color with OsuTooltipContainer
2019-08-19 10:32:01 +07:00
Dan Balasescu
0f9c47686f
Merge branch 'master' into difficulty-icon-tooltip
2019-08-19 12:21:23 +09:00
Dan Balasescu
f20085df54
Merge branch 'master' into refactor-difficulty-colours
2019-08-19 11:39:19 +09:00
Dean Herbert
1f00793891
Unpause music when changing selection at song select
2019-08-19 11:30:04 +09:00
Dean Herbert
a51fbfa31b
Fix osu! default tooltips not displaying
2019-08-19 10:46:28 +09:00
Andrei Zavatski
015406f4d2
Fix link parser
2019-08-18 22:02:59 +03:00
Andrei Zavatski
4c9b621f43
Fix some user links can't be opened inside the game
2019-08-18 22:01:36 +03:00
Andrei Zavatski
be97804180
Implement text formatting
2019-08-18 21:28:07 +03:00
Andrei Zavatski
2393bbc69b
Expand APIKudosuHistory
2019-08-18 21:27:53 +03:00
Lucas A
3fcd786198
Take lease on WorkingBeatmap during intro screens to prevent weird interactions with Playback control.
2019-08-18 19:32:56 +02:00
Andrei Zavatski
550dcee60d
Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info
2019-08-18 17:14:34 +03:00
Andrei Zavatski
4c817b18b7
Use direct cast
2019-08-18 17:03:11 +03:00
Andrei Zavatski
dd6351b8ca
Apply suggested changes
2019-08-18 16:51:16 +03:00
Andrei Zavatski
6c60db550f
Fix crash if ruleset has no Meh hit windows
2019-08-18 16:24:13 +03:00
Andrei Zavatski
55cd1cecdf
Add missing blank line
2019-08-18 15:53:42 +03:00
Andrei Zavatski
8740ebd13f
Simplify layout
2019-08-18 15:45:18 +03:00
Andrei Zavatski
a59a14c9e6
Add setting to enable/disable hit error visibility
2019-08-18 15:01:04 +03:00
Andrei Zavatski
ee5568e596
Use Queue instead of List for stored Judgements
2019-08-18 14:43:34 +03:00
Andrei Zavatski
50133ba863
naming adjustments
2019-08-18 02:57:12 +03:00
Andrei Zavatski
906984ad95
Fix the math
2019-08-18 02:49:07 +03:00
Andrei Zavatski
f7024b513e
Visual improvements
2019-08-18 01:43:43 +03:00
Andrei Zavatski
94dbd6386f
Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
2019-08-18 01:14:27 +03:00
Dean Herbert
ecc04baf14
Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip
2019-08-17 15:35:28 +09:00
Dean Herbert
87dc6499fa
Fix json decoding being a bit too eager to consume
2019-08-17 15:34:02 +09:00
Dean Herbert
097763bb1c
Add auto size duration
2019-08-17 15:29:39 +09:00
Dean Herbert
50046d5f69
Use new tooltip style
2019-08-17 15:20:27 +09:00
Dean Herbert
3dc81bdad5
Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip
2019-08-17 15:19:46 +09:00
Dean Herbert
4fa9abeece
Replace DifficultyColouredContainer with a more scalable solution
2019-08-17 15:16:24 +09:00
Dean Herbert
f552de6ebc
Merge branch 'master' into difficulty-icon-tooltip
2019-08-17 13:45:20 +09:00
Salman Ahmed
7bbacb6ba1
Merge branch 'master' into add-adjustment-function-for-skinnable-sound
2019-08-17 02:48:30 +03:00
Dean Herbert
0484caf430
Merge branch 'master' into animated-legacy-skins
2019-08-16 21:12:59 +09:00
Dean Herbert
8258c4a80a
Merge pull request #5734 from smoogipoo/non-frame-stable-editor
...
Disable frame-stable playback in the editor
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-16 21:12:25 +09:00
Dean Herbert
152df9f3d5
Remove accidental blank line
2019-08-16 20:23:09 +09:00
Dean Herbert
d11b896148
Move FrameStablePlayback handling to early return
2019-08-16 20:21:00 +09:00
Dean Herbert
58d2268b9e
Combine conditionals that provide the same behaviour
2019-08-16 19:52:35 +09:00
Dean Herbert
132d51a2cc
Update tooltip implementation
2019-08-16 19:47:35 +09:00
Dean Herbert
536e7d8757
Update framework
2019-08-16 19:32:17 +09:00
Dean Herbert
d771c271a3
Merge remote-tracking branch 'upstream/master' into fix-checkbox-sounds
2019-08-16 19:32:01 +09:00
Dan Balasescu
059d90bc42
Merge branch 'master' into reduce-hold-to-confirm-delay
2019-08-16 14:00:43 +09:00
Dean Herbert
d732d276b1
Make activation delay customisable
2019-08-16 13:21:41 +09:00
Dean Herbert
b57298406f
Fix right click blocking not resetting correctly
2019-08-15 19:25:33 +09:00
Dean Herbert
fc05cab050
Merge remote-tracking branch 'upstream/master' into fix-song-select-context-menus
2019-08-15 18:27:49 +09:00
Dean Herbert
0f4bada21e
Fix right click absolute scrolling interfering with context menus
2019-08-15 18:27:45 +09:00
smoogipoo
8c67f58e2d
Disable frame-stable playback in the editor
2019-08-15 18:25:31 +09:00
Dean Herbert
ef5ed915e5
Reduce delay for hold-to-confirm controls
2019-08-15 17:14:00 +09:00
Dean Herbert
8f63887972
Make use of existing null check
2019-08-15 14:38:49 +09:00
Dean Herbert
9e13a6aeae
Fix newlines being considered in user profile content
2019-08-15 14:38:04 +09:00
Dean Herbert
f7a92487ef
Fix checkbox sounds playing too often
2019-08-15 14:09:30 +09:00
Dean Herbert
e73a9c2748
Fix song select context menus displaying off-screen
2019-08-15 14:06:29 +09:00
Dean Herbert
f355cff8bc
Apply reviews
2019-08-15 12:11:54 +09:00
Dean Herbert
7e74953784
Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip
2019-08-15 11:54:59 +09:00
iiSaLMaN
cfa569b226
Add looping field and fix build
2019-08-15 05:35:47 +03:00
iiSaLMaN
07e7e1187c
Add adjustment function in SkinnableSound
2019-08-15 05:30:35 +03:00
dependabot-preview[bot]
3379672a43
Bump ppy.osu.Framework from 2019.813.0 to 2019.814.0
...
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework ) from 2019.813.0 to 2019.814.0.
- [Release notes](https://github.com/ppy/osu-framework/releases )
- [Commits](https://github.com/ppy/osu-framework/compare/2019.813.0...2019.814.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-14 12:17:17 +00:00
smoogipoo
3a79a4149a
Disable music controls when beatmap is disabled
2019-08-14 15:19:21 +09:00
Dean Herbert
52f42ddade
Use child instead of children
2019-08-14 10:53:47 +09:00
Dean Herbert
b6bc84af2c
Fix chat context menus displaying out-of-bounds
2019-08-14 10:52:26 +09:00
Dean Herbert
5886420a5d
Merge branch 'master' into back-button-part-2
2019-08-13 21:38:31 +09:00
Dean Herbert
8ce2c876bf
Merge branch 'master' into multi-room-update
2019-08-13 21:03:03 +09:00
Dean Herbert
5963f7d914
Update comment
2019-08-13 19:52:40 +09:00
Dean Herbert
ea18a8dd12
Merge branch 'master' into music-controller-hotkeys
2019-08-13 19:08:52 +09:00
smoogipoo
e356cc8d9e
Refactor MatchBeatmapPanel for thread safety
2019-08-13 17:57:16 +09:00
dependabot-preview[bot]
f2e596de16
Bump ppy.osu.Framework from 2019.809.0 to 2019.813.0
...
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework ) from 2019.809.0 to 2019.813.0.
- [Release notes](https://github.com/ppy/osu-framework/releases )
- [Commits](https://github.com/ppy/osu-framework/compare/2019.809.0...2019.813.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-13 08:54:17 +00:00
smoogipoo
7c9c9f1ce1
Simplify caching
2019-08-13 17:38:21 +09:00
smoogipoo
92c2dafa12
Tighten accessibility
2019-08-13 17:34:16 +09:00
smoogipoo
6b57c9801d
Cull some unnecessary whitespace
2019-08-13 17:32:43 +09:00
smoogipoo
2b155e5407
Merge remote-tracking branch 'origin/master' into multi-room-update
2019-08-13 17:03:44 +09:00
Dan Balasescu
77fca7b04a
Merge branch 'master' into split-out-music-controller
2019-08-13 17:03:15 +09:00
Dean Herbert
4948e7d31c
Merge branch 'master' into split-out-music-controller
2019-08-13 16:43:56 +09:00
Dan Balasescu
f6e1df8952
Merge branch 'master' into triangles
2019-08-13 16:34:08 +09:00
Dean Herbert
6a70849acb
Merge branch 'split-out-music-controller' into music-controller-hotkeys
2019-08-13 15:08:33 +09:00
Dean Herbert
b942192e00
Fix remaining nullref
2019-08-13 15:04:04 +09:00
Dean Herbert
81f8b5f325
Fix merge issue
2019-08-13 14:52:51 +09:00
Dean Herbert
5898198da6
Merge branch 'split-out-music-controller' into music-controller-hotkeys
2019-08-13 14:48:14 +09:00
Dean Herbert
2cbdf8c01c
Update public methods in line with future usage
2019-08-13 14:46:57 +09:00
Dean Herbert
de1ab56a2c
Fix potential nullref on disposal
2019-08-13 14:45:27 +09:00
Dean Herbert
9aac5efa4e
Move logic out of OsuGame
2019-08-13 14:42:59 +09:00
Dean Herbert
8d23cda51a
Merge branch 'split-out-music-controller' into music-controller-hotkeys
2019-08-13 14:33:35 +09:00
Dean Herbert
ad24265730
Split visual component out of MusicController
2019-08-13 14:30:18 +09:00
Dan Balasescu
9c43021c28
Merge branch 'master' into previous-usernames
2019-08-13 14:21:44 +09:00
smoogipoo
8d3f2f7645
Drop container from name
2019-08-13 14:09:10 +09:00
smoogipoo
5681d1097c
Move into components namespace
2019-08-13 14:07:40 +09:00
Dean Herbert
5dbde38a6b
Group key bindings together
2019-08-13 12:40:20 +09:00
David Zhao
4a28bdd384
Merge remote-tracking branch 'upstream/master' into back-button-part-2
2019-08-13 12:26:12 +09:00
Dean Herbert
f3380c9372
Remove "jukebox" terminology
2019-08-13 12:06:57 +09:00
Dean Herbert
6328fd9363
Merge remote-tracking branch 'upstream/master' into music-controller-hotkeys
2019-08-13 11:57:18 +09:00
Dean Herbert
4ccac60337
Merge remote-tracking branch 'upstream/master' into refactor-osd
2019-08-13 11:35:54 +09:00
Dean Herbert
5447e7cf22
Fix file ordering
2019-08-13 11:34:45 +09:00
Dean Herbert
bc49164cc1
Merge branch 'master' into animated-legacy-skins
2019-08-13 00:40:20 +09:00
Dean Herbert
433b701df3
Make line slightly thicker (to display better at low resolutions)
...
Also tidies up code.
2019-08-13 00:21:52 +09:00
Dean Herbert
a7ae0e6677
Merge remote-tracking branch 'upstream/master' into beatmap-scope-selector
2019-08-13 00:16:53 +09:00
Dean Herbert
c0f0fbbaa9
Rename variable and add xmldoc
2019-08-13 00:14:37 +09:00
iiSaLMaN
883102ee5d
Move score multiplier logic inside score calculation
2019-08-12 16:40:52 +03:00
Andrei Zavatski
9c36cb4af4
Use existing AccentColour logic instead of weird BoxColour
2019-08-12 14:33:30 +03:00
Andrei Zavatski
ba49a4c2da
Use existing PageTabControl for layout
2019-08-12 13:16:57 +03:00
Lucas A
6533f114d4
Apply review suggestions
2019-08-12 12:09:09 +02:00
Andrei Zavatski
fc521ac93b
Expose BoxColour property
2019-08-12 13:08:15 +03:00
Andrei Zavatski
144d41f143
Add ability to not add all the items if enum
2019-08-12 12:33:01 +03:00
Andrei Zavatski
2bbac7cdfc
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-scope-selector
2019-08-12 12:18:32 +03:00
Lucas A
9c15024014
Reword and add missing xmldoc to OnScreenDisplay
2019-08-12 10:53:06 +02: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
Andrei Zavatski
982066dfdf
Convert to method group
2019-08-12 10:38:34 +03:00
Dean Herbert
75cb0d093b
Use description correctly
...
Required for localisation
2019-08-12 16:10:48 +09:00
Andrei Zavatski
cb910a6518
Replace if/else statement
2019-08-12 10:02:45 +03:00
Andrei Zavatski
5b68a2f34a
Rename trackManager to previewTrackManager
2019-08-12 09:50:49 +03:00
Dean Herbert
a83afd00b5
Merge branch 'master' into beatmap-scope-selector
2019-08-12 15:48:53 +09:00
Andrei Zavatski
520924b440
Don't create a new request if onlineId is null
2019-08-12 09:45:21 +03:00
Andrei Zavatski
6095480a54
Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update
2019-08-12 09:36:15 +03: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
ea4a97ebd9
Merge branch 'master' into refactor-osd
2019-08-12 02:27:02 +09:00
Dean Herbert
9ac4870a21
Merge branch 'master' into triangles
2019-08-12 02:24:45 +09:00
Lucas A
e4eed83d85
Add dual bindings for Jukebox hotkeys
2019-08-11 19:14:49 +02:00
Dean Herbert
359261d4a4
Fix game not starting if intro music is disabled
2019-08-12 02:04:06 +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
Andrei Zavatski
e7964c165f
Make judgement lines alive for a bit longer
2019-08-11 19:09:50 +03:00
Andrei Zavatski
3136d46c7f
Do not generate new judgement line on miss
2019-08-11 19:04:56 +03:00
Andrei Zavatski
5e0ac28ca8
Add basic colours
2019-08-11 18:30:03 +03:00
Andrei Zavatski
177a317a48
rename AccuracyBar to HitErrorDisplay
2019-08-11 18:11:49 +03:00
Andrei Zavatski
2a35c3c3e2
Calculate real position for judgement lines
2019-08-11 18:04:54 +03:00
Unknown
cc4ee2df05
add ToString() override to Beatmap class
2019-08-11 16:41:56 +02:00
Andrei Zavatski
0a255fe4d1
Add moving arrow
2019-08-11 16:38:03 +03:00
Andrei Zavatski
ed409d113b
Add judgement lines generator
2019-08-11 15:53:15 +03:00
Andrei Zavatski
fd334e0319
Implement basic layout for AccuracyBar
2019-08-11 14:57:21 +03:00
Dean Herbert
684c37bf05
Rename class to better match usage
2019-08-11 16:19:40 +09:00
Dean Herbert
c2e2c1e67e
Merge branch 'master' into refactor-osd
2019-08-11 13:13:12 +09:00
Lucas A
7825923cb6
Use media keys as default bindings for jukebox.
2019-08-10 16:33:16 +02:00
Lucas A
fdf76be967
Merge branch 'master' into music-controller-hotkeys
2019-08-10 16:29:02 +02:00
Lucas A
8c630b4f4c
Merge branch 'refactor-osd' into music-controller-hotkeys
2019-08-10 16:25:59 +02: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
Lucas A
fc4c0cc2e7
Fix visual discrepancies with master
2019-08-10 10:52:37 +02:00
Dean Herbert
caf13ae52d
Update framework
2019-08-09 23:29:32 +09:00
Dean Herbert
8e6a3162ab
Update resources
2019-08-09 20:05:36 +09:00
Dean Herbert
cb0cd7ed58
Add triangles intro
2019-08-09 20:05:28 +09:00
Dean Herbert
90b1fe81f3
Update cached usage in line with framework changes
2019-08-09 19:12:29 +09:00
Andrei Zavatski
093359c13b
fix incorrect json property
2019-08-09 11:19:14 +03:00
Andrei Zavatski
cf2a9db8e0
Implement basic layout for kudosu history
2019-08-09 11:14:38 +03:00
Andrei Zavatski
5073bce2dc
Basic request implementation
2019-08-09 10:47:52 +03:00
smoogipoo
5486c77362
Remove explicit autosize
2019-08-09 15:25:42 +09:00
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
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
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
Andrei Zavatski
9ab132520c
Testcase improvements
2019-08-08 12:25:46 +03:00
Andrei Zavatski
e9b5c91690
Fade out existing panel on beatmap change
2019-08-08 12:08:51 +03:00
Andrei Zavatski
08a92c38d7
adjust naming
2019-08-08 12:04:44 +03:00
Andrei Zavatski
1b559c1585
Use async loading
2019-08-08 12:01:33 +03:00
Andrei Zavatski
0ec45e2a8b
Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update
2019-08-08 11:54:11 +03:00
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
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
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
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
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
David Zhao
cf9a5baafa
Explicity dispose osuGame instances
2019-08-07 14:51:24 +09:00
Andrei Zavatski
1d42f0959a
ModIcon improvements
2019-08-07 08:46:27 +03:00
Andrei Zavatski
b064df91a7
Initial implementation
2019-08-07 08:33:55 +03: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
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
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
Andrei Zavatski
3cfbbac5dc
Expand requests
2019-08-06 17:47:31 +03:00
Max Hübner
ffb6794b4e
formatting inspection
2019-08-06 16:11:13 +02: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
Dean Herbert
e3f88a83a0
Fix drawable channels remaining in memory after being closed ( #5607 )
...
Fix drawable channels remaining in memory after being closed
2019-08-06 22:58:14 +09:00
iiSaLMaN
2a68bb2749
onCompletionEvent -> pushResults
2019-08-06 14:11:43 +03:00
iiSaLMaN
dd701eaa62
Safely cancel the completion task on restart or immediate exit
2019-08-06 14:10:03 +03:00
David Zhao
ac0abe0692
Use newly exposed UpdateState
2019-08-06 14:21:34 +09:00
David Zhao
28825d4077
Merge remote-tracking branch 'upstream/master' into re-order-events
2019-08-06 14:00:35 +09:00
Joehu
11aa3544c4
Fix shear width naming
2019-08-05 20:57:17 -07:00
Joehu
ee6a90c48d
Fix back button hover sounds playing in unclickable area
2019-08-05 20:43:30 -07:00
David Zhao
66b02c0283
log type as well
2019-08-06 12:27:10 +09:00
Joehu
1fc7ddf621
Fix text depth regression
2019-08-05 18:14:41 -07:00
David Zhao
cd6fe91882
Log error for invalid events
2019-08-06 10:05:21 +09:00
Joehu
a7ac411c25
Fix footer button hover sounds playing in unclickable area
2019-08-05 17:57:04 -07:00
smoogipoo
11916782ba
Fix drawable channels remaining in memory after being closed
2019-08-05 19:23:13 +09:00
Andrei Zavatski
749a00cc2f
Force bindable change
2019-08-05 12:49:54 +03:00
Andrei Zavatski
c591cb83eb
Merge remote-tracking branch 'refs/remotes/ppy/master' into move-graph-data-to-statistics
2019-08-05 12:45:29 +03:00
Dean Herbert
bf0f6e1053
Fix memory leaks from download buttons ( #5606 )
...
Fix memory leaks from download buttons
2019-08-05 11:31:04 +02:00
smoogipoo
ee9e8f6261
Fix memory leaks from download buttons
2019-08-05 17:58:16 +09:00
Dean Herbert
4df3a5ba04
Merge branch 'master' into conversion-test-mods
2019-08-05 10:57:37 +02:00
Dan Balasescu
cd27e1eb70
Merge branch 'master' into update-direct-categories-sorting
2019-08-05 17:11:48 +09:00
Dean Herbert
431834fc2f
Merge remote-tracking branch 'upstream/master' into conversion-test-mods
2019-08-05 09:50:43 +02:00
Dean Herbert
9fab345d79
Refactor beatmap conversion testing ( #5555 )
...
Refactor beatmap conversion testing
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-05 09:45:30 +02:00
Dan Balasescu
b20f1d1717
Merge branch 'master' into fix-settings-sidebar-max-ui-scale
2019-08-05 13:42:04 +09:00
Dan Balasescu
b9c406f3b2
Merge branch 'master' into profile-ruleset-selector-improvements
2019-08-05 13:31:23 +09:00
smoogipoo
d839717131
Remove unnecessary intermediate method
2019-08-05 13:18:29 +09:00
Max Hübner
2f5d23b354
add join command
2019-08-05 01:02:42 +02:00
Dean Herbert
d5be87c06a
Update heart colour of supporter icon ( #5594 )
...
Update heart colour of supporter icon
2019-08-04 16:07:25 +02:00
Andrei Zavatski
d693a54c84
Move RankHistoryData to User Statistics
2019-08-04 14:35:26 +03:00
Dean Herbert
b0a27161c6
Merge pull request #5588 from UselessToucan/update_ef_core
...
Update Entity Framework Core
2019-08-04 13:16:00 +02:00
Andrei Zavatski
3ae5428dad
ProfileRulesetSelector improvements
2019-08-04 14:15:16 +03:00
Andrei Zavatski
fd44ca3233
Rename Animation to Layer
2019-08-04 13:54:23 +03:00
Andrei Zavatski
a30d7912b1
Move DimmedLoadingAnimation to it's own file
2019-08-04 11:09:12 +03:00
Andrei Zavatski
c8acbdb1d9
Update the colour
2019-08-04 06:15:15 +03:00
Joehu
f6f96658c7
Fix settings sidebar being behind toolbar
2019-08-03 15:22:06 -07:00
Joehu
115cf47ed5
Fix settings sidebar showing scrollbar at max ui scale
2019-08-03 15:20:44 -07:00
Roman Kapustin
c8dd29067b
Update Entity Framework Core
2019-08-04 00:34:51 +03:00
Joehu
b244b2fe3d
Add hover click sounds to leaderboard mod filter
2019-08-02 21:13:29 -07:00
Andrei Zavatski
416f9d89db
CI fixes
2019-08-03 05:49:01 +03:00
Andrei Zavatski
37be4fbf16
Use GridContainer for layout
2019-08-03 05:34:14 +03:00
Andrei Zavatski
3ae0dd5751
Merge remote-tracking branch 'refs/remotes/ppy/master' into previous-usernames
2019-08-03 04:29:00 +03:00
Joehu
0082695cd8
Choose default category sorting instead of being always first
2019-08-02 13:22:58 -07:00
Joehu
e84c79d140
Update osu!direct categories sorting with web changes
2019-08-02 13:16:33 -07:00
Dan Balasescu
7076c9a882
Merge branch 'master' into fix-music-controller-skipping-more-than-once
2019-08-02 14:03:38 +09:00
Andrei Zavatski
de96e5dfc6
Apply suggested changes
2019-08-02 07:41:11 +03:00
Andrei Zavatski
bb331106b2
Merge remote-tracking branch 'refs/remotes/ppy/master' into previous-usernames
2019-08-02 07:40:26 +03:00
Dean Herbert
0e0c2e3333
Merge branch 'master' into refactor-conversion-test
2019-08-02 06:32:10 +02:00
Dean Herbert
770b228fdb
Fix ticks in repeat spans being returned in reverse order ( #5559 )
...
Fix ticks in repeat spans being returned in reverse order
2019-08-02 06:31:11 +02:00
Dean Herbert
69c2723d90
Merge branch 'master' into refactor-conversion-test
2019-08-02 05:34:05 +02:00
Andrei Zavatski
5547592768
CI fixes
2019-08-01 23:04:18 +03:00
Andrei Zavatski
e66a3494b9
make the container hidden by default
2019-08-01 22:50:01 +03:00
Andrei Zavatski
13fe1732d8
adjust height values to avoid random jumps
2019-08-01 21:32:04 +03:00
Andrei Zavatski
90c59ab39d
implement PreviousUsernamesContainer
2019-08-01 21:26:59 +03:00
Andrei Zavatski
d558758000
Add PreviousUsernames field to the User
2019-08-01 19:14:07 +03:00
David Zhao
f0941a11b5
Remove no longer needed property
2019-08-01 21:22:08 +09:00
Dan Balasescu
67b6964eb6
Merge branch 'master' into do_not_check_cursor_visibility_on_each_update
2019-08-01 19:46:01 +09:00
smoogipoo
0ff1c6184b
Add generation comment
2019-08-01 17:36:20 +09:00
smoogipoo
a2468e599b
Fix ticks in repeat spans being returned in reverse order
2019-08-01 17:31:37 +09:00
Andrei Zavatski
0f36088ef8
Add loved section
2019-08-01 11:06:29 +03:00
iiSaLMaN
d772bbaf8c
Simplify disposing
2019-08-01 10:04:04 +03:00
David Zhao
d05b9b1734
Use dummyAPI and move load check into MusicController
2019-08-01 14:19:45 +09:00
smoogipoo
e2420af10c
Fix applying mods to the wrong beatmap
2019-08-01 13:37:52 +09:00
smoogipoo
ed4dda1936
Support beatmap conversion tests with mods
2019-08-01 12:49:01 +09:00
smoogipoo
0108700793
Make beatmap conversion test use WorkingBeatmap
2019-08-01 12:44:10 +09:00
smoogipoo
bc80fa11bb
Mode IApplicableToBeatmap application to WorkingBeatmap
2019-08-01 12:41:46 +09:00
smoogipoo
8a64ab0384
Remove generics from IApplicableToBeatmap
2019-08-01 12:39:32 +09:00
Roman Kapustin
852079d438
Remove redundant ScreenshotManager.Update override
2019-08-01 01:35:42 +03:00
jorolf
7b95741dab
fix crash and add some tests
...
- still missing special skin textures
2019-07-31 21:55:56 +02:00
iiSaLMaN
958e3fb68b
Add a property for acquiring online API access
2019-07-31 22:42:23 +03:00
iiSaLMaN
3af1aaeabe
Unsubscribe from Completed event on old beatmap
2019-07-31 15:19:02 +03:00
David Zhao
351b6e6259
Add new options test
2019-07-31 19:47:41 +09:00
David Zhao
980686f6bf
get tests running again
2019-07-31 19:30:35 +09:00
smoogipoo
e57663b39c
Apply mod score multipliers
2019-07-31 17:55:22 +09:00
smoogipoo
6bfac9f8e4
Remove protected ctor
2019-07-31 17:50:13 +09:00
David Zhao
f81e691bf5
Merge remote-tracking branch 'upstream/master' into back-button-part-2
2019-07-31 16:03:14 +09:00
David Zhao
5aece2d5f2
fix tests
2019-07-31 16:03:05 +09:00
jorolf
e01d3d85a3
Merge branch 'master' of git://github.com/ppy/osu into animated-legacy-skins
2019-07-30 20:29:04 +02:00
Dean Herbert
8caf9ade01
Add support for legacy skin "cursormiddle" display ( #5465 )
...
Add support for legacy skin "cursormiddle" display
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-31 00:26:19 +09:00
Dean Herbert
26909dc580
Update follower count API source ( #5397 )
...
Update follower count API source
2019-07-31 00:24:18 +09:00
Dean Herbert
d5a5a866e1
Update framework ( #5532 )
...
Update framework
2019-07-31 00:04:02 +09:00
Dean Herbert
9335ebeb55
Fix missing anchor/origin specification
2019-07-30 23:45:55 +09:00
Dean Herbert
f6b6fa9633
Add disappeared null check
2019-07-30 23:44:47 +09:00
Dean Herbert
f9c95e21be
Merge remote-tracking branch 'upstream/master' into legacy-cursor-middle
2019-07-30 23:44:13 +09:00
Dean Herbert
091a142c01
Merge remote-tracking branch 'upstream/master' into update-framework
2019-07-30 23:32:58 +09:00
Dean Herbert
4c6cccb3a3
Update settings in line with framework changes
2019-07-30 23:31:21 +09:00
Dean Herbert
21a8f566c3
Trim whitespace
2019-07-30 23:24:28 +09:00
Dean Herbert
d12de7dbfa
Add temporary scale hack to make cursors correct size
2019-07-30 23:20:35 +09:00
Dean Herbert
8e9f8bb565
Merge branch 'master' into slider-ball-scaling
2019-07-30 23:19:28 +09:00
Dean Herbert
fbc5285a1f
Add legacy skin hit animations ( #5464 )
...
Add legacy skin hit animations
2019-07-30 23:18:12 +09:00
Dean Herbert
6d279dba5c
Fix centering being incorrect for some skins
2019-07-30 23:07:41 +09:00
Dean Herbert
fb1f77bd04
Move implementation and colour logic to legacy implementation
2019-07-30 23:06:18 +09:00
Dean Herbert
e6bd02d276
Simplify namespace definition
2019-07-30 22:41:20 +09:00
Dean Herbert
307a6c1095
Remove DefaultCirclePiece
2019-07-30 22:38:29 +09:00
Dan Balasescu
dae17482fa
Merge branch 'master' into skinning-test
2019-07-30 22:33:39 +09:00
Dean Herbert
e849e68e99
Update framework
2019-07-30 22:24:03 +09:00
Dean Herbert
5bb31ecb00
Merge branch 'master' into update-follower-count
2019-07-30 22:20:33 +09:00
Dean Herbert
1fbaa97218
Merge branch 'master' into add-legacy-hit-animations
2019-07-30 22:20:29 +09:00
iiSaLMaN
e6e315e07b
Expose current break index
2019-07-30 13:29:41 +03:00
smoogipoo
fab3ec3e5b
Add maximum height to skin dropdown
2019-07-30 19:28:02 +09:00
smoogipoo
1222536f7a
Rename resource string
2019-07-30 19:10:21 +09:00
Dan Balasescu
114c2006c1
Merge branch 'master' into legacy-cursor-middle
2019-07-30 19:06:28 +09:00
Dan Balasescu
6a66a3b06f
Merge branch 'master' into skinning-test
2019-07-30 18:28:56 +09:00
Dan Balasescu
79f120b381
Merge branch 'master' into no-sentry-timeouts
2019-07-30 18:27:05 +09:00
Dean Herbert
20b6114863
Reduce method complexity
2019-07-30 17:52:06 +09:00
Dean Herbert
80aaa42f99
Move database isolation logic to OsuTestScene for easier reuse ( #5502 )
...
Move database isolation logic to OsuTestScene for easier reuse
2019-07-30 14:16:42 +09:00
Dean Herbert
8950f009e1
Don't report stable storage missing to sentry ( #5521 )
...
Don't report stable storage missing to sentry
2019-07-30 14:07:31 +09:00
Dean Herbert
b7ee4b7694
Fix scores without an online ID not always presenting correctly ( #5517 )
...
Fix scores without an online ID not always presenting correctly
2019-07-30 14:06:19 +09:00
David Zhao
1956098166
Add a fallback for humanizer localization failure
2019-07-30 14:06:08 +09:00
Dean Herbert
6f91a21f00
Use switch
2019-07-30 13:31:57 +09:00
Dean Herbert
370a81d78a
Don't forward timeout exceptions to sentry
2019-07-30 13:30:26 +09:00
Dean Herbert
a16c0f2aa0
Don't report stable storage msising to sentry
2019-07-30 12:44:08 +09:00
Salman Ahmed
c8b7cf8672
Merge branch 'master' into add-bindable-for-break-times
2019-07-30 06:23:47 +03:00
David Zhao
82fcb88f5c
update names
2019-07-30 12:11:08 +09:00
David Zhao
d70b99b4c0
Merge remote-tracking branch 'upstream/master' into back-button-part-2
2019-07-30 12:05:23 +09:00
David Zhao
6d1203a599
Move screen pushes into function, rename receptor
2019-07-30 12:00:04 +09:00
Dean Herbert
cec26a270e
Fix using right mouse button to drag at song select seeking incorrectly with many beatmaps loaded
...
Closes #5195
2019-07-30 07:04:16 +09:00
Dean Herbert
ece5a9622e
Fix scores without an online ID not always presenting correctly
2019-07-30 06:32:05 +09:00
Dean Herbert
b4bcdb1c70
Update framework
2019-07-29 19:44:58 +09:00
Dean Herbert
31c8c0f75a
Fix legacy scores with no online ID being imported with a non-n… ( #5508 )
...
Fix legacy scores with no online ID being imported with a non-null ID
2019-07-29 19:21:00 +09:00
Dean Herbert
766cf9295d
Merge remote-tracking branch 'upstream/master' into add-legacy-hit-animations
2019-07-29 19:03:36 +09:00
Dean Herbert
2d03c849bf
Improve testability of intro sequence ( #5275 )
...
Improve testability of intro sequence
2019-07-29 18:56:38 +09:00
Dan Balasescu
ef229c0f80
Merge branch 'master' into legacy-cursor-middle
2019-07-29 18:52:11 +09:00
jorolf
0635680db5
fix some code quality
2019-07-29 11:49:59 +02:00
Dean Herbert
894d573fbc
Cache DrawableHitObject for skinnables to access ( #5463 )
...
Cache DrawableHitObject for skinnables to access
2019-07-29 18:49:37 +09:00
Dean Herbert
a4f30daf13
Merge pull request #5462 from peppy/skin-metric-parity
...
Bring playfield ratio in line with stable
2019-07-29 18:49:21 +09:00
Dean Herbert
d99408e979
Fix SkinChanged events triggering after disposal ( #5461 )
...
Fix SkinChanged events triggering after disposal
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-29 18:48:53 +09:00
Dean Herbert
79d7416474
Merge branch 'master' into remove-type-specification
2019-07-29 18:47:09 +09:00
David Zhao
e8c039bb8a
Use a receptor model instead
2019-07-29 18:45:16 +09:00
Dean Herbert
ac01e9fbeb
Fix legacy scores with no online ID being imported with a non-null ID
2019-07-29 18:36:07 +09:00
Dan Balasescu
98813222af
Adjust comment
2019-07-29 18:35:22 +09:00
Dan Balasescu
7779302e82
Merge branch 'master' into skin-scaling-modes
2019-07-29 17:47:07 +09:00
Dean Herbert
c514cbe2b7
Add basic skinning test
2019-07-29 17:27:00 +09:00
Dean Herbert
85e6ac156f
Merge branch 'fix-zero-length-hash' into skinning-test
2019-07-29 16:58:35 +09:00
Dean Herbert
cb17007fa7
Fix zero-length hash models incorrectly creating a unique hash
2019-07-29 16:57:19 +09:00
Dean Herbert
c14c3ba8ec
Move database isolation logic to OsuTestScene for easier reuse
2019-07-29 16:57:02 +09:00
David Zhao
2e242075b4
Remove and re-add backbutton instead and add tests
2019-07-29 16:42:23 +09:00
Dan Balasescu
0dc25d7a35
Merge branch 'master' into exit-multi-from-null
2019-07-29 13:52:26 +09:00
David Zhao
4b5fb84888
Rewrite comment
2019-07-29 11:02:44 +09:00
David Zhao
26fc782de9
Don't exit if screenstack is null
2019-07-29 10:35:51 +09:00
jorolf
f4effd12c3
make legacy skins animatable
2019-07-28 21:04:55 +02:00
Max Hübner
316b11d08b
use single line if-statement
2019-07-28 20:36:21 +02:00
Dean Herbert
262284d095
Merge branch 'master' into truncate-long-usernames-in-private-chat
2019-07-29 02:47:49 +09:00
Dean Herbert
663f34d3d8
Remove width specifications
2019-07-29 02:47:26 +09:00
Dean Herbert
088c04a20f
Revert "Fix BackButton handling escape before all other elements ( #5440 )"
...
This reverts commit 17a6563f4c
2019-07-28 23:38:55 +09:00
Max Hübner
f7b9ddb48c
combine Text and TextBold
2019-07-28 12:40:21 +02:00
Max Hübner
df8d4d8966
add truncation to base class
2019-07-28 12:16:32 +02:00
Max Hübner
c6d4ce0f8a
revert truncation in derived class
2019-07-28 12:14:06 +02:00
iiSaLMaN
5bf0277fd4
Remove unnecessary quick check
...
Not saving for anything
2019-07-28 09:17:13 +03:00
iiSaLMaN
1dd3a66300
Remove unnecessary index resets
2019-07-28 09:16:19 +03:00
David Zhao
bd2fce4bb7
don't use extra container
2019-07-28 13:45:54 +09:00
Dean Herbert
a24e57dd3d
Merge branch 'master' into refactor-osd
2019-07-28 13:10:01 +09:00
Dean Herbert
ddb98c705a
Merge branch 'master' into update-follower-count
2019-07-28 12:53:40 +09:00
Dean Herbert
872822035a
Merge branch 'master' into back-button-priority
2019-07-28 12:50:18 +09:00
Max Hübner
edf6453e04
truncate long usernames in private chat
2019-07-27 18:56:37 +02:00
iiSaLMaN
95b568eb46
Remove unnecessary condition
2019-07-27 15:52:30 +03:00
iiSaLMaN
6c580ac9d5
Use while loops instead
2019-07-27 15:52:01 +03:00
Dean Herbert
3571cb96b0
Fix broken merge
2019-07-27 12:56:55 +09:00
David Zhao
57e6c388a1
Merge branch 'master' into carousel-sizing
2019-07-27 11:40:07 +09:00
iiSaLMaN
ba4045a761
Fix transforming mods not working properly
...
Hidden, Grow, Deflate, etc..
2019-07-27 00:22:40 +03:00
Dean Herbert
699e366306
Update framework
2019-07-26 20:29:57 +09:00
David Zhao
1b0f7b0459
more detailed explanation
2019-07-26 19:05:55 +09:00
David Zhao
6e09d857fd
Fix ValueChanged events being called out of order
2019-07-26 19:00:07 +09:00
Salman Ahmed
934439e138
Merge branch 'master' into add-bindable-for-break-times
2019-07-26 12:57:52 +03:00
Dean Herbert
f6f4a08019
Reduce notification span during beatmap imports ( #5471 )
...
Reduce notification span during beatmap imports
2019-07-26 18:49:07 +09:00
Dean Herbert
392e1cbafb
Merge pull request #5456 from peppy/fix-import-select
...
Fix beatmap present failing directly after an import
2019-07-26 18:48:49 +09:00
Dean Herbert
5317a8fa0f
Update framework again
2019-07-26 17:50:49 +09:00
Dean Herbert
9ef858806b
Fix existing usage of Path
2019-07-26 17:48:19 +09:00
Dean Herbert
9d080ec249
Update framework
2019-07-26 17:18:56 +09:00
Dean Herbert
9036129aa7
Hide leaderboard mod filter when on details tab ( #5473 )
...
Hide leaderboard mod filter when on details tab
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-26 16:07:58 +09:00
Dean Herbert
4d49aad153
Start not visible
2019-07-26 15:51:51 +09:00
Dean Herbert
7fa419a38b
Fix file layout order
2019-07-26 15:49:21 +09:00
iiSaLMaN
4c9e8527d8
Modify global index directly in the for loop
...
Moves the global index to a near break if not in a break yet
2019-07-26 09:24:53 +03:00
David Zhao
0f6c6c7de0
consolidate halfheight as well
2019-07-26 15:22:29 +09:00
Joehu
0b6cfec21c
Hide leaderboard mod filter when on details tab
2019-07-25 23:20:56 -07:00
iiSaLMaN
5a94a22314
Add a quick check if we're not in a break with current index
2019-07-26 09:17:39 +03:00
David Zhao
6765e9f7fa
Combine into properties and update for framework changes
2019-07-26 15:13:10 +09:00
Joehu
3b0a482743
Fix font weight of leaderboard mod filter
2019-07-25 23:10:00 -07:00
iiSaLMaN
3fa6804501
Use better loops for moving index
...
Easy to read, suggested by peppy
2019-07-26 08:12:32 +03:00
iiSaLMaN
806d41daf4
Add function to reset break index
2019-07-26 08:11:13 +03:00
iiSaLMaN
91fa8a6552
Simplify null and any check
2019-07-26 08:09:18 +03:00
Dean Herbert
53ecb2ae82
Reduce notification span during beatmap imports
2019-07-26 13:48:29 +09:00
Dean Herbert
5f0d633b34
Allow closing chat tabs with middle mouse button ( #5447 )
...
Allow closing chat tabs with middle mouse button
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-26 13:31:25 +09:00
Dean Herbert
56b27db7a4
Use "Click" instead of "Action"
2019-07-26 13:17:33 +09:00
Dean Herbert
7ec6ac7b0e
Remove unnecessary override
2019-07-26 13:15:36 +09:00
David Zhao
c89830f3d8
move constants, combine local vars into properties
2019-07-26 13:07:28 +09:00
Dean Herbert
7b7e4f924d
Merge branch 'master' into songselect-best-user-score
2019-07-26 13:06:14 +09:00
iiSaLMaN
44895c4b69
Use IReadOnlyList for break periods list
2019-07-26 05:41:10 +03:00
iiSaLMaN
b4c93b1777
Use lookup direction than 2 while loops
2019-07-26 05:11:01 +03:00
iiSaLMaN
a08d54eb06
Remove unnecessary checks
2019-07-26 03:11:59 +03:00
Shane Woolcock
1d6c321e14
Ensure we don't ping-pong nearestBreakIndex between breaks
2019-07-26 08:34:18 +09:30
Shane Woolcock
5e51012800
Rewrite updateBreakTimeBindable
2019-07-25 22:54:05 +09:30
iiSaLMaN
cdda264c49
Use global index and move it to find if break time
...
Avoid using iterations
2019-07-25 12:28:21 +03:00
iiSaLMaN
5a55433d6c
Return if breaks are null
...
Fixes a test
2019-07-25 11:53:32 +03:00
iiSaLMaN
172a9ce33a
Use a for loop instead of foreach
...
avoid allocating an iterator
2019-07-25 11:40:45 +03:00
David Zhao
a9f0dda9d7
Confine positional input
2019-07-25 17:36:13 +09:00
David Zhao
97eb5293a8
Don't depend on parent sizing
2019-07-25 17:32:21 +09:00
iiSaLMaN
9bd66b6e7a
Better xmldoc
2019-07-25 11:27:32 +03:00
iiSaLMaN
69d2f57f4f
Avoid using LINQ
2019-07-25 11:27:01 +03:00
iiSaLMaN
0ea0a10ca4
Expose as IBindable<bool>
2019-07-25 11:26:38 +03:00
iiSaLMaN
7b82d184bd
Add bindable boolean for break times
2019-07-25 11:07:53 +03:00
Dean Herbert
bfaf9d5f41
Remove unnecessary special cases
2019-07-25 16:24:10 +09:00
Dean Herbert
c1b0130857
Add legacy cursormiddle support
2019-07-25 16:23:04 +09:00
Dean Herbert
38e21caa5a
Add legacy hitcircle
2019-07-25 16:10:01 +09:00
Dean Herbert
900d17a4db
Merge branch 'fix-skin-changed-disposal' into add-legacy-hit-animations
2019-07-25 16:09:15 +09:00
Dean Herbert
3ca41b9c0a
Merge branch 'skin-metric-parity' into add-legacy-hit-animations
2019-07-25 16:07:23 +09:00
Dean Herbert
54260e4038
Merge branch 'cache-drawable-hitobject' into add-legacy-hit-animations
2019-07-25 16:05:32 +09:00
Dean Herbert
eb6bda3f08
Cache DrawableHitObject for skinnables to access
2019-07-25 16:03:07 +09:00
Dean Herbert
58feba72a3
Fix scheduled events not running on previous drawables
2019-07-25 15:59:44 +09:00
David Zhao
c4bed0e6d2
Resize BeatmapCarousel, update carouselitem logic
2019-07-25 15:31:21 +09:00
Dean Herbert
46e17646ac
Align slider path size with legacy skins
2019-07-25 14:22:26 +09:00
Dean Herbert
9473f6d3e3
Fix incorrect ratios being applied to playfield / skin elements
...
This now matches osu-stable 1:1.
2019-07-25 14:22:22 +09:00
Dean Herbert
a290437286
Fix skin changed events triggering after disposal
2019-07-25 13:55:01 +09:00
Dean Herbert
69844e6c24
Fix beatmap present failing directly after an import
2019-07-25 12:18:18 +09:00
David Zhao
6ef3c71e22
remove unused using
2019-07-25 11:31:46 +09:00
Dean Herbert
7275beaf1a
Remove unnecessary type specification from SkinnableDrawable
2019-07-25 11:20:39 +09:00
David Zhao
e63c97b306
remove unnecessary overrides
2019-07-25 11:20:24 +09:00
David Zhao
bbcc8f0721
Add new container level and unblock footer
2019-07-25 11:11:20 +09:00
Max Hübner
78a8a6490e
close chat tabs with middle mouse button
2019-07-24 17:17:29 +02:00
Dean Herbert
efad9b3150
Merge branch 'master' into skin-scaling-modes
2019-07-24 18:37:31 +09:00
David Zhao
da3dc610ba
revert globalaction changes
2019-07-24 12:52:18 +09:00
David Zhao
263ccfcbcb
Merge remote-tracking branch 'upstream/master' into back-button-priority
2019-07-24 12:50:16 +09:00
David Zhao
38559685a9
proxy backbutton instead
2019-07-24 12:47:41 +09:00
Dean Herbert
2610ee2abb
Update framework
2019-07-23 21:39:10 +09:00
smoogipoo
4e7e2d1d52
Adjust comments
2019-07-23 21:16:09 +09:00
smoogipoo
74b09c72fa
Refactor state updates to convert State into an IBindable
2019-07-23 21:16:09 +09:00
Dan Balasescu
9b526ef61e
Merge branch 'master' into move-state-logic
2019-07-23 20:37:57 +09:00
Dean Herbert
91e21688d8
Make AccentColour a bindable ( #5420 )
...
Make AccentColour a bindable
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-23 20:37:47 +09:00
Dan Balasescu
0ffac22376
Merge branch 'master' into allow-multiple-debug-instances
2019-07-23 20:30:56 +09:00
Dan Balasescu
bc64c56a26
Merge branch 'master' into remove-text-shadow
2019-07-23 20:16:33 +09:00
David Zhao
8220a51310
Make backbutton handle global input last
2019-07-23 17:59:50 +09:00
Dean Herbert
9665a94f4a
Ignore shift-delete PlatformAction in SearchTextBox ( #5372 )
...
Ignore shift-delete PlatformAction in SearchTextBox
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-23 17:11:09 +09:00
Dean Herbert
e81ef4bf33
Rewrite comment
2019-07-23 16:44:19 +09:00
Dean Herbert
340f9a8f8d
Merge branch 'master' into fix-flashlight-depth
2019-07-23 16:37:04 +09:00
Dean Herbert
704fe2d655
Remove text shadow in chat
2019-07-23 16:04:50 +09:00
smoogipoo
5e72ed0d12
Fix potential nullref
2019-07-23 15:35:12 +09:00
David Zhao
4d8e2a78d1
update with new framework changes and update comment
2019-07-23 15:31:09 +09:00
smoogipoo
776757545d
Fix FTB causing flashlight to block vision correctly
2019-07-23 15:17:02 +09:00
Dean Herbert
292bd22f92
Allow multiple instances of osu! when running under debug
2019-07-23 13:38:05 +09:00
David Zhao
3e4ebd3c7a
Merge branch 'master' into shift-delete
2019-07-23 13:25:12 +09:00
David Zhao
e628e44d8e
update comment
2019-07-23 13:25:03 +09:00
Dean Herbert
d5ee4cbc9c
Move TouchDevice mod to new "system" category
2019-07-23 13:14:28 +09:00
Dean Herbert
452b2c8027
Separate GlowingSpriteText from LeaderboardScore into it's own… ( #5418 )
...
Separate GlowingSpriteText from LeaderboardScore into it's own class
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-23 12:08:30 +09:00
Dean Herbert
9e34582c17
Merge branch 'master' into separate-glowing-text-from-leaderboardscore
2019-07-23 11:31:47 +09:00
Andrei Zavatski
76b79f3554
Transform adjustments
2019-07-23 01:14:45 +03:00
Andrei Zavatski
7a3afbd0b1
Merge remote-tracking branch 'refs/remotes/ppy/master' into songselect-best-user-score
2019-07-23 00:39:35 +03:00
Andrei Zavatski
ffcc1c62af
simplify moving condition
2019-07-22 23:22:39 +03:00
iiSaLMaN
32e9547ce9
Trim whitespace
2019-07-22 23:16:54 +03:00
iiSaLMaN
081355e3d1
Use IHasText and simplify properties
2019-07-22 23:12:09 +03:00
Andrei Zavatski
94ed03548d
Hide top score at every leaderboard change
2019-07-22 18:34:31 +03:00
Andrei Zavatski
ee6fed5b33
Use fixed height
2019-07-22 18:17:49 +03:00
Dean Herbert
2f111e6cf4
Fix incorrect corner radius
2019-07-22 23:57:26 +09:00
Dean Herbert
4dc9309a7e
Merge branch 'master' into underscored_link
2019-07-22 23:46:57 +09:00
Dean Herbert
ade661236a
Merge branch 'master' into intro-testing-improvements
2019-07-22 23:44:14 +09:00
Dean Herbert
5a6c8bfec9
Adjust transition to now show janky resize
2019-07-22 23:28:17 +09:00
Dean Herbert
95241165cc
Fix text alignment
2019-07-22 23:26:11 +09:00
Dean Herbert
d83d93ee66
Use asynchronous loading
2019-07-22 23:21:07 +09:00
Dean Herbert
764513feea
Fix code quality
2019-07-22 23:13:48 +09:00
Dean Herbert
8c54708582
Merge branch 'master' into songselect-best-user-score
2019-07-22 22:34:11 +09:00
Dean Herbert
cdf75b4098
Public before private
2019-07-22 22:14:09 +09:00
Andrei Zavatski
075ca3d8ea
CI fix
2019-07-22 14:47:35 +03:00
Andrei Zavatski
3e95cb9145
Use bindable and disable button
2019-07-22 14:35:18 +03:00
Andrei Zavatski
2a17ed5e18
Merge remote-tracking branch 'refs/remotes/ppy/master' into favourite-beatmap
2019-07-22 14:32:37 +03:00
Dean Herbert
7d3939a838
Merge branch 'master' into fix-triangles-crash
2019-07-22 19:17:51 +09:00
Dean Herbert
07a0df7c4f
Fix bracket precedence
2019-07-22 18:29:04 +09:00
Dean Herbert
a05a6bbb77
Set "Title" as the default grouping/sorting modes in song select ( #5396 )
...
Set "Title" as the default grouping/sorting modes in song select
2019-07-22 18:06:23 +09:00
Dean Herbert
d4d286c988
Add full documentation
2019-07-22 16:08:38 +09:00
Dean Herbert
c3b81bef4a
Flip default to the preferred method going forward
2019-07-22 15:55:38 +09:00
Dean Herbert
be170b4124
Naming and documentation improvements
2019-07-22 15:50:02 +09:00
Dean Herbert
91f86adb66
Move DrawableHitObject state management to base class
2019-07-22 15:07:12 +09:00
smoogipoo
a631aac664
Fix workingbeatmap's disposal potentially null-refing
2019-07-22 15:01:01 +09:00
Dean Herbert
8327452fe1
Make AccentColour a bindable
2019-07-22 14:48:59 +09:00
Dean Herbert
36c557c752
Add null check and simplify scaling conditional logic via switch
2019-07-22 14:43:25 +09:00
Dean Herbert
9d091c96b8
Use cache to ensure correct DrawSize when deciding scaling
2019-07-22 14:43:04 +09:00
Dean Herbert
74c961bcff
Add more flexible skin element confine modes
2019-07-22 14:42:56 +09:00
Andrei Zavatski
de8ac9a428
Simple implementation
2019-07-21 21:41:07 +03:00
iiSaLMaN
affd0b2878
Fix build issues
2019-07-21 12:34:52 +03:00
iiSaLMaN
57fc5cbda8
Fix CI issues
2019-07-21 12:29:06 +03:00
iiSaLMaN
87fb22352c
glowingText -> blurredText
2019-07-21 12:28:55 +03:00
iiSaLMaN
9d7f6abbdd
Remove unnecessary field
2019-07-21 12:18:31 +03:00
iiSaLMaN
ed0ef90613
Separate glowing sprite text into it's own class
2019-07-21 12:14:55 +03:00
Dean Herbert
e76b3e2b40
User property instead of method
2019-07-21 10:42:40 +09:00
iiSaLMaN
842417cf42
Check if selected scope requires API
2019-07-21 03:07:27 +03:00
Lucas A
2926932a1a
Add MusicControllerToast used to display current music playback status on OSD
2019-07-20 21:10:17 +02:00
Lucas A
2ab30281fb
Merge changes of branch refactor-osd into music-controller-hotkeys
2019-07-20 20:53:40 +02:00
Dean Herbert
4c592a5e65
Fix TriangleDrawNode crash when aimcount is zero
2019-07-20 22:52:07 +09:00
Dean Herbert
2a94b68ecb
Simplify logic
2019-07-20 22:50:17 +09:00
Dean Herbert
2df279f902
Merge branch 'master' into loading-fix
2019-07-20 22:46:09 +09:00
Dean Herbert
5696d79423
Use TriangleBatch
2019-07-19 23:47:48 +09:00
Dean Herbert
eebfdd8865
Update framework
2019-07-19 23:43:25 +09:00
Dean Herbert
f08d722083
Merge remote-tracking branch 'upstream/master' into triangle-memory-reudction
2019-07-19 23:43:17 +09:00
smoogipoo
066bee3535
Simplify offset calculation
2019-07-19 16:02:33 +09:00
smoogipoo
2a66cf36d5
Merge remote-tracking branch 'Joehuu/master' into requests-limit-usage
2019-07-19 15:33:18 +09:00
smoogipoo
99ab77b926
Add PaginatedWebRequest to handle request pagination
2019-07-19 15:33:09 +09:00
Dean Herbert
024f136d82
Reduce buffer count by one
2019-07-19 14:24:11 +09:00
Dean Herbert
95f36c36c4
Late-initialize vertex batch for safety
2019-07-19 01:52:53 +09:00
Dean Herbert
a23bb3a6b3
Account for headless nulls (but how?)
2019-07-19 01:14:55 +09:00
Dean Herbert
00f1d1b53c
Reduce Triangle drawnode overhead by ~90%
...
This was never batching, ever. Pointless memory overhead.
2019-07-19 00:53:00 +09:00
Andrei Zavatski
fa978a47b0
Fix loading animation is no longer present
2019-07-18 15:08:50 +03:00
smoogipoo
f87e9b8017
Remove unnecessary tooltip text
2019-07-18 20:17:19 +09:00
smoogipoo
ca72409dc2
More closely match osu-web styling
2019-07-18 20:16:10 +09:00
Dan Balasescu
85ce44be74
Merge branch 'master' into remove-unnecessary-transforms-1
2019-07-18 18:16:36 +09:00
Dean Herbert
f175f597e7
Update follower count API source
2019-07-18 14:05:57 +09:00
smoogipoo
1ce2b2eace
Set title as default grouping/sorting modes
2019-07-18 13:18:06 +09:00
Dean Herbert
a6ddcd78d4
Fix results screen not showing first tab correctly
2019-07-18 01:08:12 +09:00
Dean Herbert
f1423b8cb5
Add more brackets
2019-07-18 00:03:04 +09:00
Dean Herbert
cc3492f8f2
Update framework
2019-07-18 00:01:38 +09:00
Dean Herbert
3e57fcf5c5
Merge remote-tracking branch 'upstream/master' into cleanup-slider-bodies
2019-07-17 22:11:01 +09:00
Dean Herbert
42b1e1772f
Update framework
2019-07-17 22:07:11 +09:00
Dean Herbert
a079b9c921
Merge pull request #5384 from smoogipoo/fix-direct-ruleset-selector
...
Fix direct ruleset selector binding in ctor
2019-07-17 22:02:41 +09:00
Dean Herbert
99bd50a48e
Fix judgement disposals causing huge LOH pressure ( #5385 )
...
Fix judgement disposals causing huge LOH pressure
2019-07-17 22:01:47 +09:00
Dean Herbert
98d0713fa9
Merge branch 'master' into fix-background-blur-safety
2019-07-17 22:01:10 +09:00
Dean Herbert
bee30b18d2
Merge pull request #5381 from peppy/fix-leaderboard-display-crash
...
Fix potential crash when displaying leaderbaords
2019-07-17 22:00:45 +09:00
Dan Balasescu
883c090248
Fix disabled state potentially not being set
2019-07-17 20:02:20 +09:00
smoogipoo
9f6ff63634
Fix judgement disposals causing huge LOH pressure
2019-07-17 19:25:41 +09:00
smoogipoo
cca472d412
Fix direct ruleset selector binding in ctor
2019-07-17 19:19:45 +09:00
Dean Herbert
1a19cf0739
Fix 0-length sliders not getting correct lengths ( #5033 )
...
Fix 0-length sliders not getting correct lengths
2019-07-17 18:01:57 +09:00
Dean Herbert
66036508b6
Fix potential crash when displaying leaderbaords
2019-07-17 17:39:04 +09:00
smoogipoo
a9286fee07
Recycle slider paths when the parenting slider dies
2019-07-17 16:20:27 +09:00
smoogipoo
7c5a227fc5
Fix crashes when presenting replays
2019-07-17 14:46:25 +09:00
David Zhao
b95a598338
don't check for shift
2019-07-16 15:12:01 +09:00
Dean Herbert
7634e3cc81
Fix song select iterating over all beatmaps in database unnnecessarily
2019-07-16 14:57:11 +09:00
David Zhao
e789bb37c8
Ignore shift-delete in SearchTextBox
2019-07-16 14:55:41 +09:00
smoogipoo
ed203cb0ff
Delay intial hitobject updates
2019-07-16 13:45:59 +09:00
Joehu
83ffb1d542
Remove unnecessary transforms on top score user section
2019-07-15 14:15:03 -07:00
Andrei Zavatski
9458bca58f
Update usage of requests
2019-07-15 13:37:25 +03:00
Andrei Zavatski
111541fe7a
Use limit in requests
2019-07-15 13:31:57 +03:00
Andrei Zavatski
d62e42ba14
Remove custom link container implementation
2019-07-15 13:09:21 +03:00
Andrei Zavatski
cfb1e0683c
Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link
2019-07-15 12:32:02 +03:00
Andrei Zavatski
7e367dc397
Push results screen when clicking on top score
2019-07-15 12:30:42 +03:00
Andrei Zavatski
9c13ede5a8
Merge remote-tracking branch 'refs/remotes/ppy/master' into songselect-best-user-score
2019-07-15 12:11:28 +03:00
Dean Herbert
d4c1005c7e
Fix incorrect comparison in line updating logic
2019-07-15 15:53:19 +09:00
Dean Herbert
d0c8aaba4e
Override basic equality function too
2019-07-15 15:50:50 +09:00
Dean Herbert
9c1badd2e3
Fix rulesets not matching in dictionary lookups due to missing GetHashCode implementation
2019-07-15 15:42:54 +09:00
Dean Herbert
d92f6c762b
Fix potential nullref
2019-07-15 11:53:16 +09:00
Dean Herbert
12e7668afc
Fix potential cross-thread talk from bindable updates
2019-07-15 11:48:33 +09:00
Dean Herbert
2186ffda55
Avoid unnecessarily creating buffered container for zero-blur
2019-07-15 11:46:41 +09:00
Dean Herbert
d093eb6660
Mark sprite read-only
2019-07-15 11:45:15 +09:00
Andrei Zavatski
b93b26a036
Fix link formatting
2019-07-14 19:38:46 +03:00
Andrei Zavatski
c8192d6f3a
Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link
2019-07-14 19:10:47 +03:00
Andrei Zavatski
19680c8df8
Minor adjustments
2019-07-14 16:37:05 +03:00
Andrei Zavatski
ecf0e62484
CI fixes
2019-07-14 16:16:21 +03:00
Andrei Zavatski
963e025bb8
Make it works and some layout adjustments
2019-07-14 14:03:14 +03:00
Andrei Zavatski
d1409d4610
Add top score section into beatmap detail area
2019-07-14 13:33:47 +03:00
Andrei Zavatski
922c3c89ae
Make leaderboard score use metric system
2019-07-14 12:47:35 +03:00
Andrei Zavatski
d30ae24f58
Use Bindable for setting score
2019-07-14 12:40:54 +03:00
Andrei Zavatski
0584ee9ce5
Basic implementation
2019-07-14 12:34:12 +03:00
Lucas A
bbc3cbf563
Restore deleted line
2019-07-12 20:22:31 +02:00
Dan Balasescu
986031e127
Merge branch 'master' into storyboard-clock-di
2019-07-12 23:14:12 +09:30
Dan Balasescu
fc96fbc8a1
Merge branch 'master' into fix-skip-button-clickability
2019-07-12 22:44:20 +09:30
Lucas A
09d679de8d
Move text display layout to Toast.
2019-07-12 08:50:53 +02:00
Dean Herbert
44855d8bb2
Ensure any existing background is expired if set more than once
2019-07-12 13:45:34 +09:00
Dean Herbert
671f7f99cd
Use constant for blur amount
2019-07-12 13:44:43 +09:00
Dean Herbert
8b67f88d16
Don't expose dimmable container creation in player
2019-07-12 12:04:45 +09:00
Dean Herbert
46f7bb885b
Move classes to local namespaces
...
Also renames test scene to more appropriate name.
2019-07-12 11:50:06 +09:00
Dean Herbert
b5ca7faca4
Move default value for EnableUserDim to base class
2019-07-12 11:40:38 +09:00
Dean Herbert
0d9f978857
Don't expose DimContainer
2019-07-12 11:38:15 +09:00
Dean Herbert
c9599b65eb
Merge remote-tracking branch 'upstream/master' into storyboard-clock-di
2019-07-12 11:20:43 +09:00
StanR
1e04fcc6b5
Apply fixes
2019-07-11 17:47:09 +03:00
Dean Herbert
a1e64106d4
Merge branch 'master' into intro-testing-improvements
2019-07-11 23:46:02 +09:00
Dean Herbert
3be5aff82d
Merge pull request #5205 from UselessToucan/flow_container_insert
...
Make FlowContainer insertions cleaner
2019-07-11 23:13:58 +09:00
Dean Herbert
ecbd0f7eff
Merge branch 'master' into fix-skip-button-clickability
2019-07-11 23:10:28 +09:00
Dean Herbert
6c8cf193bd
Disable frame accurate replay playback ( #5316 )
...
Disable frame accurate replay playback
2019-07-11 23:09:54 +09:00
Dean Herbert
19e8198bff
Merge branch 'master' into flow_container_insert
2019-07-11 22:53:57 +09:00
Dean Herbert
9cbd17415c
Force SQLite to multithreading mode ( #5269 )
...
Force SQLite to multithreading mode
2019-07-11 22:53:18 +09:00
Dean Herbert
72da615dde
Fix track transfer not running when beatmap is retrieved from c… ( #5296 )
...
Fix track transfer not running when beatmap is retrieved from cache
2019-07-11 22:53:07 +09:00
StanR
cd7c03c13a
Add genre and language sections to beatmapset overlay
2019-07-11 16:44:48 +03:00
Dean Herbert
b6e15fb791
Update framework
2019-07-11 22:33:51 +09:00
Dean Herbert
2c62891c48
Make Toast base class abstract
2019-07-11 15:15:34 +09:00
Dean Herbert
dd13e2508a
Add note about toast height
2019-07-11 15:14:57 +09:00
Dean Herbert
3bc789fca8
Remove osd prefix and prefer upper-case OSD
2019-07-11 15:09:54 +09:00
David Zhao
932243cfd4
public before private
2019-07-11 14:14:00 +09:00
David Zhao
ac170a6957
add comment and cleanup
2019-07-11 14:00:25 +09:00
Dean Herbert
548008c9ce
Merge pull request #5311 from Joehuu:lb-sign-out-placeholder
...
Update beatmap leaderboard to placeholder when signing out
2019-07-11 13:55:18 +09:00
David Zhao
6c0de0b436
Merge remote-tracking branch 'upstream/master' into storyboard-clock-di
2019-07-11 13:33:35 +09:00
David Zhao
321266e96f
Make UserDimContainer abstract
2019-07-11 13:17:28 +09:00
Dean Herbert
c22633967b
Merge remote-tracking branch 'upstream/master' into user-best-score
2019-07-11 11:32:47 +09:00
Dean Herbert
85f2212ebc
Reduce spacing and font for rank position
2019-07-11 11:32:42 +09:00
Dean Herbert
8f9b8ed5a1
Simplify information propagation logic
2019-07-11 11:17:33 +09:00
Dean Herbert
cc9ee472d6
Move score nulling out of loading property
2019-07-11 11:07:30 +09:00
Dean Herbert
a49bde7ed3
Move protected below public
2019-07-11 10:38:32 +09:00
iiSaLMaN
b2f23a10c8
Use the correct property to retrieve the milliseconds
2019-07-10 23:12:18 +03:00
Lucas A
b32b078e48
Set default keybindings for jukebox to stable's ones.
2019-07-10 21:55:43 +02:00
Andrei Zavatski
953d32366c
Move request inside the ScoresContainer again
2019-07-10 19:40:29 +03:00
Andrei Zavatski
a041421e0d
Merge remote-tracking branch 'refs/remotes/ppy/master' into user-best-score
2019-07-10 19:39:41 +03:00
Dean Herbert
f21e700b7a
Code style cleanup
2019-07-11 00:42:14 +09:00
Dean Herbert
2285c2b1df
Merge branch 'master' into user-best-score
2019-07-11 00:31:26 +09:00
Dean Herbert
3b448b0086
Merge remote-tracking branch 'upstream/master' into Desconocidosmh-master
2019-07-11 00:25:35 +09:00
Dean Herbert
ad873b542a
Simplify editor logic
2019-07-11 00:22:40 +09:00
Dean Herbert
6819c528db
Use canBeNull instead of needlessly caching MusicController for tests
2019-07-11 00:20:01 +09:00
Dean Herbert
b225b2eb39
Rename to IsUserPaused
2019-07-11 00:18:19 +09:00
iiSaLMaN
c3315e805f
Use milliseconds for BasicStats' beatmap length
2019-07-10 16:49:32 +03:00
Salman Ahmed
1eed6955fa
Merge branch 'master' into implement-other-sorting-criteria
2019-07-10 14:33:48 +03:00
Desconocidosmh
100d15e651
Move reseting tempo to Editor
2019-07-10 10:43:02 +02:00
Desconocidosmh
8b8e67fd72
Add accidentally deleted code
2019-07-10 10:41:52 +02:00
David Zhao
7929104b8a
move default into StoryboardContainer, fix load bug, remove comment
2019-07-10 12:24:05 +09:00
Dean Herbert
80ddfc3b1e
Disable frame accurate replay playback
...
I want to prioritise better playback performance over accuracy for now. Also, in my testing this is still 100% accurate due to the addition of the FrameStabilityContainer, which is pretty cool.
2019-07-10 10:27:51 +09:00
David Zhao
41afe89c0b
delete no longer needed bindable
2019-07-10 00:46:34 +09:00
Joehu
b9be4080d3
Update beatmap leaderboard to placeholder when signing out
2019-07-09 07:59:38 -07:00
Andrei Zavatski
a0389c338b
CI fixes
2019-07-09 17:56:08 +03:00
iiSaLMaN
e73f22eff8
Convert length retrieved from online to milliseconds
2019-07-09 17:53:34 +03:00
Andrei Zavatski
9907a58ec4
Revert animations and apply suggested changes
2019-07-09 17:38:17 +03:00
iiSaLMaN
1485c273ab
Describe the xmldoc mo
2019-07-09 17:31:15 +03:00
iiSaLMaN
f3329f4d79
Use a more readable code for calculating length
2019-07-09 17:22:21 +03:00
iiSaLMaN
38bc652bf2
Remove sorting by length for beatmaps
2019-07-09 17:02:51 +03:00
Oskar Solecki
2fb9b5dd69
Merge branch 'master' into master
2019-07-09 13:49:07 +02:00
iiSaLMaN
e0c1fb7818
Compare by milliseconds for length
2019-07-09 14:47:54 +03:00
Oskar Solecki
3472979d0b
Make sure exiting editor doesn't unpause the music
2019-07-09 12:53:40 +02:00
Desconocidosmh
2546f647be
Completely change the way we fix the bug
2019-07-09 11:32:49 +02:00
Andrei Zavatski
e8b9b1b0bf
visibility logic adjustments
2019-07-09 12:16:58 +03:00
Dean Herbert
e835cd0f6f
Improve information flow to Disclaimer
2019-07-09 18:08:44 +09:00
Dean Herbert
0580c32263
Abstract intro screen logic to base class
2019-07-09 18:05:57 +09:00
Dean Herbert
32fb811bc9
Merge branch 'master' into intro-testing-improvements
2019-07-09 18:05:52 +09:00
Andrei Zavatski
8d6af1625a
Visibility improvements
2019-07-09 11:40:51 +03:00
David Zhao
5bb21ecae0
remove storyboard region
2019-07-09 16:50:37 +09:00
David Zhao
1b5fadf93f
move comment to more relevant location
2019-07-09 16:38:12 +09:00
David Zhao
89cb8a0cac
Move storyboard initialization to new StoryboardContainer
2019-07-09 16:23:59 +09:00
Andrei Zavatski
eb4ef8f6ac
CI fixes
2019-07-09 08:25:10 +03:00
Andrei Zavatski
8d46d4a28e
Fix grade layout
2019-07-09 08:09:31 +03:00
Andrei Zavatski
5d81445454
Move api request outside the scores container
2019-07-09 08:05:34 +03:00
Andrei Zavatski
ebff35de66
Merge remote-tracking branch 'refs/remotes/ppy/master' into user-best-score
2019-07-09 06:42:39 +03:00
Oskar Solecki
8f7476e9cc
Remove unused stuff
2019-07-09 00:26:57 +02:00
Oskar Solecki
a4957909b4
Merge branch 'master' into Fix-music-playing-while-exiting-from-editor
2019-07-09 00:11:29 +02:00
Desconocidosmh
338371c3fc
Fix music playing while exiting from editor
2019-07-09 00:08:18 +02:00
Dean Herbert
8a98aff318
Merge branch 'master' into replay-local-mods
2019-07-08 22:38:02 +09:00
Dean Herbert
54f5e6aedf
Add assertion and comment about lease logic
2019-07-08 22:37:39 +09:00
David Zhao
0cf4bf2352
Manually set clock for storyboard if loading before being given a parent
2019-07-08 18:46:12 +09:00
Desconocidosmh
39f04e497d
Add UserRequestedPause
2019-07-08 11:24:06 +02:00
Andrei Zavatski
1e5639acee
Add forgotten symbol
2019-07-08 12:10:08 +03:00
David Zhao
d489a77fe1
remove new container and comment
2019-07-08 17:57:29 +09:00
iiSaLMaN
11ef65e3e2
Remove unnecessary extension
2019-07-08 11:57:02 +03:00
iiSaLMaN
b62e69d170
Calculate length inside BeatmapManager
2019-07-08 11:56:48 +03:00
iiSaLMaN
5f3f59629e
Use the length field instead of recalculating
2019-07-08 11:55:07 +03:00
Andrei Zavatski
67a6abb96c
Add user top score on selected beatmap
2019-07-08 11:49:33 +03:00
David Zhao
fbd300e664
Move ruleset into ReplayPlayerLoader as well
2019-07-08 17:37:20 +09:00
Andrei Zavatski
a0efd50f62
Extend APILegacyScores request
2019-07-08 11:25:25 +03:00
Dean Herbert
16c993579b
Fix track transfer not running when beatmap is retrieved from cache
2019-07-08 17:12:34 +09:00
David Zhao
e78e326f34
remove unused using
2019-07-08 17:02:42 +09:00
iiSaLMaN
574d9a51b3
Update migrations
2019-07-08 10:44:23 +03:00
iiSaLMaN
129899f419
Add a BPM property in BeatmapInfo
2019-07-08 10:43:35 +03:00
David Zhao
ef22ab9340
remove bindable
2019-07-08 16:32:11 +09:00
David Zhao
6a86f62d17
Get mods from score info
2019-07-08 16:13:03 +09:00
David Zhao
5853a877c2
create base dependencies before caching, create player in playerloader
2019-07-08 15:40:10 +09:00
iiSaLMaN
2d0c924bdf
Add xmldoc for MaxStarDifficulty and MaxLength
2019-07-08 09:35:12 +03:00
iiSaLMaN
79ddb8d5d3
Change to a more convenient xmldoc
2019-07-08 09:23:01 +03:00
iiSaLMaN
90d5484818
Return BPM back to OnlineInfo
...
Revert commit of "Move BPM out of OnlineInfo"
2019-07-08 09:10:41 +03:00
David Zhao
2747d7692b
Create ReplayPlayerLoader for local mod caching
2019-07-08 14:55:05 +09:00
iiSaLMaN
d874574612
Add migration
2019-07-07 20:25:59 +03:00
iiSaLMaN
729f0901f7
Move Length out of OnlineInfo
2019-07-07 20:25:36 +03:00
iiSaLMaN
3ea9629daf
Move BPM out of OnlineInfo
2019-07-07 20:11:44 +03:00
iiSaLMaN
6ee10640e3
Remove unnecessary migration + Fix CI issues
2019-07-07 19:26:41 +03:00
iiSaLMaN
28cc797fb6
Add migrations
2019-07-07 18:29:25 +03:00
iiSaLMaN
b4ef64fa61
Add sorting by Length
2019-07-07 18:26:56 +03:00
iiSaLMaN
65c8249c94
Add beatmap extension for calculating length
2019-07-07 18:25:52 +03:00
iiSaLMaN
188c80374e
Add sorting by BPM
2019-07-07 18:14:23 +03:00
Desconocidosmh
84cadc688a
Change method name
2019-07-07 17:11:54 +02:00
Desconocidosmh
1a117d1511
Closes #5277
2019-07-07 17:05:53 +02:00
Dean Herbert
ebc0e50295
Simplify conditions
2019-07-07 13:21:41 +09:00
Dean Herbert
1eec69c6b6
Merge remote-tracking branch 'Joehuu/master' into fix-unranked-map-lb-placeholder
2019-07-07 13:06:34 +09:00
Salman Ahmed
b10c35b6ab
Update label text
...
Co-Authored-By: Aergwyn <aergwyn@t-online.de>
2019-07-07 06:13:27 +03:00
Dean Herbert
8f2ec73626
Move logic inside of HUDOverlay
...
Add vertical offset adjust.
2019-07-07 05:30:53 +09:00
Dean Herbert
84919d70bb
Health bar -> Health display
...
Also inverts logic
2019-07-07 05:30:30 +09:00
Joseph Madamba
7c0e3a50b6
Merge branch 'master' into fix-unranked-map-lb-placeholder
2019-07-06 12:09:28 -07:00
Dean Herbert
3f332cca2f
Merge branch 'master' into applicable-to-hud
2019-07-07 01:03:50 +09:00
Salman Ahmed
1f13b94c72
Fix build error
2019-07-06 18:44:55 +03:00
Salman Ahmed
a42c79895d
Remove unnecessary private field
2019-07-06 18:38:41 +03:00
Dean Herbert
be2d0048db
Merge branch 'master' into buttonsystem-entermode
2019-07-07 00:01:41 +09:00
Salman Ahmed
dfabed3d85
Merge branch 'master' into applicable-to-hud
2019-07-06 16:30:02 +03:00
Salman Ahmed
040dbfd2c1
Merge branch 'master' into remove-unnecessary-fading
2019-07-06 15:59:44 +03:00
Dean Herbert
ea911b2fd2
Ensure intro restarts track
2019-07-06 19:05:42 +09:00
iiSaLMaN
6fd3ad5c1d
Remove unnecessary fading
2019-07-06 12:10:30 +03:00
Dean Herbert
2149d639de
Merge branch 'master' into leaderboard-mod-filter
2019-07-06 13:27:49 +09:00
iiSaLMaN
530e07110f
Use a descriptive name for the setting
2019-07-06 06:32:25 +03:00
Dean Herbert
71e40b4684
Force SQLite to multithreading mode
2019-07-06 12:32:16 +09:00
Lucas A
5f8bd6eca7
Fix CI issues + minor issues
2019-07-05 16:51:15 +02:00
Dan Balasescu
3a9f16ccf2
Merge branch 'master' into idle-still-starts
2019-07-06 00:08:59 +09:30
Lucas A
89acd9da3e
Add game-wide jukebox keybindings handling to OsuGame
2019-07-05 16:33:13 +02:00
Lucas A
5cad2b2192
Add missing function to MusicController
2019-07-05 16:28:37 +02:00
Lucas A
c9e44e5e34
Add OsdIconToast + test
2019-07-05 16:25:09 +02:00
Lucas A
b5bd863dd0
Add methods to MusicController to play or pause, select next or previous track
2019-07-05 16:21:50 +02:00
Lucas A
70372dd03d
Add global actions for game-wide music jukebox manipulation
2019-07-05 16:14:04 +02:00
Dan Balasescu
f32796db5c
Merge branch 'master' into changelog-comments
2019-07-05 23:42:46 +09:30
Lucas A
df75f9d312
Revert changes made by VS to csproj
2019-07-05 16:08:02 +02:00
Lucas A
4f0429d046
Add OsdTrackedSettingToast
2019-07-05 16:03:46 +02:00
Lucas A
6288cc6e5c
Refactor OnScreenDisplay to allow displaying of custom messages on OSD
2019-07-05 16:03:22 +02:00
David Zhao
a259247a98
use const
2019-07-05 16:07:17 +09:00
Dean Herbert
598b0d668b
Merge branch 'master' into import-stable-scores
2019-07-05 15:54:33 +09:00
Dean Herbert
b54c0176eb
Merge branch 'master' into disable-own-replays
2019-07-05 15:41:43 +09:00
Dean Herbert
b902457f8d
Allow PlayerLoader to proceed even if the mouse is hovering an overlay panel
2019-07-05 15:32:07 +09:00
smoogipoo
5862eb172a
Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders
...
# Conflicts:
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2019-07-05 15:48:04 +09:30
Dean Herbert
49eb8b0b53
Merge branch 'master' into lock-working-cache
2019-07-05 15:14:07 +09:00
Dean Herbert
04c0ce1ea3
Merge branch 'master' into import-stable-scores
2019-07-05 14:48:55 +09:00
Dean Herbert
df7d31350c
Stop import failures from being added to the imported model list
2019-07-05 14:47:55 +09:00
Dean Herbert
d5a9542743
Fix incorrect xmldoc in DownloadTrackingComposite ( #5261 )
...
Fix incorrect xmldoc in DownloadTrackingComposite
2019-07-05 14:43:28 +09:00
Dean Herbert
adf6d6c942
Update initial run import process to include scores
2019-07-05 14:25:52 +09:00
Dean Herbert
80d8ce8392
Fix GetStableImportPaths xmldoc
2019-07-05 14:21:56 +09:00
Dean Herbert
87c8fd0035
Fix path specification not being cross-platform compliant
2019-07-05 14:15:29 +09:00
Dean Herbert
99da04527d
Replays -> scores
2019-07-05 14:07:14 +09:00
Dean Herbert
ba8df3ba92
Clean up stable lookup and mutate logic
2019-07-05 13:59:31 +09:00
Dean Herbert
8346c50ce1
Rename delete method and improve xmldoc
2019-07-05 13:55:25 +09:00
Joehu
1534b75d27
Fix ci errors
2019-07-04 21:39:21 -07:00
Dean Herbert
fcdba6b3f5
Merge branch 'master' into import-stable-scores
2019-07-05 13:34:03 +09:00
Joehu
e8168037f9
Fix unranked beatmap leaderboards showing "no records" placeholder
2019-07-04 21:19:51 -07:00
Dean Herbert
d77d49f595
Merge branch 'master' into fade-music-on-exit
2019-07-05 13:13:07 +09:00
David Zhao
9eeafa0861
Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode
2019-07-05 13:08:48 +09:00
David Zhao
79d6670dc5
Expose durations from MainMenu and reorder
2019-07-05 13:08:45 +09:00
naoey
f1dab946ff
Remove need to trim query string
2019-07-05 08:46:17 +05:30
naoey
1dab363be3
Require supporter for filtering mods on online leaderboards
2019-07-05 08:42:44 +05:30
naoey
98a242cc37
Merge remote-tracking branch 'ppy/master' into leaderboard-mod-filter
2019-07-05 08:38:33 +05:30
iiSaLMaN
a30f0c03bb
Fix incorrect xmldoc
2019-07-05 05:32:30 +03:00
Dean Herbert
f4dcbbbfef
Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode
2019-07-05 11:29:29 +09:00
iiSaLMaN
d624157c45
Remove unnecessary fading
2019-07-05 05:17:36 +03:00
iiSaLMaN
bff5ad22f4
Check if the locally available score has files
2019-07-05 05:16:40 +03:00
Dean Herbert
91d461eba7
Merge pull request #5251 from Joehuu/remove-edit-song-select-file
...
Remove unused EditSongSelect file
2019-07-05 10:30:37 +09:00
Dean Herbert
38dceddc27
Fix file ordering
2019-07-05 10:07:45 +09:00
Dean Herbert
037ea7b708
Merge branch 'master' into fix-colour-mod-filter
2019-07-05 10:04:31 +09:00
Joehu
ae7da2557e
Fix initial colour of leaderboard mod filter
2019-07-04 13:24:13 -07:00
Joehu
5f6544eebf
Fix beatmap leaderboards requiring supporter when signed out
2019-07-04 12:05:07 -07:00
naoey
f04adb7192
Apply mods filter to local scores too
2019-07-04 22:38:33 +05:30
Joehu
9b2ebed669
Remove unused EditSongSelect file
2019-07-04 08:36:34 -07:00
David Zhao
be4e7d0f50
remove comment
2019-07-04 17:08:21 +09:00
Dean Herbert
db24ac28ec
Add tests
2019-07-04 16:53:08 +09:00
Dean Herbert
a20d5baa57
Fix skip button not being clickable after fade out
2019-07-04 16:21:01 +09:00
Dean Herbert
2b9f7d551f
Fix incorrect type specification
2019-07-04 16:16:17 +09:00
Dean Herbert
4885f0f0c7
Add messaging telling users how to leave changelog comments
2019-07-04 15:47:06 +09:00
Dean Herbert
32bb963393
Lock WorkingBeatmap cache to avoid threading issues
2019-07-04 14:33:00 +09:00
iiSaLMaN
b53aeec90d
Move audio adjustment inside OnResuming
2019-07-04 05:18:29 +03:00
iiSaLMaN
99603ca0b6
Fade out game volume on exiting
...
Invokes 'this.Exit()' on completion (simplify lines)
2019-07-04 04:50:49 +03:00
Dean Herbert
f41c89c3be
Fix replays of converted beatmaps failing to download ( #5225 )
...
Fix replays of converted beatmaps failing to download
2019-07-04 01:50:47 +09:00
Dean Herbert
f358b69b8e
Refactor Ruleset Selector in osu!direct ( #5214 )
...
Refactor Ruleset Selector in osu!direct
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-04 01:24:58 +09:00
Dean Herbert
7575047db8
Merge branch 'master' into import-stable-scores
2019-07-04 01:00:42 +09:00
Dean Herbert
e55d6232d1
Merge branch 'master' into direct-ruleset-selector
2019-07-04 00:56:36 +09:00
Dean Herbert
4ecc690164
Merge branch 'master' into fix-logo-vis-catchup
2019-07-04 00:47:42 +09:00
Dean Herbert
ead961004a
Update framework ( #5231 )
...
Update framework
2019-07-04 00:47:27 +09:00
Dean Herbert
db3e9c7e60
Fix WaveOverlayContainer being always present ( #5210 )
...
Fix WaveOverlayContainer being always present
2019-07-04 00:35:22 +09:00
Dean Herbert
1824d29996
Update framework
2019-07-04 00:34:39 +09:00
naoey
99606a018b
Merge remote-tracking branch 'upstream/master' into leaderboard-mod-filter
2019-07-03 19:35:08 +05:30
Dean Herbert
127b0b33c2
Fix local beatmap leaderboard displaying scores from all game m… ( #5226 )
...
Fix local beatmap leaderboard displaying scores from all game modes
2019-07-03 21:52:44 +09:00
Andrei Zavatski
cfac90b228
Use ConstrainedIconContainer instead of SpriteIcon
2019-07-03 14:34:24 +03:00
naoey
4ba60ed089
Apply currently selected mods to filter leaderboard scores
...
Modifies GetScoresRequest to build query string locally instead of using WebRequest.AddParameter since it doesn't support array parameters
2019-07-03 17:04:20 +05:30
Andrei Zavatski
d6740d9688
Merge remote-tracking branch 'refs/remotes/ppy/master' into direct-ruleset-selector
2019-07-03 14:19:41 +03:00
Dean Herbert
3b5ffdc2cb
Merge branch 'master' into android
2019-07-03 19:05:58 +09:00
Dean Herbert
8120bb36bc
More methods
2019-07-03 18:42:10 +09:00
Dean Herbert
06ef8f71e9
Fix typo
2019-07-03 18:41:01 +09:00
Dean Herbert
d723998389
Merge remote-tracking branch 'upstream/master' into discoverRulesets
2019-07-03 18:36:37 +09:00
Dean Herbert
62dd89197c
Refactor comment slightly
2019-07-03 18:36:04 +09:00
naoey
ccae4ce95e
Fix local beatmap leaderboard displaying scores from all game modes
2019-07-03 14:39:11 +05:30
miterosan
5ecb764cdc
Remove whitespaces and lowercase the comments
2019-07-03 10:57:09 +02:00
naoey
9805adc61d
Fix online ScoreInfo having the wrong ruleset
2019-07-03 14:25:59 +05:30
miterosan
43d7f66c5b
Add comment about the android ruleset situation.
2019-07-03 10:54:10 +02:00
Dean Herbert
1219bea077
Fix layout of profile top header to match web ( #5218 )
...
Fix layout of profile top header to match web
2019-07-03 17:48:18 +09:00
miterosan
ab244d1b7f
Only log that the rulesets could not be loaded from a directory.
2019-07-03 10:21:18 +02:00
miterosan
d9e646d9ef
Use addRuleset inside loadRulesetFromFile
2019-07-03 09:51:09 +02:00
David Zhao
b2185cd3a2
Merge branch 'master' into buttonsystem-entermode
2019-07-03 15:54:34 +09:00
Dean Herbert
6e308945b1
Fix logo visualisation trying to catch up after being off-screen
2019-07-03 15:22:17 +09:00
Dean Herbert
1189092e20
Remove redundant scale specification
2019-07-03 12:49:16 +09:00
Salman Ahmed
98daaf634a
Simplify changes
2019-07-03 06:44:17 +03:00
Dean Herbert
be904512d9
Merge branch 'master' into animated-rank-grades
2019-07-03 12:44:08 +09:00
Dean Herbert
d22a1229cb
Remove unnecessary disposal
2019-07-03 12:06:20 +09:00
