Craftplacer
78931c8e23
Implement notification when user has track or master volume muted
...
This took around under a hour to implement, it has the same behavior and content from osu!stable.
A notification will show up when the user has either its master or track volume set to the minimum, clicking it will set it to the default values.
2019-09-15 15:59:46 +02:00
Andrei Zavatski
9febeb1f3d
Add black background
2019-09-14 06:32:00 +03:00
Andrei Zavatski
a36c808682
Use Fit FillFode
2019-09-14 06:28:59 +03:00
Andrei Zavatski
9a94405b3a
Fix video playback is stretched on client resize
2019-09-14 06:05:09 +03:00
Dan Balasescu
b10ce0b12d
Merge branch 'master' into key-counter-fixes
2019-09-13 19:43:33 +09:00
Andrei Zavatski
437e121056
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video
2019-09-13 13:39:58 +03:00
smoogipoo
cf2f841b4d
Fix player not correctly exiting after an unpause
2019-09-13 15:42:58 +09:00
Dean Herbert
831d04f339
Don't use gameplay clock in KeyCounter
2019-09-12 15:48:07 +09:00
Dean Herbert
0cdf125c1e
Handle key counter rewinding in a better way
...
Use ElapsedFrameTime rather than storing state data
2019-09-12 15:42:14 +09:00
Dean Herbert
cb0cf6e2c5
Remove reset functions
2019-09-12 14:27:52 +09:00
Dean Herbert
158737e001
Remove FadeTime customisation
...
Also adjusts fade transitions to feel better, especially in fast forward scenarios.
2019-09-12 14:27:29 +09:00
Dean Herbert
f9c969788a
Fix keys not reaching full brightness as soon as they should
2019-09-12 13:56:23 +09:00
Dean Herbert
88d0756107
Allow global actions to propagate through pause screen
2019-09-06 17:17:30 +09:00
Dean Herbert
f925e781a9
Refactor HitWindows for legibility
2019-09-06 15:24:14 +09:00
Dean Herbert
986ac08397
Fix pause menu keyboard navigation being affected by initial cu… ( #6002 )
...
Fix pause menu keyboard navigation being affected by initial cursor hover
2019-09-05 17:27:48 +09:00
Dean Herbert
a1d7291ffa
Fix pause menu keyboard navigation being affected by initial cursor hover
2019-09-05 16:31:10 +09:00
smoogipoo
a87a1e6031
Don't redraw certain buffered containers on scale change
2019-09-04 19:38:12 +09:00
Dean Herbert
1802d2efaf
Merge remote-tracking branch 'upstream/master' into fix-gameplay-menu-button-hover-ani
2019-09-04 10:35:14 +09:00
Dean Herbert
4cad55cee6
Move hit windows lookup to DrawableRuleset
2019-09-03 13:05:03 +09:00
smoogipoo
0c73c5acf3
Expose full hitobject rather than hit windows
2019-09-02 17:14:40 +09:00
smoogipoo
f2bdf94a1d
Add HitWindows to JudgementResult to indicate timing errors
2019-09-02 16:28:14 +09:00
smoogipoo
0a89603e79
Fix hit error potentially not displaying with null hitwindows
2019-09-02 16:07:16 +09:00
Dean Herbert
7ca51d3866
Fix resume overlay being drawn below cursor
...
Closes #5905 .
2019-09-02 11:20:55 +09:00
Andrei Zavatski
94512fea8e
Apply naming suggestions
2019-08-31 16:20:33 +03:00
Andrei Zavatski
d2f7a653a8
Fix nullref
2019-08-31 16:10:07 +03:00
Andrei Zavatski
28b19e8d54
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video
2019-08-31 15:49:21 +03:00
Dean Herbert
1ddf292ad6
Fix vertical alignment of hit error display ticks
...
Wasn't correctly centered before.
2019-08-31 12:20:50 +09:00
Andrei Zavatski
d4291556ee
Remove unused using
2019-08-31 02:57:14 +03:00
Andrei Zavatski
fd958ec1ab
Remove unused property accessor
2019-08-31 02:56:41 +03:00
Andrei Zavatski
fa3591e5ec
Add setting to turn on/off the video
2019-08-31 00:42:20 +03:00
Andrei Zavatski
5dd688a51b
Fix video doesn't use gameplay clock
2019-08-31 00:09:23 +03:00
Andrei Zavatski
d55be4d59c
Implement DimmableVideo component
2019-08-30 23:48:38 +03:00
Andrei Zavatski
58a0b4e19b
Add basic layout for player
2019-08-30 23:19:55 +03:00
Dean Herbert
8f5dc06d55
Merge remote-tracking branch 'upstream/master' into accuracy-bar
2019-08-30 20:18:25 +09:00
Dean Herbert
f1db6c7039
Fix likely nullref
2019-08-30 20:18:21 +09:00
smoogipoo
fc813347ac
Make JudgementLine private
2019-08-30 19:54:36 +09:00
smoogipoo
dfccc60361
Reorder HitErrorDisplay
2019-08-30 19:53:38 +09:00
smoogipoo
fab12fa9cd
Centre align the icons
...
Seems to look better this way.
2019-08-30 19:53:38 +09:00
Dean Herbert
665fc95d49
Handle no hitobjects / no hitwindows (osu!catch)
2019-08-30 19:37:20 +09:00
Dean Herbert
80671cefd7
Final visual polish
2019-08-30 19:14:07 +09:00
Dean Herbert
c3abf0ccb7
Improve visuals
2019-08-30 18:50:38 +09:00
Dean Herbert
8fc177b743
Fix namespacing and hitwindow source
2019-08-30 18:46:42 +09:00
Dean Herbert
741bd0a5cf
Fix incorrect colour sizes and simplify alignment specification
2019-08-30 18:35:17 +09:00
Dean Herbert
54696eef39
Reverse display, add animation and reduce width
2019-08-30 17:06:23 +09:00
Dean Herbert
a73d672c2f
Tidy up judgement line logic (and fix it displaying at the wrong place)
2019-08-30 16:40:39 +09:00
Dean Herbert
6640161bc1
Simplify event propagation
2019-08-30 15:51:36 +09:00
Dean Herbert
bdbfa7bd2f
Fix class naming
2019-08-30 15:32:47 +09:00
Dean Herbert
835ee0aa2f
Code quality fixes
2019-08-30 15:29:13 +09:00
Joehu
73fd3cf03c
Fix gameplay menu button initial hover animation
2019-08-28 19:00:01 -07:00
Dean Herbert
7aeeb65ae7
Tidy up Player's container loading logic
...
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
2019-08-27 18:27:21 +09:00
Dean Herbert
5e362d10b1
Add ruleset-specific legacy skin providers
...
This moves implementation of osu! skinnables to OsuLegacySkin.
2019-08-26 12:21:49 +09:00
Andrei Zavatski
0ccfaeb8d9
Simplify moving average
2019-08-21 10:13:59 +03:00
Andrei Zavatski
a5acc913ea
CI fixes
2019-08-21 09:58:47 +03:00
Andrei Zavatski
a994ad9c84
Use moving average to calculate arrow position
2019-08-21 09:40:15 +03:00
Andrei Zavatski
71cbc3525d
Add/remove displays only if necessary
2019-08-21 09:16:09 +03:00
Andrei Zavatski
f72edb8bf8
Add missing blank line
2019-08-20 09:03:31 +03:00
Andrei Zavatski
596ee150c6
Add xmldoc for not obvious const
2019-08-20 08:51:41 +03:00
Andrei Zavatski
9f64e09625
Move HitErrorDisplayOverlay back to the HUD
2019-08-20 08:45:51 +03:00
Andrei Zavatski
d337f9b482
DefaultHitErrorDisplay -> BarHitErrorDisplay
2019-08-20 08:03:17 +03:00
Andrei Zavatski
c4251d512e
Simplify bar building
2019-08-20 08:00:09 +03:00
Andrei Zavatski
415f180261
Delete extra semicolon
2019-08-19 22:53:28 +03:00
Andrei Zavatski
50c47568e4
Don't present Meh hit windows if it has no value
2019-08-19 22:45:27 +03:00
Andrei Zavatski
f1c3a60660
Add ability to select side
2019-08-19 22:04:27 +03:00
Andrei Zavatski
1bff103d32
CI fixes
2019-08-19 21:25:14 +03:00
Andrei Zavatski
6d3aa0520b
Make HitErrorDisplay an abstract class
2019-08-19 20:44:06 +03:00
Andrei Zavatski
70084b5553
Move HitErrorDisplay outside of the HUD
2019-08-19 20:28:03 +03:00
Andrei Zavatski
4c817b18b7
Use direct cast
2019-08-18 17:03:11 +03:00
Andrei Zavatski
dd6351b8ca
Apply suggested changes
2019-08-18 16:51:16 +03:00
Andrei Zavatski
6c60db550f
Fix crash if ruleset has no Meh hit windows
2019-08-18 16:24:13 +03:00
Andrei Zavatski
55cd1cecdf
Add missing blank line
2019-08-18 15:53:42 +03:00
Andrei Zavatski
8740ebd13f
Simplify layout
2019-08-18 15:45:18 +03:00
Andrei Zavatski
a59a14c9e6
Add setting to enable/disable hit error visibility
2019-08-18 15:01:04 +03:00
Andrei Zavatski
ee5568e596
Use Queue instead of List for stored Judgements
2019-08-18 14:43:34 +03:00
Andrei Zavatski
50133ba863
naming adjustments
2019-08-18 02:57:12 +03:00
Andrei Zavatski
906984ad95
Fix the math
2019-08-18 02:49:07 +03:00
Andrei Zavatski
f7024b513e
Visual improvements
2019-08-18 01:43:43 +03:00
Andrei Zavatski
94dbd6386f
Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
2019-08-18 01:14:27 +03:00
Dean Herbert
d0f2d22995
Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim
2019-08-12 05:46:15 +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
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
90b1fe81f3
Update cached usage in line with framework changes
2019-08-09 19:12:29 +09:00
iiSaLMaN
0fcc6c1676
Add DimLevel property
2019-08-08 22:13:48 +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
Dean Herbert
2172c5a52b
Merge branch 'master' into use-bindable-break-time-in-player
2019-08-08 14:24:52 +09: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
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
dda078277a
Minor variable name changes
2019-08-06 23:05:12 +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
iiSaLMaN
e6e315e07b
Expose current break index
2019-07-30 13:29:41 +03: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
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
Salman Ahmed
934439e138
Merge branch 'master' into add-bindable-for-break-times
2019-07-26 12:57:52 +03: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
iiSaLMaN
5a94a22314
Add a quick check if we're not in a break with current index
2019-07-26 09:17:39 +03: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
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
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
Dan Balasescu
986031e127
Merge branch 'master' into storyboard-clock-di
2019-07-12 23:14:12 +09:30
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
ecbd0f7eff
Merge branch 'master' into fix-skip-button-clickability
2019-07-11 23:10:28 +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
David Zhao
7929104b8a
move default into StoryboardContainer, fix load bug, remove comment
2019-07-10 12:24:05 +09:00
David Zhao
41afe89c0b
delete no longer needed bindable
2019-07-10 00:46:34 +09:00
Dean Herbert
27e79d56ec
Merge branch 'master' into collapse-graph-option
2019-07-09 23:40:43 +09:00
David Zhao
5bb21ecae0
remove storyboard region
2019-07-09 16:50:37 +09:00
David Zhao
89cb8a0cac
Move storyboard initialization to new StoryboardContainer
2019-07-09 16:23:59 +09: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
David Zhao
d489a77fe1
remove new container and comment
2019-07-08 17:57:29 +09:00
David Zhao
fbd300e664
Move ruleset into ReplayPlayerLoader as well
2019-07-08 17:37:20 +09:00
David Zhao
e78e326f34
remove unused using
2019-07-08 17:02:42 +09: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
David Zhao
2747d7692b
Create ReplayPlayerLoader for local mod caching
2019-07-08 14:55:05 +09:00
Dean Herbert
8f2ec73626
Move logic inside of HUDOverlay
...
Add vertical offset adjust.
2019-07-07 05:30:53 +09:00
Salman Ahmed
dfabed3d85
Merge branch 'master' into applicable-to-hud
2019-07-06 16:30:02 +03:00
Dan Balasescu
3a9f16ccf2
Merge branch 'master' into idle-still-starts
2019-07-06 00:08:59 +09:30
Unknown
d05512a12a
invert usage corresponding to previous description change
2019-07-05 09:16:50 +02:00
Unknown
ee44caf964
better setting description
2019-07-05 08:52:44 +02:00
Unknown
2d5fd7f1c4
remove unnecessarily setting value of bindable that was already bound to
2019-07-05 08:49:56 +02:00
Unknown
b425df6c75
various fixes
...
- make AllowSeeking a Bindable which fixes incorrect initial position and removes unnecessary variables
- make SongProgressInfo fixed height
2019-07-05 08:48:40 +02: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
Unknown
ed22c23f37
mask SongProgress
2019-07-05 08:30:32 +02:00
Unknown
e69160a0ce
fix graph not completely hiding
2019-07-05 08:05:18 +02:00
iiSaLMaN
d624157c45
Remove unnecessary fading
2019-07-05 05:17:36 +03:00
Unknown
608223cbb4
Add setting to collapse the song progress graph
2019-07-04 11:59:38 +02: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
23acddcb56
Rename download buttons to avoid ambiguity
2019-07-03 12:02:35 +09:00
Salman Ahmed
8b4ef52c13
Revert unnecessary changes
2019-07-03 07:27:24 +03:00
naoey
eaa19d5a49
Remove unused/unnecessary fields
2019-07-02 16:13:47 +05:30
naoey
ee516d2515
Make direct panel download and replay buttons share UI
2019-07-02 15:55:30 +05:30
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
Dean Herbert
60ea3d4e1a
Fix skinning support for combobreak
2019-06-30 21:58:30 +09:00
naoey
bfcbb47b77
Clean up some more leftover code
2019-06-30 10:56:20 +05:30
welsar55
d6561531a3
Merge branch 'master' into combobreak
2019-06-29 11:55:10 -05:00
Welsar55
a22c166575
Make ComboEffects its own class
2019-06-29 11:28:40 -05:00
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
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
d37cefbad8
Implement IApplicableToHUD
2019-06-29 04:23:59 +03: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
Welsar55
826699a7e7
Remove unneeded bindable
2019-06-26 12:16:44 -05:00
Welsar55
7dd1479050
Add combobreak sound
2019-06-26 00:20:33 -05:00
Dean Herbert
40cf573368
Fix pause not correctly showing pause screen
2019-06-25 23:15:58 +09:00
Dean Herbert
f9dad0f640
Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
2019-06-25 20:23:49 +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
f91467eddc
Fix licence header
2019-06-24 18:34:23 +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
Dean Herbert
26d5c2d85a
Remove local implementation of bindable in OsuCheckbox
2019-06-17 19:37:24 +09:00
Dean Herbert
021d0273f9
Split out user activity from user status ( #4619 )
...
Split out user activity from user status
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-12 20:14:03 +09:00
Dean Herbert
20b43c20c8
Rename variables to remove redundant "screen" terminology
2019-06-12 16:33:15 +09:00
Dean Herbert
a9c229b1ec
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-12 16:00:35 +09:00
Lucas A
15893bbb75
Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.
2019-06-11 19:41:48 +02:00
Dean Herbert
606be3d7ce
Merge branch 'master' into backgrounded-beatmap-status-lookups
2019-06-12 00:22:47 +09:00
Dean Herbert
00ee45fe46
Merge remote-tracking branch 'origin/update-visibility-container' into update-framework
2019-06-11 19:36:13 +09:00
Dean Herbert
609a82bc94
Update VisibilityContainer usage in line with framework
2019-06-11 15:13:58 +09:00
Lucas A
141775d98c
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-10 21:41:00 +02:00
smoogipoo
f090e292c9
Move ArchiveModelManager import process to async flow
2019-06-10 13:42:22 +09:00
Dean Herbert
5c2ea0b1a7
Move dispose to end of file
2019-06-10 01:14:46 +09:00
Dean Herbert
d964f6ba9e
Tween track frequency on pause
2019-06-10 00:56:35 +09:00
Lucas A
a2bc5b538e
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-05 16:59:38 +02:00
Dean Herbert
9c214c3f0e
Add animation on failing
2019-06-04 16:13:16 +09:00
Dean Herbert
a2fbcb2bd3
Fix rebase regressions
2019-05-31 15:58:46 +09:00
Dean Herbert
e03a664970
Fix lead-in logic to match stable
...
Also adds storyboard event priority support.
2019-05-31 15:51:19 +09:00
Dean Herbert
651706b10e
Account for user/system offsets when deciding on an initial seek time
...
Closes #3043
Remove "AllowLeadIn" flag
2019-05-31 15:50:46 +09:00
Dean Herbert
4ca34bd5e8
Update osu! in line with audio subsystem refactor
2019-05-28 17:06:01 +09:00
Lucas A
a819dd764f
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-25 11:02:19 +02:00
Dean Herbert
359e5b71a5
Fix race condition causing player to never restart
2019-05-16 17:13:03 +09:00
Lucas A
55663b3576
Nest all UserActivities into UserActivity
2019-05-12 17:38:02 +02:00
Lucas A
5ac6bd8204
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-12 11:53:30 +02:00
Dean Herbert
038e49701e
Move conditional to within BreakPeriod
2019-05-12 16:25:25 +09:00
Dean Herbert
1391aa342c
Merge branch 'master' into break-pause
2019-05-12 16:15:24 +09:00
smoogipoo
bde2d552b6
Merge remote-tracking branch 'origin/master' into fix-more-pause-cases
...
# Conflicts:
# osu.Game.Tests/Visual/Gameplay/TestCasePause.cs
2019-05-10 22:16:59 +09:00
smoogipoo
01eb1a34a9
Remove unused variable
2019-05-10 22:15:33 +09:00
smoogipoo
d2479acbf2
Fix incorrect value being clamped
2019-05-10 18:04:58 +09:00
Dean Herbert
fdf67aaa11
Clamp values
2019-05-10 17:18:39 +09:00
smoogipoo
6a957ad27f
Fix pause triggered when already paused
2019-05-10 15:51:12 +09:00
smoogipoo
7c105fd99f
Fix testcase players pausing on window unfocus
2019-05-10 15:39:25 +09:00
Dean Herbert
9248e6290c
Use FrameStabilityClock to denote current position on song progress
2019-05-09 18:09:26 +09:00
Dean Herbert
5942072128
Add a tween when clicking to seek
2019-05-09 18:07:38 +09:00
Dean Herbert
9457a6128e
Fix game pausing when made inactive while watching a replay
2019-05-09 10:57:55 +09:00
Dean Herbert
0693290ad4
Merge remote-tracking branch 'upstream/master' into refactor-select-footer
2019-05-08 18:43:21 +09:00
Dean Herbert
bace829629
Add ability to avoid expand animation in ModDisplay
2019-05-08 18:42:26 +09:00
Lucas A
a5f758b977
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-07 18:27:14 +02:00
Dan Balasescu
288b3deb94
Merge branch 'master' into fix-rank-display
2019-05-07 15:00:51 +09:00
Dean Herbert
8bc313fb33
Merge branch 'master' into fix-new-inspections
2019-05-07 14:14:40 +09:00
Dean Herbert
c878d814f6
Merge branch 'master' into pause-via-inactive
2019-05-07 13:35:23 +09:00
Dean Herbert
f7a570d67a
Fix double confirmation
2019-05-07 13:34:06 +09:00
smoogipoo
d7c09e7dbd
Merge remote-tracking branch 'origin/master' into fix-new-inspections
...
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
Dan Balasescu
8b9cfadd64
Merge branch 'master' into fix-retry-sound
2019-05-07 12:37:22 +09:00
Lucas A
d5d31282e5
Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes
2019-05-05 20:55:42 +02:00
Dean Herbert
7fdc79dd68
Improve skip boundary logic to be closer to expectations
...
Supersedes #4693 .
Closes #4676 .
2019-05-05 20:20:41 +09:00
Dean Herbert
3e3f12f277
Use more local bindables
2019-05-04 17:53:17 +09:00
Dean Herbert
b9a39fb788
Fix instant pausing when game becomes inactive
...
Resolves #4685 .
2019-05-04 14:54:29 +09:00
Lucas A
a4a2ce5ec0
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-02 21:36:28 +02:00
Lucas A
5d4aa5a12e
Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus
2019-05-02 20:51:19 +02:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2
2019-04-30 18:55:35 +03:00
Lucas A
7e42068a14
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-28 19:48:35 +02:00
Dean Herbert
5a9277ec0e
Merge branch 'master' into fix-retry-sound
2019-04-28 23:38:14 +09:00
Dean Herbert
db75516e79
Merge branch 'master' into fix-lead-in-issues
2019-04-27 21:01:21 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability
2019-04-27 18:41:19 +09:00
iiSaLMaN
b08fb5136e
Merge branch 'master' into sh-xh-grading-2
2019-04-26 10:38:10 +03:00
Dean Herbert
a680a38e81
Merge pull request #4675 from nyquillerium/playerloader-tracking
...
Prevent PlayerLoader from tracking the logo after it has been exited.
2019-04-26 13:21:13 +09:00
KingLuigi4932
4e0f21102b
Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2
2019-04-25 14:04:12 +03:00
KingLuigi4932
c6b3197dd0
Add AdjustRank and use it in Hidden Mod
2019-04-25 13:56:57 +03:00
smoogipoo
0bd35ab7bb
Turn on warnings, resolve issues
2019-04-25 17:36:17 +09:00
Dean Herbert
6fdcd98caa
Don't play screen "back" sample when retrying
2019-04-25 14:15:07 +09:00
David Zhao
8222923ab8
Only track logo if we're still the current screen
2019-04-24 16:20:51 +09:00
Dean Herbert
bb69330e9f
Call ProcessFrame on the userOffsetClock after a seek
...
Without doing this, GameplayClock can be left in an incorrect state after a seek (due to the userOffsetClock being its own FramedClock).
2019-04-24 15:28:14 +09:00
Dean Herbert
efaedafc08
Fix (legacy) AudioLeadIn being used incorrectly.
...
This lead-in is intended to specify a value before zero, not a value before the start time.
Also removes an unnecessary ProcessFrame call (it happens within Seek itself).
2019-04-24 15:28:14 +09:00
Dan Balasescu
8fc0bf24c7
Merge branch 'master' into fix-hold-for-menu-icon
2019-04-22 18:57:43 +09:00
Dean Herbert
48e82d4b1c
Fix hold for menu button's icon being incorrect
2019-04-22 18:47:28 +09:00
Dean Herbert
6856571f17
Fix incorrect seek target
2019-04-22 18:45:58 +09:00
Dean Herbert
55c5ef898d
Remove delay on entering player
2019-04-22 18:29:58 +09:00
Dean Herbert
908eee9942
Fix pause tests
2019-04-22 18:29:51 +09:00
Dean Herbert
6f2bc943eb
Fix rank display on break info display
2019-04-21 12:04:15 +08:00
Lucas A
fe8c705f1b
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-20 09:42:32 +02:00
Dean Herbert
2d7b3094ba
Merge branch 'master' into player-mod-reinstantiation
2019-04-17 16:42:57 +08:00
smoogipoo
12b6bc48bd
Use .With() wherever possible
2019-04-17 17:24:09 +09:00
smoogipoo
09568be270
Merge remote-tracking branch 'origin/master' into facade-container
...
# Conflicts:
# osu.Game/Screens/Play/PlayerLoader.cs
2019-04-17 17:17:33 +09:00
smoogipoo
5a3d6a0258
Fix post-merge errors
2019-04-17 16:11:59 +09:00
Dean Herbert
bb539af1a0
Merge branch 'master' into player-mod-reinstantiation
2019-04-16 22:35:21 +08:00
Lucas A
5887008fb3
Merge branch 'master' into user-status-wiring
2019-04-15 11:43:53 +02:00
DrabWeb
c766631ad6
Check for breaks using GameplayClock time.
2019-04-13 11:39:22 -03:00
Lucas A
361c0ec9f2
Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in
2019-04-13 13:18:44 +02:00
Lucas A
da5d6cb1d4
Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap
2019-04-12 22:54:35 +02:00
smoogipoo
0222424aef
Make mods IReadOnlyList<Mod> gamewide
...
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
85d3ff4846
Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods
...
# Conflicts:
# osu.Game/Screens/Play/GameplayClockContainer.cs
2019-04-10 12:06:51 +09:00
smoogipoo
4310f07a5c
Rename SelectedMods -> Mods
2019-04-10 12:03:57 +09:00
smoogipoo
4c571acd67
Reinstantiate mods for every player
2019-04-09 13:33:16 +09:00
smoogipoo
c584967eb1
Remove mods from workingbeatmap
2019-04-09 12:59:32 +09:00
smoogipoo
772bef91fa
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
...
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
David Zhao
a690302d00
Apply reviews
2019-04-08 15:24:09 +09:00
DrabWeb
e76897d6a7
Fix ResumeContainers appearing when resuming during breaks.
2019-04-07 16:32:55 -03:00
Dean Herbert
46ecaf3d6c
Merge branch 'master' into facade-container
2019-04-05 21:14:21 +09:00
David Zhao
7047f305a1
Apply reviews, add safety for multiple facades
2019-04-05 12:02:47 +09:00
David Zhao
b2857384b8
Remove unnecessary logo assignment
2019-04-04 12:08:05 +09:00
David Zhao
15b2b6af7d
Clean up remaining assignments of logo relativePositionAxes
2019-04-04 11:28:36 +09:00
David Zhao
8a40b27e8f
Remove need for logo relativePositionAxes none
2019-04-03 20:32:53 +09:00
David Zhao
2ed945605e
Fix Axes.None requirement for FacadeContainer
2019-04-03 19:57:22 +09:00
Dean Herbert
efd7bea771
Add further xmldoc
2019-04-03 17:01:11 +09:00
Dean Herbert
50f8ab3dfb
Fix gameplay offset handling on seeks
2019-04-03 16:58:20 +09:00
Dean Herbert
f1952c0816
Update font awesome usage
2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f
Adjust namespaces
2019-04-02 14:51:28 +09:00
David Zhao
020be50f03
Merge remote-tracking branch 'upstream/master' into facade-container
2019-04-02 11:28:44 +09:00
Dean Herbert
c39c37a18d
Apply more missed cases
2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38
Apply newline additions
2019-04-01 12:16:32 +09:00
David Zhao
952a12bb19
Return logo relativepositionaxes on content out
2019-03-29 16:54:34 +09:00
Dean Herbert
6949c233bf
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 15:02:12 +09:00
Dean Herbert
202a0086cc
Merge branch 'master' into better-player-flags
2019-03-29 13:45:45 +09:00
Dean Herbert
fed58fba3a
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 12:14:28 +09:00
Dan Balasescu
d410054ec8
Merge branch 'master' into key-counter-display
2019-03-29 11:22:59 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility
2019-03-29 11:15:34 +09:00
David Zhao
9d66a5e4b2
Ensure logo stops tracking before suspend animation
2019-03-28 16:29:35 +09:00
David Zhao
039e451ab1
ensure logo is where it already needs to be on resume
2019-03-28 16:14:28 +09:00
David Zhao
bfe44eb33d
Remove SizeForFlow magic number
2019-03-28 15:40:58 +09:00
David Zhao
061527a260
Add new automated tests for logofacade, reset interpolation
2019-03-27 20:04:01 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
David Zhao
2e3791be1c
Fix incorrect usage of LogoFacade
2019-03-27 18:11:12 +09:00
David Zhao
ca7a20585d
Apply reviews, delete playerloader test
2019-03-27 17:28:53 +09:00
David Zhao
384eee3395
Remove DI requirement for the Facade in PlayerLoader
2019-03-27 11:32:26 +09:00
David Zhao
3fe52be77f
Better tests, add documentation
2019-03-26 17:22:36 +09:00
Dean Herbert
a88f23e555
Convert remaining two flags to ctor parameters
2019-03-26 16:53:44 +09:00
Dean Herbert
83863d35c3
Remove AllowLeadIn flag
2019-03-26 16:35:00 +09:00
Dean Herbert
8658de5108
Rename KeyCounterCollection -> KeyCounterDisplay
...
Also fix not working
2019-03-26 13:52:48 +09:00
Dean Herbert
b4d785c76c
Don't update gameplay loop while paused
2019-03-26 13:36:17 +09:00
Dean Herbert
256a579de0
Allow player to not pause on focus loss
2019-03-26 13:17:00 +09:00
Dean Herbert
b75ea295db
Rename KeyCounterCollection -> KeyCounterDisplay
...
Also fix not working
2019-03-26 11:28:43 +09:00
David Zhao
35bf262d19
Merge remote-tracking branch 'upstream/master' into facade-container
2019-03-26 11:11:13 +09:00
David Zhao
a0f6718145
Better tests and implementation
2019-03-26 10:48:29 +09:00
Dean Herbert
245f463e3f
Don't update gameplay loop while paused
2019-03-25 20:31:55 +09:00
Dean Herbert
8ad4009c33
osu! resume overlay
2019-03-25 20:31:55 +09:00
David Zhao
d37968d88d
Add better test for facade containers
2019-03-24 15:18:38 +09:00
Dean Herbert
11b474e194
Handle released for safety
2019-03-24 12:19:09 +09:00
Dean Herbert
0d72104235
Refactor for formatting sanity
2019-03-24 12:03:06 +09:00
Dean Herbert
8ad19fc2d4
Merge branch 'master' into menu-globalaction-select
2019-03-24 11:58:52 +09:00
David Zhao
6e98a8dd7c
Initial implementation
2019-03-22 20:01:58 +09:00
David Zhao
e93311fdc9
DI facade
2019-03-22 19:01:32 +09:00
Dean Herbert
9e6cdd7bd5
Combine conditionals and clarify comment
2019-03-22 14:42:51 +09:00
Dean Herbert
5b8fd6822e
Move storyboard logic region down
2019-03-22 14:39:20 +09:00
Dean Herbert
15f9a6b9df
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-21 16:04:18 +09:00
Dean Herbert
67a65b80fc
Merge branch 'master' into visual-settings-container
2019-03-20 20:48:30 +09:00
Dean Herbert
ba89bfee0c
Define explicit method to add background
...
Also cleans up some redundant/misplaced comments.
2019-03-20 20:16:45 +09:00
Dean Herbert
8865d53992
Reword comment
2019-03-20 20:04:07 +09:00
David Zhao
2e9d823af4
Add comment regarding HandlePositionalInput
2019-03-20 19:59:54 +09:00
David Zhao
2ff7aa6c2e
Remove handle positional input
2019-03-20 19:49:37 +09:00
David Zhao
bc6e8ce7b4
Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container
2019-03-20 19:48:57 +09:00
Dean Herbert
01f795b046
Make restart public rather than reimplementing
2019-03-20 19:45:04 +09:00
David Zhao
8543e8c36f
Put loadcomplete next to other protected overrides
2019-03-20 19:42:39 +09:00
Dean Herbert
cda5bc28c8
Add proper comment
2019-03-20 19:41:20 +09:00
David Zhao
9013afe412
Query for input manager once
2019-03-20 19:35:40 +09:00
David Zhao
fbfef844de
Add test case for resuming PlayerLoader
2019-03-20 17:18:42 +09:00
David Zhao
a5916f995e
Use the previous conditional instead
2019-03-20 16:54:42 +09:00
David Zhao
e9034c8a30
Move blurring logic into Update instead
2019-03-20 16:50:47 +09:00
Dean Herbert
f43e7a880c
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-20 15:27:06 +09:00
Dean Herbert
6f1610be79
Merge branch 'master' into ruleset-container-refactor
2019-03-20 14:55:58 +09:00
Dean Herbert
5f288650bf
Fix misses/typos
2019-03-20 14:49:33 +09:00
David Zhao
15637f9c4a
Rework instant blur logic such that updateVisuals doesn't need to be public
2019-03-20 14:17:35 +09:00
Dean Herbert
baea7230bc
Rename RulesetContainer to DrawableRuleset
2019-03-19 23:47:31 +09:00
Dean Herbert
68f28326a2
Refactor RulesetContainer for readability
2019-03-19 20:21:31 +09:00
David Zhao
a8e2072286
Make blurtarget private, improve documentation
2019-03-19 20:15:28 +09:00
David Zhao
dc26e90a8d
Remove unused usings
2019-03-19 13:16:06 +09:00
David Zhao
df37973e84
Move showstoryboard into player
2019-03-19 13:13:19 +09:00
David Zhao
27a92e017c
rename back to UserDimContainer
2019-03-19 13:06:14 +09:00
David Zhao
f1b2073bf6
Merge remote-tracking branch 'upstream/master' into visual-settings-container
2019-03-19 13:01:05 +09:00
Dean Herbert
4f075f4740
Add more comprehensive testing
2019-03-18 20:33:43 +09:00
Dean Herbert
9433a97747
Add resume requesting support and fix exit scenarios
2019-03-18 20:33:43 +09:00
Dean Herbert
536b5e0dab
Remove PausableGameplayContainer
2019-03-18 20:33:43 +09:00
Dean Herbert
f13003c53b
Simplify and localise storyboard logic in Player.cs
2019-03-18 20:33:43 +09:00
Dean Herbert
bcaff9f7b4
Add basic pause tests
2019-03-18 20:33:43 +09:00
Dean Herbert
465c95e952
Refactor pause logic so GameplayClockContainer is in control
2019-03-18 20:33:43 +09:00
Dean Herbert
14df9f94e2
Merge branch 'master' into fix-background-loading
2019-03-18 14:59:35 +09:00
Dan Balasescu
e0b3149e32
Merge branch 'master' into api-testability
2019-03-18 10:59:06 +09:00
David Zhao
8fc90bb9a0
Remove unused usings
2019-03-14 16:26:34 +09:00
David Zhao
8cdfb1fd61
Remove BlurrableBackgroundScreen, rework tests
2019-03-14 16:09:17 +09:00
David Zhao
8714902349
Handle all blurring directly from background
2019-03-14 14:02:46 +09:00
Dean Herbert
0042cc5337
Merge branch 'master' into mod-ramp-hotfix
2019-03-14 13:02:29 +09:00
David Zhao
de6d8fc637
Move user blurring into VIsualSettingsContainer
2019-03-13 18:25:22 +09:00
Dean Herbert
f0114d776d
Use interface to access API
...
Allows for better testability.
2019-03-13 12:58:18 +09:00
Dean Herbert
c1a356161f
Allow use rate adjust to fallback to clock rate adjust
2019-03-12 18:14:01 +09:00
Dean Herbert
3c2d8cad0a
Add better async logic for ScreenWithBeatmapBackground
2019-03-12 17:32:40 +09:00
Dean Herbert
cdeaa80fea
Call ResetSpeedAdjustments before adjusting clock
2019-03-12 11:35:25 +09:00
Dean Herbert
13b3036ec6
Fix "wind" mods adjusting rate twice
...
This is a hotfix for incorrect framework behaviour.
Closes #4442
2019-03-12 02:45:45 +09:00
Dean Herbert
1be4c7b813
Fix excess newline
2019-03-12 02:23:23 +09:00
Dean Herbert
38e75421ab
Fix HoldForMenuButton getting stuck in a confirming state
...
Closes #4446 .
2019-03-12 02:21:34 +09:00
smoogipoo
d055b248ac
Remove blank line
2019-03-08 15:56:36 +09:00
smoogipoo
7c5ca67691
Merge remote-tracking branch 'origin/master' into gameplay-clock-container
...
# Conflicts:
# osu.Game/Screens/Play/Player.cs
2019-03-08 15:54:15 +09:00
Dean Herbert
ed8c9bc88a
Merge remote-tracking branch 'upstream/master' into gameplay-clock-container
2019-03-08 15:07:55 +09:00
Dean Herbert
42efea1e06
Apply review
2019-03-08 15:05:45 +09:00
Dean Herbert
64b6eaa844
Simplify inward bindings
2019-03-07 16:04:11 +09:00
Dean Herbert
58ef397f4f
Move all clock related gameplay logic inside GameplayClockContainer
2019-03-07 16:02:24 +09:00
Dean Herbert
ffe53411f6
Add back cursor proxying
2019-03-06 17:44:58 +09:00
Dean Herbert
acf518c208
Move cursor inside playfield
2019-03-06 17:41:54 +09:00
Dean Herbert
5411c63093
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-06 17:14:08 +09:00
Dean Herbert
6b042eae94
Merge branch 'master' into fix-cursor-in-scale-container
2019-03-05 22:22:56 +09:00
Dean Herbert
8a6fa0915e
Merge branch 'master' into simplify-gameplay-clock
2019-03-05 20:22:46 +09:00
Dean Herbert
76ce3954a0
Rename PauseContainer
2019-03-05 19:30:55 +09:00
Dan Balasescu
fafc80818c
Fix typo
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-05 18:50:46 +09:00
Dean Herbert
fc0b297232
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-05 18:06:24 +09:00
smoogipoo
c06dac5b1a
Remove null check (beatmap cannot be null)
2019-03-05 17:58:30 +09:00
smoogipoo
2fee7276ae
Combine creation + assignment
2019-03-05 17:58:05 +09:00
Dan Balasescu
bb6c83ab25
Merge branch 'master' into show-mods-on-loader
2019-03-05 17:46:35 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash
2019-03-05 17:25:13 +09:00
Dean Herbert
93c79023dc
Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock
2019-03-05 16:41:01 +09:00
Dean Herbert
4e33a98dbc
Move gameplay clock to own class
2019-03-05 13:53:47 +09:00
Dean Herbert
c5cd9972c4
Make restart private
2019-03-05 13:37:51 +09:00
Dean Herbert
01f1018d02
Tidy up clock logic using DI and a GameplayClock
2019-03-05 13:37:51 +09:00
Dean Herbert
5bb0511f0a
Fix SquareGraph not correctly filling columns when loaded with a non-zero time
2019-03-05 13:37:28 +09:00
LeNitrous
cf51c8aa31
attempt to comply with appveyor
2019-03-01 19:10:32 +08:00
LeNitrous
4e081fe1fc
Merge branch 'show-mods-on-loader' of https://github.com/LeNitrous/osu into show-mods-on-loader
2019-03-01 18:41:41 +08:00
Dean Herbert
30e820d107
Fix storyboard potentially being loaded many times
2019-02-28 20:36:00 +09:00
Dean Herbert
53eb0e7e4e
More formatting fixes
2019-02-28 20:30:23 +09:00
Dean Herbert
6861163226
Remove pointless method
2019-02-28 20:21:27 +09:00
David Zhao
e3338e94d1
Make test cases more compact, add two way toggles
2019-02-28 20:01:15 +09:00
Dan Balasescu
99812bd448
Apply suggestions from code review
...
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-28 18:25:58 +09:00
Dean Herbert
b2872b47d0
Merge branch 'master' into UserDimLogic
2019-02-28 17:18:04 +09:00
David Zhao
69b1c76dce
Actually implement blurring fix
2019-02-28 16:51:17 +09:00
Dan Balasescu
3a1066ff02
Merge branch 'master' into toquantity-1
2019-02-28 15:57:51 +09:00
Joehu
2241e1af9d
Use ToQuantity for words with number prefixes
2019-02-27 21:55:45 -08:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching
2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07
Use pattern matching wherever possible
2019-02-28 14:35:00 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections
2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1
Use expression body for property get/set where possible
2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9
Fix remaining issues
2019-02-28 13:31:40 +09:00
Dean Herbert
3e1f283281
Merge remote-tracking branch 'upstream/master' into more-inspections
2019-02-28 13:09:18 +09:00
Dean Herbert
c8793911a8
Enable more stringent inspectcode style inspections
2019-02-27 21:25:40 +09:00
Dean Herbert
3af7d4939c
Add debounce testing
2019-02-27 19:11:09 +09:00
Dean Herbert
43a1df6e5c
Inline cancellation token source creation
2019-02-27 18:58:53 +09:00
Dean Herbert
6f5d4ce2e2
Debounce SquareGraph some more
2019-02-27 18:58:45 +09:00
Dean Herbert
8c4a59e57e
Fix SquareGraph more
2019-02-27 18:58:34 +09:00
David Zhao
882fff1631
Assert storyboard visibilty at both steps of toggle
2019-02-27 17:56:44 +09:00
David Zhao
14ffd9efe8
Add fake storyboard to visually assess storyboard dim
2019-02-27 17:02:04 +09:00
Dean Herbert
56697339b3
Merge branch 'master' into fix-disabled-set-crash
2019-02-27 11:14:42 +09:00
David Zhao
d750023c52
Fix TestCasePlayerLoader not having a background stack
2019-02-25 22:05:49 +09:00
Dean Herbert
80737b9ef8
Remove "silent" parameter; consolidate import logic
2019-02-25 18:24:06 +09:00
David Zhao
16fa30f71e
Fix bindable
2019-02-25 13:27:44 +09:00
David Zhao
ccc86b66fa
Use local private bindable in Player.cs
2019-02-25 13:15:37 +09:00
David Zhao
af4606f3d2
Create new test for StoryboardReplacesBackground
2019-02-25 12:35:01 +09:00
David Zhao
24f5bc7a75
Add documentation and move storyboard init logic
2019-02-24 20:03:24 +09:00
David Zhao
3a9835fcdd
Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic
2019-02-24 18:11:08 +09:00
David Zhao
f4acd6e48f
Move PlayerLoader tests out of constructor, Improve Documentation
2019-02-24 18:10:59 +09:00
Dean Herbert
b140fc973a
Merge branch 'master' into UserDimLogic
2019-02-24 17:48:59 +09:00
Dean Herbert
2281a0235d
Fix regression causing playback rate to display incorrectly
2019-02-24 15:27:06 +09:00
David Zhao
ab3fa91a2f
Merge branch 'master' into UserDimLogic
2019-02-22 20:38:10 +09:00
smoogipoo
d61dfe888e
Fix venera fonts not being correctly specified
2019-02-22 19:42:09 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +09:00
Dean Herbert
0431582959
Remove excess new line
2019-02-22 17:57:49 +09:00
Dean Herbert
3fe4b8fd1c
Update variable names
...
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
David Zhao
263972a048
Remove DimLevel bindable from ScreenWithBeatmapBackground
2019-02-22 17:00:00 +09:00
David Zhao
65cdac60c3
Add tests to make sure the background is always the same through screen transitions
2019-02-22 14:43:05 +09:00
smoogipoo
d8c55bc729
Adjust namespaces
2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f
Update with framework bindable changes
2019-02-21 18:56:34 +09:00
David Zhao
97db8abd59
Remove unused includes
2019-02-21 18:34:11 +09:00
David Zhao
0677194f46
Move all storyboard show logic into UserDimContainer
2019-02-21 18:14:58 +09:00
David Zhao
ad5e81f0cd
Add test case for background preview, fix unit tests
2019-02-21 15:24:26 +09:00
smoogipoo
cc33f230b4
Merge remote-tracking branch 'origin/master' into osu-fontusage
2019-02-20 20:37:48 +09:00
Jamie Taylor
9b3f2fdd24
Change RelativePositionAxes default on osu! logo to be both
2019-02-20 19:34:55 +09:00
smoogipoo
4db5531e4b
Replace copy-constructor/method with extension method
2019-02-20 19:32:30 +09:00
David Zhao
49c5a9fc30
Merge branch 'master' into UserDimLogic
2019-02-20 17:30:34 +09:00
David Zhao
d703a9511a
Fix background dim previews
2019-02-20 17:20:45 +09:00
David Zhao
1bd1b6b099
Move user dim logic into UserDimContainer instead
2019-02-20 16:53:57 +09:00
smoogipoo
dbfa95b9e7
Made medium the default font weight
2019-02-20 16:52:36 +09:00
smoogipoo
0693ab8e7d
Merge remote-tracking branch 'origin/master' into osu-fontusage
...
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb
Adjust sprite texts in-line with framework changes
2019-02-20 15:03:20 +09:00
smoogipoo
703df77000
Update in-line with framework IsActive changes
2019-02-19 19:16:03 +09:00
David Zhao
af049004dd
Add test cases for transitioning into pause overlay and into results
2019-02-18 19:53:55 +09:00
David Zhao
80800f2931
Match up fade behavior with current master
2019-02-18 16:34:11 +09:00
David Zhao
9be25c3758
Fix unit tests
2019-02-18 16:00:59 +09:00
David Zhao
f241d67e5f
Use conditional operator isntead of if
2019-02-18 15:23:03 +09:00
David Zhao
df148f8787
Fix background dim not being disabled on playerloader exit
2019-02-18 12:55:42 +09:00
