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
Dean Herbert
23acddcb56
Rename download buttons to avoid ambiguity
2019-07-03 12:02:35 +09:00
Dean Herbert
466bc7f28a
Merge branch 'master' into watch-replays-4
2019-07-03 11:47:10 +09:00
Salman Ahmed
3f39541cc2
Fade health bar on value change
2019-07-03 05:11:11 +03:00
Salman Ahmed
8b4ef52c13
Revert unnecessary changes
2019-07-03 07:27:24 +03:00
Salman Ahmed
30ec8e031e
Merge branch 'master' into animated-rank-grades
2019-07-03 02:34:08 +03:00
Joehu
a1fb41ea66
Use FillFlowContainer on flag and country
2019-07-02 10:53:52 -07:00
Joehu
d387629e53
Fix layout of profile top header to match web
2019-07-02 10:52:24 -07:00
Dean Herbert
a155cdf5fd
Merge branch 'master' into fix-overlay-presence
2019-07-03 00:51:22 +09:00
Dean Herbert
f9c24f2281
Update framework
2019-07-03 00:35:55 +09:00
miterosan
f1ceea8361
style fixes
2019-07-02 17:25:12 +02:00
Dean Herbert
e1d0d26669
Add a note about local optimisation that may not be required in the future
2019-07-03 00:21:16 +09:00
miterosan
778c36c7d7
Allow discover of rulesets that are already loaded.
2019-07-02 17:05:04 +02:00
Dean Herbert
2fcd428d73
Merge branch 'master' into fix-overlay-presence
2019-07-02 23:40:49 +09:00
Dean Herbert
8e0b5f1622
Fix weird merge conflict
2019-07-02 23:21:13 +09:00
Dan Balasescu
2fafe9a651
Merge branch 'master' into async-beatmap-load
2019-07-02 23:19:10 +09:30
Dean Herbert
7caa6eaed5
Remove all non-transform LogoVisualisation per-frame allocations ( #5200 )
...
Remove all non-transform LogoVisualisation per-frame allocations
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-02 22:42:18 +09:00
Dean Herbert
51fe8c3ab6
Add database statistics to GlobalStatistics ( #5208 )
...
Add database statistics to GlobalStatistics
2019-07-02 22:42:03 +09:00
Dean Herbert
df12090721
Centralise SocialOverlay's scheduling logic ( #5209 )
...
Centralise SocialOverlay's scheduling logic
2019-07-02 22:41:49 +09:00
Dean Herbert
73474826f6
Avoid Intro screen holding references to the intro beatmap ( #5211 )
...
Avoid Intro screen holding references to the intro beatmap
2019-07-02 22:41:34 +09:00
Dean Herbert
8d2cb51b8c
Merge branch 'master' into buffer-on-demand
2019-07-02 22:41:17 +09:00
Dean Herbert
089eadb008
Add weak WorkingBeatmap cache ( #5163 )
...
Add weak WorkingBeatmap cache
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-02 22:40:47 +09:00
Dean Herbert
e7a7f2f660
Add statistic for count of alive WorkingBeatmaps
2019-07-02 22:39:49 +09:00
Dean Herbert
256a1a4309
Merge remote-tracking branch 'upstream/master' into fix-overlay-presence
2019-07-02 22:33:38 +09:00
Dean Herbert
93511266e5
Fix waves not displaying at all
2019-07-02 22:33:33 +09:00
Dean Herbert
f31d840c13
Dispose previous WorkingBeatmap on change
2019-07-02 22:26:08 +09:00
Dean Herbert
9e33fb35e9
Fix typo
2019-07-02 22:26:08 +09:00
Dean Herbert
a6acc1f99f
Catch exception and return null for safety
...
.
2019-07-02 22:26:08 +09:00
Dean Herbert
0b66f13902
Add todo about beatmap load cancellation
2019-07-02 22:22:33 +09:00
Dean Herbert
a26b14a4f8
Move finaliser inside disposal region
2019-07-02 22:21:56 +09:00
Dan Balasescu
15321ee0e8
Merge branch 'master' into reduce-logovis-allocs
2019-07-02 22:44:39 +09:30
Dean Herbert
31b1480263
Merge branch 'master' into async-beatmap-load
2019-07-02 20:44:53 +09:00
naoey
1ff6a9d085
Remove unused using
2019-07-02 16:25:40 +05:30
naoey
eaa19d5a49
Remove unused/unnecessary fields
2019-07-02 16:13:47 +05:30
Dean Herbert
9bed0094de
Merge remote-tracking branch 'upstream/master' into android
2019-07-02 19:40:50 +09:00
Andrei Zavatski
082fa0d808
simplify updateState logic
2019-07-02 13:35:02 +03:00
naoey
ee516d2515
Make direct panel download and replay buttons share UI
2019-07-02 15:55:30 +05:30
Andrei Zavatski
2971bd8cbc
Add disable trigger to a testcase
2019-07-02 13:22:38 +03:00
Andrei Zavatski
08dfe413c1
Refactor Ruleset Selector in Direct
2019-07-02 13:07:36 +03:00
Dean Herbert
79b0deb353
Update resources reference
2019-07-02 17:59:25 +09:00
Dean Herbert
587be955c3
Increase number of backgrounds in line with resources
2019-07-02 17:57:23 +09:00
Dean Herbert
7b2227c505
Fix xmldoc
2019-07-02 17:47:19 +09:00
Dean Herbert
6c7b97931e
Avoid using a BufferedContainer for backgrounds unless required
2019-07-02 17:45:46 +09:00
Dean Herbert
29bb227de2
Avoid Intro screen holding references to the intro beatmap
2019-07-02 16:28:06 +09:00
Dean Herbert
451765784a
Centralise SocialOverlay's scheduling logic
...
Just some clean-ups to make it easier to confirm correct logic
2019-07-02 15:25:40 +09:00
Dean Herbert
d27a0db45c
Enforce StartHidden on relevant overlays
2019-07-02 15:23:47 +09:00
Dean Herbert
2645967dc4
Fix wave-based overlays always being present before initial display
2019-07-02 15:17:35 +09:00
Dean Herbert
8e54990f62
Add database statistics to GlobalStatistics
2019-07-02 13:43:43 +09:00
Dean Herbert
6539c6da17
Merge branch 'master' into watch-replays-4
2019-07-02 13:24:16 +09:00
Salman Ahmed
744e651a37
Merge branch 'master' into applicable-to-hud
2019-07-02 05:24:56 +03:00
Salman Ahmed
6a79349f4a
Move health display out of the visibility container
2019-07-02 02:19:59 +03:00
Salman Ahmed
a8e8650ddd
Move blocking fail logic into a base class
2019-07-02 01:47:39 +03:00
Salman Ahmed
72e5cbb07f
Add checkbox for hiding health bar
2019-07-02 01:45:09 +03:00
Roman Kapustin
9037fb59de
Make BeatmapOptionsButton insertion cleaner
2019-07-01 18:42:18 +03:00
Roman Kapustin
7bdf737956
Make notification insertion cleaner
2019-07-01 18:41:40 +03:00
Roman Kapustin
0c95dff3d6
Make FlowContainer insertion cleaner
2019-07-01 18:41:08 +03:00
Dean Herbert
313648b869
Update framework
2019-07-02 00:34:43 +09:00
Dan Balasescu
8ef2ab8983
Merge branch 'master' into legacy-skin-hidden-hits-support
2019-07-02 00:04:27 +09:30
Dan Balasescu
3d4c5104b3
Merge branch 'master' into reduce-db-contexts
2019-07-01 23:40:58 +09:30
smoogipoo
fc8dee6123
Fix typo
2019-07-01 23:26:53 +09:30
Dean Herbert
4e54bb3f72
Merge remote-tracking branch 'upstream/master' into venera-900
2019-07-01 22:06:33 +09:00
Dean Herbert
e6c1b059bc
Disable dimming main content
2019-07-01 18:49:36 +09:00
Dean Herbert
5d94c67c76
Merge remote-tracking branch 'upstream/master' into selector-hiding
2019-07-01 18:49:18 +09:00
Salman Ahmed
3e2fcc95ed
Merge branch 'master' into venera-900
2019-07-01 12:16:48 +03:00
Salman Ahmed
b875ab2f58
Update resources
2019-07-01 12:15:53 +03:00
Dean Herbert
0636df5660
Add support for legacy skins which use animation frames to hide elements
2019-07-01 18:13:14 +09:00
Dean Herbert
9de4bb3423
Remove all non-transform LogoVisualisation per-frame allocations
2019-07-01 16:12:20 +09:00
HoLLy
79fc143422
Only remove .osk files when importing skin archives
2019-06-30 16:52:39 +02:00
Dean Herbert
8703f0ad40
Change song select initialisation to promote db context sharing
2019-06-30 22:23:48 +09:00
Dean Herbert
60ea3d4e1a
Fix skinning support for combobreak
2019-06-30 21:58:30 +09:00
Dean Herbert
bd54b34538
Merge remote-tracking branch 'upstream/master' into combobreak
2019-06-30 21:27:53 +09:00
Dean Herbert
fa879b4b60
Add a note explaining why manual handling is required
2019-06-30 20:47:09 +09:00
Unknown
5b26ef75b1
allow exiting editor again
2019-06-30 12:31:31 +02:00
naoey
bfcbb47b77
Clean up some more leftover code
2019-06-30 10:56:20 +05:30
iiSaLMaN
c5b3572c28
Add missing details
2019-06-30 08:05:45 +03:00
iiSaLMaN
9498fc2426
Use proper colours for rank background and text
2019-06-30 05:47:52 +03:00
iiSaLMaN
20ad486d53
Scale adjustments
2019-06-30 04:59:33 +03:00
iiSaLMaN
372d90de6a
Remove unnecessary assigns
2019-06-30 04:25:47 +03:00
iiSaLMaN
8c5397709b
Use drawables instead of textures
2019-06-30 04:20:42 +03:00
Salman Ahmed
9a617dd143
Add Venera Medium in Store
2019-06-30 03:16:58 +03:00
welsar55
d6561531a3
Merge branch 'master' into combobreak
2019-06-29 11:55:10 -05:00
Welsar55
dbb1369eaf
Use resources build 627
2019-06-29 11:54:02 -05:00
Welsar55
a22c166575
Make ComboEffects its own class
2019-06-29 11:28:40 -05:00
naoey
04c467fd81
Add comment
2019-06-29 16:10:16 +05:30
naoey
6c81d57178
Remove hacks for updating model info
...
- Re-retrieve score from database when presenting scores
2019-06-29 16:08:48 +05:30
naoey
d8f6bbc90e
Disable replay button when replay is unavailable
2019-06-29 12:49:03 +05:30
naoey
7d9e215744
Code quality fixes
2019-06-29 12:29:12 +05:30
naoey
424711d24b
Fix replay button shake container
...
- Add license headers
- Slightly reduce bottom margin of button in score screen
2019-06-29 12:26:37 +05:30
naoey
f9316bc038
Hack fix for models not updating correctly when added in DB
2019-06-29 11:09:39 +05:30
naoey
bc52f76556
Move replay button to score card
2019-06-29 10:55:30 +05:30
Welsar55
a57218e50e
Move to LocalSkinOverride
2019-06-28 20:45:11 -05:00
iiSaLMaN
41597efdf7
Hide health bar in no fail
2019-06-29 04:25:52 +03:00
iiSaLMaN
d37cefbad8
Implement IApplicableToHUD
2019-06-29 04:23:59 +03:00
Dean Herbert
c2f82f86d6
Update framework
2019-06-28 18:14:08 +09:00
Dean Herbert
3902da9135
Merge remote-tracking branch 'upstream/master' into abstract-menu
2019-06-28 18:13:44 +09:00
Dean Herbert
6d0cc1f770
Remove GC debug setting
2019-06-28 15:59:19 +09:00
smoogipoo
23df1a5d42
Merge remote-tracking branch 'HollyHacker/master' into abstract-menu
2019-06-28 13:42:56 +09:00
naoey
53d6d74537
Update to match upstream changes
2019-06-28 09:33:13 +05:30
naoey
ab0bb8b678
Implement replay downloading with ArchiveDownloadModelManager
2019-06-28 09:33:13 +05:30
Dean Herbert
e8ea0594b4
Fix ruleset selector line not moving on first display ( #5168 )
...
Fix ruleset selector line not moving on first display
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-28 00:52:11 +09:00
Dean Herbert
e0fb547bb3
Fix download buttons not finding existing downloads and already… ( #5171 )
...
Fix download buttons not finding existing downloads and already downloaded maps
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-28 00:40:52 +09:00
HoLLy
12350d18b5
Don't remove imported archives by default
2019-06-27 14:41:11 +02:00
HoLLy
55216dffb7
Merge remote-tracking branch 'origin/master' into import-stable-scores
2019-06-27 14:07:17 +02:00
Dean Herbert
4952fb3716
Merge branch 'master' into fix-toolbar-bar
2019-06-27 19:58:13 +09:00
smoogipoo
a6ee83eac2
Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders
2019-06-27 19:57:21 +09:00
naoey
61260cf599
Hand off comparison logic for database query to implementors
...
Equals overrides are not used in EF queries without running the comaprison locally instead of on the database, so to preserve that the comparison logic is instead implemented on a per manager basis.
2019-06-27 15:32:27 +05:30
Dean Herbert
72bb6f8c12
Fix download buttons not correctly finding existing downloads
2019-06-27 15:24:08 +05:30
Dan Balasescu
3570605255
Merge branch 'master' into remove-handle-input-overrides
2019-06-27 18:44:55 +09:00
Dean Herbert
ba48331fcb
Remove no longer necessary HandleInput overrides
2019-06-27 18:34:59 +09:00
Dan Balasescu
2ee4fde5f0
Merge branch 'master' into fix-settings-subpanel-dim
2019-06-27 18:30:36 +09:00
smoogipoo
f6f547a91b
Fix ruleset selector line not moving on first display
2019-06-27 18:25:38 +09:00
Dean Herbert
98ba38d421
Merge branch 'master' into user_profile_modes
2019-06-27 15:34:21 +09:00
Dean Herbert
d6c28dc6d7
Simplify and fix state management
2019-06-27 15:31:47 +09:00
Dean Herbert
25499f74a7
Remove redundant font set
2019-06-27 15:31:36 +09:00
smoogipoo
b397652af4
Remove ability to set arbitrary accent colours
2019-06-27 15:02:26 +09:00
smoogipoo
7f5587d894
RulesetTabItem -> ProfileRulesetTabItem
2019-06-27 14:54:31 +09:00
smoogipoo
803198ff20
Gamemode -> Ruleset
2019-06-27 14:53:18 +09:00
Dean Herbert
ef384b8667
Add simple (weak) WorkingBeatmap cache
2019-06-27 14:09:09 +09:00
Dean Herbert
1072431fbb
Fix test StackOverflows
2019-06-27 14:08:58 +09:00
Dean Herbert
0bad86f6d9
Merge remote-tracking branch 'upstream/master' into async-beatmap-load
2019-06-27 13:58:59 +09:00
Dean Herbert
8b0aaccfe6
Add finaliser to WorkingBeatmap
2019-06-27 13:56:36 +09:00
smoogipoo
9e2e393ab7
DownloadAllowed -> DownloadEnabled
2019-06-27 13:38:21 +09:00
smoogipoo
c1277b5db2
Test the download button directly for safety
2019-06-27 13:35:14 +09:00
Dean Herbert
f3aab143aa
Fix settings subpanels dimming main content
2019-06-27 13:16:16 +09:00
Dean Herbert
3294464bc6
Fix typo in variable
2019-06-27 12:47:05 +09:00
Dean Herbert
a5ccfeb18e
Remove unnecessary fill flow
2019-06-27 12:34:22 +09:00
Dean Herbert
be901294f7
Simplify text layout
2019-06-27 12:33:14 +09:00
Dean Herbert
cd6f452bfa
Remove weird download button exposure
2019-06-27 12:22:38 +09:00
Dean Herbert
c49b8b1883
Remove accidental change
2019-06-27 12:19:49 +09:00
Dean Herbert
a4929f19e5
Adjust background colour of non-loaded beatmap set cover to play better with black foreground elements
2019-06-27 12:17:28 +09:00
Dean Herbert
32c3bee71b
Avoid public exposure
2019-06-27 12:11:04 +09:00
Dean Herbert
cc9a7839c9
Fix layout regression
2019-06-27 12:04:01 +09:00
Dean Herbert
d6da21b0f0
Tidy up fetch methods
...
Anonymise some test data further
2019-06-27 12:00:31 +09:00
Dean Herbert
375a6f406d
Merge remote-tracking branch 'upstream/master' into not-available-to-download
2019-06-27 11:44:41 +09:00
Dean Herbert
322d92d3e0
Rename class to BeatmapAvailability
2019-06-27 11:40:22 +09:00
iiSaLMaN
9ada4d68b1
Make fields protected and expose them in tests
2019-06-26 22:42:34 +03:00
Welsar55
826699a7e7
Remove unneeded bindable
2019-06-26 12:16:44 -05:00
Andrei Zavatski
2e49b4ffcd
Update the component with an abstract RulesetSelector class
2019-06-26 18:56:40 +03:00
Andrei Zavatski
e9f3a1ba63
Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes
2019-06-26 18:31:36 +03:00
Dean Herbert
9edd98efdc
Move disposal to end of class
2019-06-27 00:29:38 +09:00
Dean Herbert
768d6c2fb3
ModelInfo -> Model
2019-06-27 00:29:09 +09:00
naoey
8efc504817
Post merge fixes
2019-06-26 18:22:37 +05:30
naoey
f3a84de7b5
Merge remote-tracking branch 'upstream/master' into generic-download-tracking-composite
2019-06-26 18:17:53 +05:30
Dean Herbert
c34f6180e6
Merge branch 'master' into generic-download-model-manager
2019-06-26 20:37:56 +09:00
Dean Herbert
da65658bc3
Fix comments
2019-06-26 20:07:01 +09:00
David Zhao
4510c868f4
Remove selector toggling logic for now
2019-06-26 19:39:47 +09:00
Dean Herbert
6812eccdd1
Fix MusicController holding references to beatmaps while inacti… ( #5158 )
...
Fix MusicController holding references to beatmaps while inactive
2019-06-26 19:30:16 +09:00
David Zhao
e92c1ca009
Fix styling, private tabClosed, remove type check
2019-06-26 19:25:54 +09:00
Dan Balasescu
f06aabad5f
Merge branch 'master' into toolbar-rulesets-refactor
2019-06-26 18:33:45 +09:00
smoogipoo
6ce86e6083
General refactoring
2019-06-26 17:52:25 +09:00
David Zhao
a1a0a9ee6b
Merge branch 'master' into selector-hiding
2019-06-26 17:45:05 +09:00
smoogipoo
cb65fc6317
Don't throw exception for non-existent files
2019-06-26 17:23:12 +09:00
smoogipoo
15b140b2ee
Shortcut checking for whether directories are files
2019-06-26 17:10:22 +09:00
Welsar55
7dd1479050
Add combobreak sound
2019-06-26 00:20:33 -05:00
Dean Herbert
2707a7179e
Fix MusiController holding references to beatmaps while inactive
2019-06-26 13:18:03 +09:00
Dean Herbert
1eda4e0dd4
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager
2019-06-26 12:21:04 +09:00
David Zhao
6c8cc9728f
fix channel selector not being closed
2019-06-26 12:00:58 +09:00
Dean Herbert
9e1cb90dd8
Remove existing argument for ItemAdded event
...
For all usages, it looks like this was unnecessary.
2019-06-26 11:40:41 +09:00
Dan Balasescu
6063e7a69f
Merge branch 'master' into one-hit-screen
2019-06-26 11:34:54 +09:00
Salman Ahmed
eaf6f6891d
Rename to DownloadButtonsContainer
2019-06-26 05:22:08 +03:00
Salman Ahmed
f4e765cf99
Merge branch 'master' into not-available-to-download
2019-06-26 05:13:58 +03:00
Albert Tang
3cf2ffc1a7
Merge branch 'master' into android
2019-06-25 17:54:23 -05:00
Dean Herbert
446fbce81c
Add base class for startup screens
...
Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.
2019-06-26 01:36:17 +09:00
naoey
c476e46a8e
Remove unnecessary private methods and inline used-once code
2019-06-25 21:16:30 +05:30
Dean Herbert
40cf573368
Fix pause not correctly showing pause screen
2019-06-25 23:15:58 +09:00
Dean Herbert
983cabdb98
Disallow back button on disclaimer screen
2019-06-25 22:27:50 +09:00
naoey
6f5fbd7ea1
Remove unnecessary try-catch block
2019-06-25 18:28:59 +05:30
naoey
9d88295ece
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager
2019-06-25 18:27:16 +05:30
Dean Herbert
7d5554c2ac
Re-use the back button game-wide ( #5149 )
...
Re-use the back button game-wide
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-25 20:50:28 +09:00
Dean Herbert
f9dad0f640
Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
2019-06-25 20:23:49 +09:00
Dean Herbert
f51be4c4fe
Adjust transitions a tad
2019-06-25 20:23:34 +09:00
Andrei Zavatski
bae0258d8d
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
2019-06-25 14:16:05 +03:00
Dean Herbert
75b78d5e27
Reduce size of dropdown chevron ( #5150 )
...
Reduce size of dropdown chevron
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-25 20:05:52 +09:00
Dean Herbert
28cfccbd64
Use OsuScrollContainer for osu menus ( #5094 )
...
Use OsuScrollContainer for osu menus
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-25 20:05:09 +09:00
Dan Balasescu
7794fab7c9
Merge branch 'master' into reduce-dropdown-chevron-size
2019-06-25 19:58:37 +09:00
Dan Balasescu
0f31d17129
Merge branch 'master' into reduce-background-brightness
2019-06-25 19:45:15 +09:00
Dean Herbert
a3de369c20
Reduce size of dropdown chevron
2019-06-25 19:32:00 +09:00
Dean Herbert
8c02709d74
Merge branch 'master' into fix-dropdown-styling
2019-06-25 19:28:37 +09:00
Dean Herbert
445660d066
Merge pull request #5148 from peppy/update-framework
...
Update framework
2019-06-25 19:28:17 +09:00
Dan Balasescu
c6965a40dc
Merge branch 'master' into reduce-background-brightness
2019-06-25 19:18:28 +09:00
Dan Balasescu
47974ca854
Merge branch 'master' into beatmap-overlay-load
2019-06-25 19:05:17 +09:00
Dan Balasescu
ffcd3529a6
Merge branch 'master' into cancel-api-callback
2019-06-25 18:43:33 +09:00
smoogipoo
aa81c95f30
Remove unnecessary extra property
2019-06-25 18:38:14 +09:00
Dean Herbert
fe290ead63
Update framework
2019-06-25 18:38:11 +09:00
smoogipoo
5b294ba419
Adjust backbutton animation
2019-06-25 18:33:35 +09:00
smoogipoo
531b107a98
Exit match before exiting multiplayer
2019-06-25 18:33:26 +09:00
smoogipoo
1a26608ba9
Close mod select before exiting song selection
2019-06-25 18:33:21 +09:00
smoogipoo
d9927204f8
Relieve OsuScreen of back button input duties
2019-06-25 18:33:18 +09:00
smoogipoo
f53d2fbe76
Scale backbutton along with screens
2019-06-25 18:33:13 +09:00
smoogipoo
8c96e4c1fa
Move back button to OsuGame
2019-06-25 18:33:08 +09:00
Dean Herbert
7bc7df2249
Reduce background brightness at PlayerLoader
2019-06-25 17:22:10 +09:00
Dean Herbert
93b6d5b7e3
Fix keybindings being offset
2019-06-25 17:16:19 +09:00
Dean Herbert
ba2f22be47
Improve loading state of BeatmapSet header
2019-06-25 14:47:29 +09:00
Dean Herbert
90acc9b6ca
Avoid calling api request callback after user cancel
2019-06-25 13:52:43 +09:00
smoogipoo
fb94cd43a4
Remove unnecessary local item storage in SettingsDropdown
2019-06-25 12:00:05 +09:00
Dean Herbert
cc1e67dc6c
Merge branch 'master' into fix-avatar-display-update-2
2019-06-25 10:18:46 +09:00
jorolf
4d8f49b9bc
update code to work with https://github.com/ppy/osu-framework/pull/2568
2019-06-24 23:17:07 +02:00
Andrei Zavatski
b7d15982d7
Remove useless parentheses
2019-06-24 23:30:35 +03:00
Andrei Zavatski
4a05c560cf
Remove unwanted class and move the bind logic outside the RulesetSelector
2019-06-24 23:13:28 +03:00
Andrei Zavatski
9dedd62d9a
Revert a hotfix in multi screen
...
since it's been fixed in a framework
2019-06-24 22:57:18 +03:00
Andrei Zavatski
35516e7304
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
2019-06-24 22:52:24 +03:00
HoLLy
236d5a9abc
Remove leftover TransformDuration overrides
2019-06-24 18:26:25 +02:00
HoLLy
739077ef4f
Only hide UpdateableAvatar/Flag immediately
2019-06-24 18:24:31 +02:00
HoLLy
7734c4b41a
Fix code style
2019-06-24 18:09:42 +02:00
Dean Herbert
6a541d9a10
Merge branch 'master' into user_profile_modes
2019-06-25 00:59:51 +09:00
Dean Herbert
c0b5153094
Merge branch 'master' into music-effect-arrow-keys-hover
2019-06-24 21:49:45 +09:00
Dean Herbert
88b182ab3f
Merge branch 'master' into generic-download-model-manager
2019-06-24 18:35:58 +09:00
Dean Herbert
f91467eddc
Fix licence header
2019-06-24 18:34:23 +09:00
Dean Herbert
bd2f34a102
Merge branch 'master' into quickEscape
2019-06-24 18:21:39 +09:00
Dean Herbert
2ea5165803
Change case to match; change hotkey to be more globally usable (previous has conflict on macOS)
2019-06-24 18:19:17 +09:00
Dean Herbert
fad1ced1b5
Add correct conditionals to allow exit
2019-06-24 18:15:27 +09:00
Dean Herbert
d70248338d
Merge remote-tracking branch 'upstream/master' into quickEscape
2019-06-24 18:14:48 +09:00
HoLLy
aed83471f4
Replace Reset with overridden TransformImmediately/TransformDuration
2019-06-24 10:51:45 +02:00
Dean Herbert
2473a9487a
Add missing using
2019-06-24 17:38:11 +09:00
Dean Herbert
6e2138491b
Merge branch 'master' into useroverlay-tabs
2019-06-24 17:27:47 +09:00
Dean Herbert
1830362337
Move task out of ctor to avoid initialisation ordering issues
2019-06-24 17:10:50 +09:00
Dean Herbert
36d54fdbfc
Merge branch 'master' into skinnable-sprite
2019-06-24 16:33:17 +09:00
Dean Herbert
06eaba766b
Move method below ctor
2019-06-24 15:27:46 +09:00
Dean Herbert
9593e66a96
Add some more xmldoc
2019-06-24 15:25:01 +09:00
Dan Balasescu
18d64df0c4
Merge branch 'master' into add-numberbox
2019-06-24 15:22:30 +09:00
Dean Herbert
3f22c0a311
Add SkinnableSprite implementation
2019-06-24 15:17:35 +09:00
Joehu
7ac6558f59
Allow controlling music and effect volume by arrow keys when hovering
2019-06-23 22:53:02 -07:00
Dan Balasescu
5f05b9ac0b
Merge branch 'master' into async-beatmap-load
2019-06-24 14:24:07 +09:00
Dean Herbert
6d864cb47e
Load beatmap content asynchronously in the background
2019-06-24 13:38:30 +09:00
Dan Balasescu
00a2aa7881
Merge branch 'master' into useroverlay-overall-improvements
2019-06-24 13:28:17 +09:00
smoogipoo
5272b3a929
Use .Darken() instead of hex-based colour
2019-06-24 13:27:58 +09:00
Dean Herbert
1057301322
Fix multiplayer create button appearing in match song selection ( #5132 )
...
Fix multiplayer create button appearing in match song selection
2019-06-24 12:31:39 +09:00
smoogipoo
8d6fc3edf0
Fix multiplayer create button appearing in match song selection
2019-06-24 11:54:41 +09:00
Dean Herbert
c988dfbdaa
Make things a bit more sensible
2019-06-24 11:43:34 +09:00
Andrei Zavatski
bbdb114f04
Add missing blank line
2019-06-24 02:09:00 +03:00
Andrei Zavatski
35db20a337
Remove useless bindable check
2019-06-24 02:01:00 +03:00
Andrei Zavatski
94e819578e
Finally fix the problem when we can't apply a ruleset in the multi screen
...
because it's disabled
2019-06-24 01:55:35 +03:00
Andrei Zavatski
60ff497add
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
2019-06-24 01:06:54 +03:00
mulraf
dfb791ed3e
Update PopupDialog.cs
...
Changed Spacings
2019-06-23 22:59:14 +02:00
mulraf
7bbd6b810f
Update PopupDialog.cs
...
New here, i never really programmed on a big project like this. It looks kinda makeshift and i hope it doesn't cause any other issues but i've seen nothing and it fixed the issue for me. It was all dialog boxes that got cut off at the top (so also deleting all beatmaps etc.)
2019-06-23 20:33:43 +02:00
Andrei Zavatski
8430ac6d1c
remove unused using
2019-06-23 19:19:36 +03:00
Andrei Zavatski
1c20df780a
Adjust triangles colour
2019-06-23 17:08:18 +03:00
Ganendra Afrasya
d540565197
Merge branch 'master' into difficulty-icon-tooltip
2019-06-22 11:54:00 +07:00
Andrei Zavatski
4963d4e8df
CI fixes
2019-06-22 03:08:18 +03:00
Andrei Zavatski
3723ea05de
Adjust Title style
2019-06-22 02:52:07 +03:00
Andrei Zavatski
4cd3b15f6e
Add triangles
2019-06-22 02:40:33 +03:00
Andrei Zavatski
dbf53e9bda
Use correct background colour for sections
2019-06-22 02:06:30 +03:00
Andrei Zavatski
132cb8f473
Add spacing between sections
2019-06-22 01:11:04 +03:00
HoLLy
f072a53e93
Merge remote-tracking branch 'origin/master' into import-stable-scores
2019-06-21 17:42:59 +02:00
HoLLy
d99f4d1a87
Change import button to mention replays instead of scores
2019-06-21 17:42:54 +02:00
HoLLy
802da225d4
Move responsibility for selecting paths to model managers
2019-06-21 17:32:47 +02:00
Joehu
36f59ec86d
Remove unused using
2019-06-21 08:29:45 -07:00
Joehu
74e99b2915
Remove unused parameter
2019-06-21 08:11:10 -07:00
Joehu
1d6b6a7828
Fix audio being dimmed on preview tracks
2019-06-21 08:06:57 -07:00
HoLLy
f1f03dd541
Remove async from Import method
2019-06-21 17:01:11 +02:00
HoLLy
fafec00667
Reset top score avatar before updating it
2019-06-21 16:47:19 +02:00
iiSaLMaN
bd842f2a8c
Update tooltip text
2019-06-21 16:38:16 +03:00
Dean Herbert
3ad74e2ff3
Merge branch 'master' into update-framework
2019-06-21 22:24:57 +09:00
Dean Herbert
ca2a3937ea
Fix audio not dimming after race condition ( #5049 )
...
Fix audio not dimming after race condition
2019-06-21 22:24:36 +09:00
Dean Herbert
859afefb79
Prevent non-combo affecting judgements from triggering sudden death ( #5095 )
...
Prevent non-combo affecting judgements from triggering sudden death
2019-06-21 22:24:00 +09:00
Unknown
1bc1e2459e
add SettingsNumberBox and use it in tournament tools
2019-06-21 15:04:52 +02:00
Unknown
16a4805f1f
add OsuNumberBox with basic tests
2019-06-21 15:04:52 +02:00
KingLuigi4932
13f6c6a87e
Update framework
2019-06-21 15:23:35 +03:00
Dean Herbert
cff5ddb137
Merge branch 'master' into fix-inactive-audio-race
2019-06-21 21:09:12 +09:00
Dean Herbert
f766068e17
Remove local implementation of bindable in OsuCheckbox ( #5046 )
...
Remove local implementation of bindable in OsuCheckbox
2019-06-21 21:08:09 +09:00
Dean Herbert
763e000bf1
Merge branch 'master' into not-available-to-download
2019-06-21 20:54:35 +09:00
Dean Herbert
abd0c2bb1a
Move NotificationSection strings to constructor ( #5078 )
...
Move NotificationSection strings to constructor
2019-06-21 20:47:31 +09:00
iiSaLMaN
0cc7a604ed
Update font sizes
2019-06-21 14:18:20 +03:00
iiSaLMaN
a1c58b164c
Merge branch 'master' into not-available-to-download
2019-06-21 14:16:31 +03:00
Andrei Zavatski
29305ca0eb
fix broken layout
2019-06-21 13:24:12 +03:00
Andrei Zavatski
7680f6cbf4
Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs
2019-06-21 13:06:44 +03:00
Dan Balasescu
67246eddd4
Merge branch 'master' into fix-chat-test-scene
2019-06-21 16:34:35 +09:00
Dan Balasescu
681a123560
Merge branch 'master' into add-spacing-user-profile-ranks
2019-06-21 16:06:49 +09:00
Dean Herbert
ae084157e4
Add tournament streaming and management toolchain ( #3491 )
...
Add tournament streaming and management toolchain
2019-06-21 16:02:35 +09:00
Dean Herbert
6627cdefd2
Merge branch 'master' into tournament-tools
2019-06-21 15:52:47 +09:00
Dean Herbert
540b61da0a
Add some spacing between user profile ranks
2019-06-21 15:27:19 +09:00
Dean Herbert
5ed6c09aa9
Merge branch 'master' into key-binding-fixes
2019-06-21 15:12:37 +09:00
Dean Herbert
6c5599f874
Fix chat being dismissed in test scene when it shouldn't
2019-06-21 15:09:54 +09:00
Dean Herbert
666d5744cd
Fix unbinding not working correctly
2019-06-21 14:43:00 +09:00
David Zhao
de59e038ac
Prevent non-combo affecting judgements from triggering sudden death
2019-06-21 14:29:16 +09:00
Dan Balasescu
c79c4641f3
Merge branch 'master' into use-modelbackeddrawable
2019-06-21 14:26:07 +09:00
Dean Herbert
a6e5c6a62a
Add cancel/clear buttons in place of instructional text
2019-06-21 13:50:05 +09:00
Dan Balasescu
73d307114f
Merge branch 'master' into notification-overlay-always-present
2019-06-21 13:12:04 +09:00
Dan Balasescu
cbc1eff8f1
Merge branch 'master' into chat-async-improvements
2019-06-21 12:59:58 +09:00
Dan Balasescu
8ab7a8641b
Add comment for why it's not a fill flow
2019-06-21 12:42:35 +09:00
Dan Balasescu
0571bbd555
Merge branch 'master' into carousel-gradient
2019-06-21 12:40:24 +09:00
smoogipoo
7054f54a64
Use OsuScrollContainer for osu menus
2019-06-21 12:33:49 +09:00
Dan Balasescu
61d8cb628a
Merge branch 'master' into music-controller-always-present
2019-06-21 11:57:36 +09:00
Dan Balasescu
6deee968ac
Merge branch 'master' into modselect-async-improvements
2019-06-21 11:42:25 +09:00
Dan Balasescu
4d02e17539
Merge branch 'master' into remove-debug-utils
2019-06-21 11:10:59 +09:00
KingLuigi4932
13578e5c21
Add the null conditional operator back
2019-06-20 19:43:31 +03:00
KingLuigi4932
d754819453
Small changes
2019-06-20 19:09:40 +03:00
Dean Herbert
fa263b91a7
Attempt to fix tests
2019-06-21 00:12:39 +09:00
Dean Herbert
f2200594c9
Remove necessity for MusicController to be always visible
2019-06-20 23:40:25 +09:00
Dean Herbert
52ca5f9c00
Fix mod icons in ModSelect being loaded in a blocking fashion
2019-06-20 23:06:07 +09:00
Dean Herbert
74fabf8db4
Improve ChatOverlay load behaviour
2019-06-20 23:02:02 +09:00
Dean Herbert
4a25a84975
Fix DrawableChannel async flow
2019-06-20 23:01:39 +09:00
Dean Herbert
4ef165fdac
Fix ChatLine not being correctly loaded asynchronously
2019-06-20 23:01:02 +09:00
Dean Herbert
21a1fd738b
Remove the necessity for NotificationOverlay to always be present
...
Now it will only become present when there is a pending notification.
2019-06-20 19:06:21 +09:00
Dean Herbert
9a663715cd
Make get methods of ProgressNotification return correct values immediately
...
Previously they were only updated after the resultant schedule ran. This would not bode well when the overlay containing them is not present.
2019-06-20 19:05:33 +09:00
Dean Herbert
6bc2cf85d1
Move NotificationSection strings to constructor
2019-06-20 17:41:12 +09:00
David Zhao
65c84428cc
Fix position of gradient in beatmap carousel
2019-06-20 15:05:15 +09:00
Joehu
ca919f02e6
Remove bad words on code comments
2019-06-19 21:33:58 -07:00
Dean Herbert
97d65783db
Remove osu!-side DebugUtils
2019-06-20 12:48:45 +09:00
Dean Herbert
133c1fc0f1
Merge branch 'master' into remove-osu-checkbox-bindable
2019-06-20 11:33:39 +09:00
Dean Herbert
7482ecb8e7
Fix beatmap set cover goes out of its container ( #5073 )
...
Fix beatmap set cover goes out of its container
2019-06-20 11:21:22 +09:00
Andrei Zavatski
0da8a483c5
Fix scores header is visible even if no scores are loaded
2019-06-19 23:14:53 +03:00
HoLLy
99f1a94797
Fix notification progress bar
2019-06-19 20:50:50 +02:00
HoLLy
c1c19243cd
Change FirstOrDefault back to First
2019-06-19 20:40:30 +02:00
HoLLy
8d62ce8967
Remove now unneeded check against file extension
2019-06-19 20:38:43 +02:00
HoLLy
0cb66d522a
Check if path can be imported before trying
2019-06-19 20:36:00 +02:00
iiSaLMaN
ee2268caba
Enable masking for the beatmap set cover
2019-06-19 21:20:00 +03:00
HoLLy
ef2e93d5c7
Improve handling of null models when importing
2019-06-19 19:29:47 +02:00
KingLuigi4932
5f5441c692
Add ShowPlaceholderOnNull in updateable flag + do not show placeholders in some overlays
2019-06-19 20:17:02 +03:00
iiSaLMaN
865af00ab6
Merge branch 'master' into header-improvements
2019-06-19 20:00:28 +03:00
Dean Herbert
08cf8dd299
Adjust for readability
2019-06-20 01:39:54 +09:00
Dean Herbert
2773cfba42
Merge branch 'master' into andy840119/_20190614_hidden_nod_label_when_empty
2019-06-20 01:35:24 +09:00
HoLLy
15c75b4442
Add basic score import from stable
2019-06-19 18:33:51 +02:00
Dean Herbert
6f3cb80076
Merge branch 'master' into fix-inactive-audio-race
2019-06-20 01:33:47 +09:00
Dean Herbert
63d0324f96
Fix inspection
2019-06-20 01:10:14 +09:00
Dean Herbert
d0a452cdf9
Show tooltips for beatmap set panels
2019-06-20 01:10:03 +09:00
Dean Herbert
816bac9874
Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip
2019-06-20 00:55:52 +09:00
KingLuigi4932
9f25d3cd72
More changes and improvements
2019-06-19 17:55:36 +03:00
iiSaLMaN
3e285e5dde
Separate beatmap info container from details (avoid overlapping)
2019-06-19 17:47:47 +03:00
iiSaLMaN
15229f3a23
Make header expandable
2019-06-19 17:45:39 +03:00
iiSaLMaN
5fb4f2fadf
Add TOP_PADDING
2019-06-19 17:38:43 +03:00
naoey
4b46601eae
Remove redundant variable, handle all request failures
2019-06-19 19:43:09 +05:30
KingLuigi4932
a6c268ef5c
Move the horizontal margin into the sprite text itself
2019-06-19 15:05:53 +03:00
KingLuigi4932
475b40cc02
Remove empty line
2019-06-19 14:47:29 +03:00
KingLuigi4932
4600336581
Use TextFlowContainer + small changes
2019-06-19 14:43:18 +03:00
Andrei Zavatski
17749e84f9
Merge remote-tracking branch 'refs/remotes/ppy/master' into user-online-fix
2019-06-19 12:17:31 +03:00
Andrei Zavatski
1c44fa84fb
Fix colour issues
2019-06-19 12:15:32 +03:00
Andrei Zavatski
c8604b2c17
Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs
2019-06-19 12:08:34 +03:00
Dean Herbert
dd926f55bd
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-06-19 14:55:34 +09:00
Dean Herbert
3043f42eb5
Merge branch 'master' into fix-multiplayer-audio
2019-06-19 14:36:05 +09:00
Dean Herbert
b51aad7433
Merge branch 'master' into fix-multiplayer-audio
2019-06-19 13:36:25 +09:00
Dean Herbert
f26fe53feb
Fix startup crash if main menu does not load fast enough
2019-06-19 13:16:19 +09:00
Dean Herbert
6426983de0
Move logic out of update (and simplify, hopefully)
2019-06-19 13:15:58 +09:00
Dean Herbert
fbd9ebf02d
Merge pull request #5054 from peppy/settings-item-unbind-previous-bindable
...
Unbind from previous bindable when rebinding a SettingsItem
2019-06-19 13:09:19 +09:00
Dean Herbert
26c32ceeb1
Merge branch 'master' into generic-download-model-manager
2019-06-19 12:50:54 +09:00
Dan Balasescu
aef29e2767
Merge branch 'master' into remote-unused-property
2019-06-19 11:18:12 +09:00
KingLuigi4932
6e28294182
Fix another test
2019-06-19 04:27:31 +03:00
KingLuigi4932
97dd34e26c
Seperate updateable from drawable
2019-06-19 03:50:16 +03:00
KingLuigi4932
3876442143
More simplifies + fix test
2019-06-19 03:37:08 +03:00
KingLuigi4932
a0609f28d7
Revert some changes + simplify BeatmapNotAvailable
2019-06-19 01:43:28 +03:00
iiSaLMaN
5278c5f365
Merge branch 'master' into not-available-to-download
2019-06-19 01:14:32 +03:00
Dean Herbert
bc8ce5d188
Merge branch 'master' into use-modelbackeddrawable
2019-06-19 06:27:36 +09:00
Andrei Zavatski
2fb1052a1e
Add missing space
2019-06-18 21:04:36 +03:00
KingLuigi4932
a5adc89839
Update framework
2019-06-18 20:37:56 +03:00
Dean Herbert
1bcff8a3e2
Make generic covariant
2019-06-19 01:57:38 +09:00
Dean Herbert
341dc74834
Simplify download method
2019-06-19 01:41:19 +09:00
Dean Herbert
f2e0ced052
Move private event handling logic to bottom of class
2019-06-19 01:32:37 +09:00
Dean Herbert
d65c20bbdc
Merge branch 'master' into generic-download-model-manager
2019-06-19 01:29:06 +09:00
Andrei Zavatski
03d560ed41
Initial implementation
2019-06-18 19:13:21 +03:00
Andrei Zavatski
3c3757f12e
Make ProfileTabControl based on OverlayTabControl
2019-06-18 16:23:57 +03:00
Andrei Zavatski
a7306248d1
Implement OverlayTabControl class
...
An abstraction for OverlayHeaderTabControl
2019-06-18 16:20:35 +03:00
Shane Woolcock
17d103181c
Merge branch 'master' into android
2019-06-18 20:05:14 +09:30
Dean Herbert
4911bf1157
Revert unnecessary changes to APIBeatmap
2019-06-18 18:03:16 +09:00
Dean Herbert
6823ba1ab0
Unbind from previous bindable when rebinding a SettingsItem
2019-06-18 14:24:44 +09:00
Dean Herbert
5bb8649f3b
Remove unused property from chat message
2019-06-18 14:22:59 +09:00
Dean Herbert
07ea0f9755
Make OsuButton non-abstract again
2019-06-18 14:16:54 +09:00
Dean Herbert
40eb6f4986
Undo ordering change to OsuFont
2019-06-18 14:15:22 +09:00
Dean Herbert
584113997a
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-06-18 14:15:06 +09:00
Andrei Zavatski
413c2158e2
Simplify bindables usage
2019-06-18 01:11:05 +03:00
Andrei Zavatski
c95e3da3ec
Implement a BindableRulesetSelector
2019-06-18 00:23:00 +03:00
Andrei Zavatski
cecbcd21b2
Merge remote-tracking branch 'upstream/master' into toolbar-rulesets-refactor
2019-06-17 23:12:55 +03:00
KingLuigi4932
d6a39b8a2a
Fix CI issues + slight change
2019-06-17 22:33:27 +03:00
KingLuigi4932
fec0db8fe1
Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar
2019-06-17 21:55:07 +03:00
KingLuigi4932
d665f1fe4b
Seperate drawable and updateable flag from Country + Use UpdateableFlag
2019-06-17 20:57:57 +03:00
KingLuigi4932
794ba17a2f
Seperate UpdateableRank from DrawableRank and use it
2019-06-17 20:04:09 +03:00
Dean Herbert
c32d17d16a
Fix audio not dimming after race condition
...
Also adjusts transition slightly for smoother effect.
2019-06-18 01:32:52 +09:00
Ganendra Afrasya
efdeb84248
Merge branch 'master' into difficulty-icon-tooltip
2019-06-17 22:48:20 +07:00
Ganendra Afrasya
aa53f14329
Make sure tooltip appear in specific cases
2019-06-17 22:44:28 +07:00
Lucas A
04dc1c1744
Fix typo in comment
...
Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>
2019-06-17 16:44:53 +02:00
Dean Herbert
3a04684efb
Add region
2019-06-17 23:25:16 +09:00
Dean Herbert
ad4c9babe7
Adjust naming and transitions
2019-06-17 23:24:52 +09:00
iiSaLMaN
0c299d651f
Merge branch 'master' into use-modelbackeddrawable
2019-06-17 17:06:10 +03:00
Dean Herbert
26d5c2d85a
Remove local implementation of bindable in OsuCheckbox
2019-06-17 19:37:24 +09:00
Lucas A
d7d6feb001
Fade volume in / out when game window becomes active / inactive
2019-06-17 12:31:23 +02:00
Dean Herbert
b259710a62
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-06-17 19:30:17 +09:00
Dean Herbert
84a0b948e1
Fix typo in VersionNavigation class name
2019-06-17 16:32:38 +09:00
iiSaLMaN
3087099b32
Use ModelBackedDrawable in DrawableRank
2019-06-17 07:34:35 +03:00
iiSaLMaN
4cb9563af2
Use ModelBackedDrawable in UpdateableAvatar
2019-06-17 07:16:38 +03:00
iiSaLMaN
98f8b1d59a
Use ModelBackedDrawable in DrawableFlag
2019-06-17 06:44:24 +03:00
smoogipoo
c1d2fff651
Use RestartPoint
2019-06-17 12:44:19 +09:00
smoogipoo
bc35a30a25
Fix audio being dimmed during multiplayer
2019-06-17 12:27:53 +09:00
andy840119
4e85481fd4
Merge branch 'master' of https://github.com/ppy/osu into andy840119/_20190614_hidden_nod_label_when_empty
2019-06-16 13:27:15 +09:00
andy840119
84b4e877f8
using FadeTo instead of show/hide
...
headerLabel.FadeTo() is still remain because effect can be visible when expand== true
2019-06-16 13:27:01 +09:00
Joehu
1a9efb3d7a
Fix editor play button
2019-06-15 11:05:58 -07:00
Ganendra Afrasya
1f2f26a503
Add color to star rating and star sprite icon
2019-06-16 00:40:44 +07:00
Ganendra Afrasya
515534cb34
Adding custom tooltip to DifficultyIcon
2019-06-16 00:02:26 +07:00
smoogipoo
d693b2a329
Fix multiplayer score submission failing silently
2019-06-16 00:31:14 +09:00
smoogipoo
2e7922c3f9
Fix 0-length sliders not getting correct lengths
2019-06-15 23:53:28 +09:00
Dean Herbert
d7bea3aa18
Update framework
2019-06-15 19:38:05 +09:00
Dean Herbert
38616a2bb5
Merge branch 'master' into fix-beatmapoverlay-graphs
2019-06-15 18:37:01 +09:00
naoey
4a16ac53ba
Remove extra newline
2019-06-15 12:28:23 +05:30
Dean Herbert
7d49028a60
Merge branch 'master' into change-download-extension
2019-06-15 15:37:19 +09:00
Dean Herbert
4882283084
Merge branch 'master' into generic-download-model-manager
2019-06-15 15:35:08 +09:00
Dean Herbert
2b48f5d3e0
Tidy up updateMetrics flow
2019-06-15 14:45:51 +09:00
andy840119
1a73178260
using FadeTo() instead of FadeIn()/FadeOut()
2019-06-15 13:28:03 +08:00
Dean Herbert
587edcb716
Merge branch 'master' into fix-beatmapoverlay-graphs
2019-06-15 13:42:13 +09:00
Dean Herbert
0ca33e16dd
Update framework
2019-06-14 23:25:29 +09:00
Dean Herbert
1b75fbed9a
Merge remote-tracking branch 'upstream/master' into update-scrollcontainer
2019-06-14 23:25:17 +09:00
Dean Herbert
cf713fbacc
Merge branch 'master' into fix-stacking-shaking
2019-06-14 22:16:35 +09:00
Dean Herbert
bc574520bf
Update ScrollContainer usages in line with framework changes
2019-06-14 15:55:32 +09:00
Dean Herbert
15b9b53d35
Fix IconButtons not being scaled correctly
2019-06-14 13:40:32 +09:00
