Dan Balasescu
996e156fd0
Merge branch 'master' into fix-notification-scheduled-events
2017-12-27 23:27:23 +09:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays
2017-12-27 23:26:57 +09:00
Dean Herbert
259e32f485
Merge branch 'master' into fix-beatmap-wedge-appear
2017-12-27 23:22:06 +09:00
Dan Balasescu
3a2dadc9d3
Fix spelling error
2017-12-27 23:14:48 +09:00
Dean Herbert
02f4705178
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 23:13:30 +09:00
Dean Herbert
07e0c423f5
Merge branch 'master' into fix-beatmap-wedge-appear
2017-12-27 22:58:50 +09:00
Dean Herbert
f68bf2e258
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 21:45:20 +09:00
Dan Balasescu
d99c6db4a1
Merge branch 'master' into fix-progress-notifications-close
2017-12-27 21:44:31 +09:00
Dean Herbert
3f73a9a693
Add better sample fallback logic
...
Also adds support for null channels at InputDrum level.
2017-12-27 21:44:04 +09:00
Dan Balasescu
3de07ddba8
Merge branch 'master' into fix-progress-notifications-close
2017-12-27 21:43:58 +09:00
Dean Herbert
9a4b2f0d1d
Apply workaround at two levels
2017-12-27 21:19:06 +09:00
Dean Herbert
46ef17354e
Simplify path construction
2017-12-27 21:05:16 +09:00
Dean Herbert
496b0fef01
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 20:40:16 +09:00
Dean Herbert
324a7d6377
Merge remote-tracking branch 'upstream/master' into better-testcase-player
2017-12-27 20:26:38 +09:00
Dean Herbert
7d0c94fd01
Fix notification overlay layout and scheduled tasks being delayed
...
Closes #1295
2017-12-27 19:42:44 +09:00
smoogipoo
b87e6c8b2a
Add a method to get ruleset by name
2017-12-27 17:33:34 +09:00
Dan Balasescu
1af7f71c97
Merge branch 'master' into notification-verbosity
2017-12-27 15:01:28 +09:00
smoogipoo
de353ee6af
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 14:59:26 +09:00
Dan Balasescu
f6e72706d9
Merge branch 'master' into fix-multiple-random-selects
2017-12-27 14:51:54 +09:00
Dean Herbert
2a7147240f
Fix progress notifications not creating their completion notification early enough
...
FIxes notification overlay thinking it has no notifications left and closing.
2017-12-27 13:25:42 +09:00
smoogipoo
5b529511ec
Update OpenTK nuget package
...
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
Dean Herbert
18d2be75d5
Fix random selection happening more than once on quick imports
2017-12-27 13:04:50 +09:00
smoogipoo
ddee9e992a
Merge remote-tracking branch 'origin/master' into proper-taiko-hitsounds
2017-12-27 13:04:10 +09:00
Dean Herbert
cf9a9762f7
Fix beatmap wedge appearing with incorrect info on entering song select
...
Closes #1762
2017-12-27 13:02:21 +09:00
smoogipoo
b95d7fc2cd
Revert "Make ControlPointInfo return a set default control point"
...
This reverts commit 3113a55a98
2017-12-27 12:41:59 +09:00
Dean Herbert
ae9f08f387
Fix crash in editor when trying to seek on a virtual track
2017-12-27 11:47:04 +09:00
Dean Herbert
d17f6cb564
Fix crash when starting play mode with no beatmap
...
Closes #1767
2017-12-27 11:46:44 +09:00
Aergwyn
4c2554595e
implement hidden (mostly)
...
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00
Dean Herbert
94449ed597
Merge branch 'master' into notification-verbosity
2017-12-26 20:48:59 +09:00
Dean Herbert
35ae5173cd
Merge branch 'master' into better-notification-delays
2017-12-26 20:48:41 +09:00
Dean Herbert
3182c22c7d
Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info
2017-12-26 20:36:22 +09:00
Dean Herbert
7504cd589d
Move alpha handling to state
2017-12-26 20:18:47 +09:00
smoogipoo
d479955e20
Fix spelling error
2017-12-26 20:01:02 +09:00
smoogipoo
9690591593
Make taiko use namespaced hitsounds
...
This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.
2017-12-26 19:55:56 +09:00
Aergwyn
f5d4ed2a22
add interface to adjust DrawableHitObjects
2017-12-26 11:49:42 +01:00
Dean Herbert
ee67e7119d
Merge remote-tracking branch 'upstream/master' into fix-info-wedge
2017-12-26 19:44:28 +09:00
Aergwyn
44fbe7859a
move anchor and origin so metadata doesn't move if it's partially empty
2017-12-26 11:34:26 +01:00
smoogipoo
3113a55a98
Make ControlPointInfo return a set default control point
2017-12-26 19:33:01 +09:00
smoogipoo
836d807f4f
Give SampleControlPoint a 100% volume by default
2017-12-26 19:32:20 +09:00
Dan Balasescu
460eeafd32
Merge branch 'master' into quieter-notifications
2017-12-26 18:18:28 +09:00
Dean Herbert
cf71ffdb6c
Merge branch 'master' into fix-taiko-stronghit
2017-12-26 18:06:07 +09:00
Dan Balasescu
11542b697c
Merge branch 'master' into improve-screen-offset
2017-12-26 17:53:13 +09:00
Dean Herbert
ab6c93fba4
Merge branch 'master' into notification-verbosity
2017-12-26 16:14:24 +09:00
Dean Herbert
3524ad3dc2
Merge remote-tracking branch 'upstream/master' into better-notification-delays
2017-12-26 16:10:57 +09:00
Dean Herbert
f737a64189
Remove ScreenChanged
2017-12-26 16:09:40 +09:00
Dan Balasescu
f7a54a203b
Merge branch 'master' into beatmap-import-prompt
2017-12-26 16:00:37 +09:00
Dean Herbert
c15b2382a2
Remove unused variable
2017-12-26 15:56:32 +09:00
Dean Herbert
24d8d357d0
Only bounce and flash notification count when increasing
2017-12-26 15:54:37 +09:00
Dean Herbert
45b3acdd6f
Fix progress notifications not closing properly when opening their continuation
2017-12-26 15:54:33 +09:00
Dean Herbert
ed1df94f77
Fix unread light not turning off
2017-12-26 15:54:28 +09:00
Dan Balasescu
ef0031a719
Merge branch 'master' into popup-word-wrap
2017-12-26 15:47:58 +09:00
Dan Balasescu
d089e27cad
Merge branch 'master' into osu-prefixed-text
2017-12-26 15:40:29 +09:00
Dean Herbert
9ccc49c9b5
Make selection triggering more liberal
2017-12-26 15:32:39 +09:00
Dan Balasescu
ad811961a7
Merge branch 'master' into quieter-notifications
2017-12-26 15:30:12 +09:00
Dean Herbert
ed7ae4e956
Merge branch 'master' into fix-info-wedge
2017-12-26 15:08:52 +09:00
Dean Herbert
99a44e6d79
Allow testbrowser's rate adjust to affect TestCasePlayer
2017-12-26 15:03:45 +09:00
Dean Herbert
9fb958eadc
Make TestCasePlayer more usable
...
No results screen crash, no unnecessary leadin time.
2017-12-26 14:23:14 +09:00
smoogipoo
14162b5d46
Make InputDrum handle all Normals/Claps, hitobjects all others
2017-12-26 14:18:23 +09:00
Dean Herbert
09ce24a7db
Switch to a better way of deciding on null selection
...
This avoids `SelectionChanged` potentially being invoked multiple times after `selectedBeatmapSet` is already `null`.
2017-12-26 13:41:02 +09:00
Dean Herbert
2473f6de46
Merge branch 'master' into fix-hiding-last-map
2017-12-26 13:32:33 +09:00
smoogipoo
58c35b8ba5
Merge remote-tracking branch 'FreezyLemon/master' into fix-taiko-stronghit
2017-12-26 12:28:40 +09:00
FreezyLemon
c737e5245e
Removed unnecessary SelectNext() call and change to dummy map when no items present
2017-12-26 01:50:05 +01:00
Dean Herbert
7f7a4b8638
Merge branch 'master' into fix-null-ref
2017-12-26 02:58:57 +09:00
Dean Herbert
798c2c6666
Add special logic to song select to avoid obvious clipping when notifications are displayed
...
Not sure if we will keep this going forward (there will likely be an opaque tab control on the notifications overlay similar to options) but let's go with this for now.
2017-12-26 02:52:43 +09:00
Dean Herbert
d8f0844742
Fix null reference in release builds
...
Intro may not be initialised yet
2017-12-26 02:51:53 +09:00
Dean Herbert
0886107ec9
Connect counter with button display
2017-12-26 01:56:57 +09:00
Dean Herbert
1fc240f6c5
Expose unread notification count
2017-12-26 01:50:05 +09:00
Dean Herbert
bb33d0211a
Add a count of unread notifications to the toolbar
2017-12-26 01:36:58 +09:00
Dean Herbert
dff082ed94
Make toolbar testable and add the most basic of visual tests
2017-12-26 01:12:46 +09:00
Dean Herbert
3c8d30f8e6
Add a dialog offering to import beatmaps from stable
2017-12-26 00:52:11 +09:00
Dean Herbert
3c1654e5e4
Fix many instances of non-osu-prefixed text classes being used
...
Results in incorrect default formatting.
2017-12-26 00:44:35 +09:00
Dean Herbert
929633efaa
Make body text in popups word wrap properly
2017-12-26 00:38:35 +09:00
Aergwyn
bb4b5bebf9
fix supporter icon in profile missing its background
...
also it doesn't show up on profiles without supporter anymore
2017-12-25 15:30:42 +01:00
Dean Herbert
71a94d6b44
Add a bindable Enabled flag to NotificationManager
...
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
Dean Herbert
861bf55773
Adjust notification padding a touch
2017-12-25 18:31:32 +09:00
Dean Herbert
96e4518e60
Add thread safety
2017-12-25 18:22:58 +09:00
Dean Herbert
6f5f4f76e5
Use Logger.Error when exceptions are involved
2017-12-25 18:21:15 +09:00
Dean Herbert
320a6b0480
Reduce notification output when exceptions are encountered
2017-12-25 18:20:52 +09:00
smoogipoo
0fb620a8d3
Make HitObject.Samples non-nullable
2017-12-25 16:41:18 +09:00
smoogipoo
d288d8a51f
Remove SampleInfoList
2017-12-25 15:40:01 +09:00
Dean Herbert
fa95612fb7
Merge remote-tracking branch 'upstream/master' into fix-info-wedge
2017-12-25 01:06:56 +09:00
Dean Herbert
22338287d0
Merge branch 'master' into fix-taiko-stronghit
2017-12-25 00:37:10 +09:00
Aergwyn
68a00235b9
simplify offset calculation for background
2017-12-24 14:32:56 +01:00
Dean Herbert
7cbf271645
Merge branch 'master' into add-nofitication-overlay-push-bg
2017-12-24 21:52:14 +09:00
Aergwyn
5b22c5a453
reduce code duplication to move intro background
2017-12-24 10:28:37 +01:00
Dean Herbert
482e10966c
Ensure a selection is made on entering song select if no selection is current
2017-12-24 17:02:56 +09:00
Dean Herbert
cf316b3c51
Add tests for initial load states of PlaySongSelect
2017-12-24 15:39:25 +09:00
Aergwyn
2ffc479411
let NotificationOverlay move the background
2017-12-23 14:56:23 +01:00
Aergwyn
9bb0cda525
fix NotificationOverlay going out of bounds at the bottom
...
also fixes the overlap with the Toolbar at the top
2017-12-23 14:33:43 +01:00
Dean Herbert
8e644e878a
Merge remote-tracking branch 'upstream/master' into fix-info-wedge
2017-12-23 21:40:27 +09:00
smoogipoo
68d76d4380
Fix taiko strong hits not being handled
2017-12-23 20:58:09 +09:00
Aergwyn
1d67746d32
fix crash in SongSelect when traversing while zero beatmaps are loaded
2017-12-23 12:53:11 +01:00
Dean Herbert
117b744e37
Merge branch 'master' into fix-info-wedge
2017-12-23 20:36:24 +09:00
Dan Balasescu
7ec4d230b9
Merge branch 'master' into fix-leaderboard-placeholder
2017-12-23 20:04:05 +09:00
Dean Herbert
aeafa5645a
Make Samples null by default and prepopulate in mania
2017-12-23 18:06:46 +09:00
Dean Herbert
2db68df999
Simplify DrawableHitObject's sample load code
2017-12-23 17:20:14 +09:00
Dean Herbert
9ca03c0209
Simplify and tidy sample retrieval
...
Less static weirdness
2017-12-23 16:46:02 +09:00
Dean Herbert
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
Dean Herbert
ff0927e71b
Remove unnecessary newline
2017-12-23 16:23:33 +09:00
Dean Herbert
46865bbacd
Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix
...
# Conflicts:
# osu.Game/Audio/SampleInfo.cs
2017-12-23 14:50:35 +09:00
Dean Herbert
1fa9dac1bb
Merge remote-tracking branch 'origin/master' into taiko-hitsounds-fix
2017-12-23 14:20:16 +09:00
Dean Herbert
77f1b59853
Merge branch 'master' into fix-info-wedge
2017-12-23 04:04:18 +09:00
Aergwyn
6a8fd74e05
fix failing tests
...
1) waiting for loading to finish so Drawables are all present to do asserts on
2) fix NullRef in ResultPage because of removed line in DummyWorkingBeatmap (author one)
2017-12-22 17:38:22 +01:00
Dean Herbert
4d40004e97
Merge branch 'master' into beatmap-serialization
2017-12-22 22:45:00 +09:00
Dean Herbert
bdda1570d1
Move Placeholder classes to own files
2017-12-22 22:44:18 +09:00
Dean Herbert
26bb3715fe
Improve state and feel of leaderboard placeholders
...
Closes #1721 .
2017-12-22 22:42:23 +09:00
Dean Herbert
2313ff0ddb
Fix beatmap info wedge not showing up when zero beatmaps are loaded
...
Closes #1722 .
2017-12-22 22:19:11 +09:00
smoogipoo
6a29f6020a
Make HitObjects construct nested hit objects
2017-12-22 21:42:54 +09:00
Aergwyn
ed827d5424
more visual tests for BeatmapInfoWedge
...
also fix Author showing when not wanted
2017-12-22 12:33:52 +01:00
Dean Herbert
e5faced9ba
Better variable name
2017-12-22 19:25:59 +09:00
Dean Herbert
82909f6585
RankChart -> RankGraph
2017-12-22 19:25:18 +09:00
Dean Herbert
1a318c5c2b
Improve LineGraph invalidation logic
2017-12-22 18:58:35 +09:00
EVAST9919
8c50fa0b84
Add testcase
2017-12-22 18:57:23 +09:00
EVAST9919
938c5feea4
Simplify interaction condition
2017-12-22 18:45:10 +09:00
EVAST9919
94a974a397
Use bindable for a user
2017-12-22 18:45:10 +09:00
EVAST9919
e48c515d52
CI fixes
2017-12-22 18:45:10 +09:00
EVAST9919
5ffdaf711e
Remove useless array
2017-12-22 18:45:10 +09:00
EVAST9919
f3c93c894b
Rank graph improvements
2017-12-22 18:45:10 +09:00
Aergwyn
07f55a2a60
remove references to DummyWorkingBeatmap
...
determine content by data that is present instead
2017-12-22 10:18:25 +01:00
Dan Balasescu
a3d947301b
Merge branch 'master' into beatmap-serialization
2017-12-22 07:38:05 +09:00
Aergwyn
214154c512
hide unnecessary lines on empty BeatmapInfoWedge
...
adding back deleted line
ooops
meh
2017-12-21 20:23:10 +01:00
Dean Herbert
aa388885b7
Adjust animation slightly
2017-12-22 00:53:34 +09:00
Dean Herbert
5c9d484395
Adjust debounce a bit
2017-12-22 00:50:32 +09:00
Dean Herbert
40ceaf12f2
Merge branch 'master' into leaderboard-scopes
2017-12-22 00:44:24 +09:00
Dean Herbert
40587411c1
Merge branch 'master' into add-confirmation-dialog
2017-12-22 00:32:25 +09:00
Dean Herbert
2526ebbbdc
Merge branch 'master' into remove-unnecessary-blocking
2017-12-22 00:18:02 +09:00
Dan Balasescu
ae4abf0f2b
Merge branch 'master' into remove-unnecessary-blocking
2017-12-21 23:55:48 +09:00
Dean Herbert
eb1b1da732
Merge branch 'master' into overlays-block-keyboard
2017-12-21 23:51:46 +09:00
Dean Herbert
57fdbda16d
Remove unnecessary IsLoaded check
...
We are always loaded at this point.
2017-12-21 23:48:48 +09:00
Dean Herbert
65e6206d06
Use local bindable
2017-12-21 23:48:35 +09:00
Dean Herbert
13fee5402a
Remove unnecessary using
...
visual studio doesn't save
2017-12-21 23:20:11 +09:00
Dean Herbert
38703e6b85
Merge branch 'master' into add-confirmation-dialog
2017-12-21 22:56:31 +09:00
Dean Herbert
620e9737c3
Avoid many many unnecessary enumerations
2017-12-21 22:33:16 +09:00
Dean Herbert
a9039c71e0
Merge branch 'master' into undelete-button-add
2017-12-21 22:32:08 +09:00
Dean Herbert
87e790080b
Remove manual audio thread synchronisation logic
...
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
Dan Balasescu
5cd2a3950e
Merge branch 'master' into overlays-block-keyboard
2017-12-21 22:15:03 +09:00
smoogipoo
790aa8be2a
Merge master into beatmap-serialization
2017-12-21 22:13:53 +09:00
smoogipoo
866d1c6e0f
Remove now unused references
2017-12-21 22:13:18 +09:00
Dean Herbert
4bd2c7e95f
Fix minor formatting issue
2017-12-21 21:54:46 +09:00
Dean Herbert
abe465358c
Fix formatting
2017-12-21 21:46:57 +09:00
naoey
644aaa8167
Unsubscribe from API state change event.
2017-12-21 18:00:10 +05:30
Dean Herbert
63f2436220
Merge branch 'master' into leaderboard-scopes
2017-12-21 21:18:56 +09:00
Dean Herbert
5b596765c8
Merge branch 'master' into dev-overlay-counter
2017-12-21 21:09:40 +09:00
FreezyLemon
e4ead36544
Added completion text
2017-12-21 13:01:14 +01:00
FreezyLemon
cbc1aacf5c
Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add
2017-12-21 13:00:11 +01:00
Seokho Song
6fbd06f967
Fix Not update retry counter on PauseOverlay
...
I've find "You've retried xx time(s)" message that something weird.
That is not displayed pause overlay and only see count on FailOverlay
I change code that PauseContainer.Retries property can be set call-back function.
Signed-off-by: Seokho Song <0xdevssh@gmail.com>
2017-12-21 20:40:31 +09:00
smoogipoo
d80079a73a
Merge remote-tracking branch 'origin/master' into beatmap-serialization
2017-12-21 20:15:01 +09:00
Dan Balasescu
50afc6e9c9
Merge branch 'master' into fix-gameplay-menu-blocking
2017-12-21 20:07:14 +09:00
smoogipoo
2fb8895e66
Add spacer to menu
2017-12-21 19:57:09 +09:00
smoogipoo
b2c0b013aa
Remove migration setting in favour of export option in the editor
2017-12-21 19:56:12 +09:00
