|
|
31b72f168d
|
Fix deprecated calls and code styling (partly)
|
2019-05-13 00:46:22 +09:00 |
|
|
|
34f54aa945
|
Resolve compile-time issues
|
2019-05-13 00:36:05 +09:00 |
|
|
|
943e1574a4
|
Merge branch 'master' into changelog-overlay
|
2019-05-13 00:24:18 +09:00 |
|
|
|
dc486579fb
|
Implement skinning for slider border thickness (#4471)
Implement skinning for slider border thickness
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-13 00:02:04 +09:00 |
|
|
|
da2338581b
|
Merge branch 'master' into dev
|
2019-05-12 23:13:46 +09:00 |
|
|
|
fbb7338ea3
|
Fix game not always failing when minimum HP is hit (#4763)
Fix game not always failing when minimum HP is hit
|
2019-05-12 23:13:26 +09:00 |
|
|
|
daa2786dbd
|
Use a constant for the default value
|
2019-05-12 23:08:42 +09:00 |
|
|
|
487a56549e
|
Fix CI issues
|
2019-05-12 22:53:12 +09:00 |
|
|
|
41e13aef23
|
Use more standard parsing method
|
2019-05-12 22:53:03 +09:00 |
|
|
|
1c3b768266
|
Use Precision.AlmostBigger
|
2019-05-12 09:02:22 -04:00 |
|
|
|
ce0e4c506e
|
Merge branch 'master' into dev
|
2019-05-12 21:45:52 +09:00 |
|
|
|
1a6c8e91a5
|
Compare Health with small value
|
2019-05-12 08:44:20 -04:00 |
|
|
|
50c4e788af
|
Fix clicking "+" tab showing an empty channel in some cases (#4759)
Fix clicking "+" tab showing an empty channel in some cases
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-12 21:14:45 +09:00 |
|
|
|
82599127fd
|
Merge branch 'master' into patch-1
|
2019-05-12 20:30:25 +09:00 |
|
|
|
7adaa09263
|
Move tab channel class into tab item class
|
2019-05-12 06:31:11 -04:00 |
|
|
|
8957ad5a7e
|
Instantiate channel in tab item
|
2019-05-12 06:26:03 -04:00 |
|
|
|
d53fb9a5c8
|
Check against type instead of channel name
|
2019-05-12 06:11:16 -04:00 |
|
|
|
496a9dd41d
|
Create separate type for Join-Channel button
|
2019-05-12 06:02:21 -04:00 |
|
|
|
cc298a7e57
|
Fix slider border not reverting to default color (#4713)
Fix slider border not reverting to default color
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-12 19:00:20 +09:00 |
|
|
|
b8446fb67f
|
Fix fallbacks for SliderTrackOverride and SliderBall too
|
2019-05-12 18:51:31 +09:00 |
|
|
|
cbf126db25
|
Merge branch 'master' into fix-slider-border-color
|
2019-05-12 17:25:49 +09:00 |
|
|
|
bfa6156092
|
Don’t allow ResumeContainers to appear during breaks (#4607)
Don’t allow ResumeContainers to appear during breaks
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-12 17:25:15 +09:00 |
|
|
|
038e49701e
|
Move conditional to within BreakPeriod
|
2019-05-12 16:25:25 +09:00 |
|
|
|
1391aa342c
|
Merge branch 'master' into break-pause
|
2019-05-12 16:15:24 +09:00 |
|
|
|
df4e08dd9b
|
Fix pauses being triggered in unexpected scenarios (#4750)
Fix pauses being triggered in unexpected scenarios
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-12 16:07:37 +09:00 |
|
|
|
3566da73cc
|
Merge branch 'master' into fix-more-pause-cases
|
2019-05-12 15:57:45 +09:00 |
|
|
|
9add2562f9
|
Close beatmap options when suspending (#4761)
Close beatmap options when suspending
|
2019-05-12 15:50:10 +09:00 |
|
|
|
71d3c9c495
|
Fix beatmap carousel overlapping beatmap info wedge (#4760)
Fix beatmap carousel overlapping beatmap info wedge
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-12 15:49:50 +09:00 |
|
|
|
790700d8bf
|
Use more correct calculation
|
2019-05-12 15:40:58 +09:00 |
|
|
|
9925aafa98
|
Merge remote-tracking branch 'upstream/master' into fix-carousel-sizing
|
2019-05-12 15:39:55 +09:00 |
|
|
|
175daac16a
|
Close beatmap options when suspending
|
2019-05-11 21:26:42 -07:00 |
|
|
|
f5d7330a20
|
Fix player loader testcase potentially failing (#4720)
Fix player loader testcase potentially failing
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-05-12 13:18:38 +09:00 |
|
|
|
29cec54b3c
|
Fix beatmap carousel overlapping beatmap info wedge
|
2019-05-11 20:08:45 -07:00 |
|
|
|
c508b8ed6b
|
Trim whitespace
|
2019-05-11 19:21:12 -04:00 |
|
|
|
3971a49549
|
Ignore Add-channel button
|
2019-05-11 19:16:15 -04:00 |
|
|
|
6cf1ca288f
|
Do not try to join the Add-channel button
|
2019-05-11 19:13:48 -04:00 |
|
|
|
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 |
|
|
|
01eb1a34a9
|
Remove unused variable
|
2019-05-10 22:15:33 +09:00 |
|
|
|
ad93eda399
|
Allow song progress bar to show current position during a seek (#4746)
Allow song progress bar to show current position during a seek
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-05-10 21:10:11 +09:00 |
|
|
|
c157f3e817
|
Merge pull request #4743 from peppy/fix-score-deletion
Fix score deletion not considering ScoreManager ownership
|
2019-05-10 19:25:42 +09:00 |
|
|
|
4abd5c78cd
|
Merge branch 'master' into fix-score-deletion
|
2019-05-10 19:09:18 +09:00 |
|
|
|
101889cff9
|
Merge pull request #4753 from peppy/fix-failing-pause-tests
Attempt to fix failing tests by delaying starting of the gameplay clock
|
2019-05-10 19:08:42 +09:00 |
|
|
|
3fe61c4a7e
|
Trim whitespace
|
2019-05-10 18:48:39 +09:00 |
|
|
|
425154c264
|
Merge branch 'master' into progress-bar-show-seek
|
2019-05-10 18:24:15 +09:00 |
|
|
|
fe7ea1e900
|
Merge branch 'master' into fix-score-deletion
|
2019-05-10 18:24:04 +09:00 |
|
|
|
af3a75307d
|
Merge branch 'master' into fix-failing-pause-tests
|
2019-05-10 18:22:20 +09:00 |
|
|
|
378f8103fb
|
Merge pull request #4752 from smoogipoo/fix-cancellation-usages
Use nullable cancellation tokens
|
2019-05-10 18:21:53 +09:00 |
|
|
|
3352252e00
|
Fix testcase regression
|
2019-05-10 18:21:07 +09:00 |
|
|
|
97796a8578
|
Attempt to fix failing tests by delaying starting of the gameplay clock
|
2019-05-10 18:10:07 +09:00 |
|
|
|
d2479acbf2
|
Fix incorrect value being clamped
|
2019-05-10 18:04:58 +09:00 |
|
