Dean Herbert
66fc447444
Merge branch 'master' into fix-notification-overlay
2017-12-24 13:31:43 +09:00
Shawdooow
72b5a370da
dont play the same sound twice at once
2017-12-23 23:13:53 -05:00
Shawdooow
af2a2781e7
fix the fix harder
2017-12-23 23:12:10 -05:00
Shawdooow
d333fc5efe
fix the fix
...
silly me, that was configured for vitaru!
2017-12-23 23:08:55 -05:00
Shawdooow
a656656403
the fix
2017-12-23 22:47:32 -05:00
Shawdooow
cf315cae56
Merge remote-tracking branch 'refs/remotes/ppy/master'
2017-12-23 22:44:08 -05: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
Dan Balasescu
77e4a7cec2
Merge pull request #1731 from Aergwyn/add-missing-repeat-samples
...
Add Samples to RepeatPoint construction
2017-12-23 22:00:16 +09:00
Dan Balasescu
030752dc33
Merge branch 'master' into add-missing-repeat-samples
2017-12-23 21:40:53 +09:00
Dean Herbert
8e644e878a
Merge remote-tracking branch 'upstream/master' into fix-info-wedge
2017-12-23 21:40:27 +09:00
Aergwyn
47c75d01ce
access list with index instead of using LINQ
2017-12-23 13:30:44 +01:00
Dean Herbert
7956a284a5
Merge pull request #1732 from Aergwyn/fix-ss-key-crash
...
Fix crash in SongSelect when traversing while zero beatmaps are loaded
2017-12-23 21:00:28 +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
Aergwyn
c5aba9f247
add Samples to RepeatPoint construction
2017-12-23 12:32:21 +01:00
Dan Balasescu
ea90c0cf40
Merge pull request #1728 from peppy/fix-leaderboard-placeholder
...
Improve state and feel of leaderboard placeholders
2017-12-23 20:27:11 +09:00
smoogipoo
1f44e98f9c
Add unavailable state to testcase
2017-12-23 20:17:12 +09:00
Dan Balasescu
7ec4d230b9
Merge branch 'master' into fix-leaderboard-placeholder
2017-12-23 20:04:05 +09:00
Dan Balasescu
40bb82fe75
Merge pull request #1627 from FreezyLemon/taiko-hitsounds-fix
...
Taiko playing hitsounds on click/keydown, not only on hitobjects being hit.
2017-12-23 20:02:51 +09:00
Aergwyn
49e855a29a
finished up visual tests
2017-12-23 11:56:53 +01:00
Dean Herbert
e7c85d38a8
Move list initialisation to pattern generation code
2017-12-23 19:17: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
298ac5468f
Fix regressions
2017-12-23 17:24:28 +09:00
Dean Herbert
2db68df999
Simplify DrawableHitObject's sample load code
2017-12-23 17:20:14 +09:00
Dean Herbert
cd8e8c8323
Actually save changes
2017-12-23 16:52:23 +09:00
Dean Herbert
a30400ad29
Use a class instead of Tuple
2017-12-23 16:49:29 +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
Dean Herbert
751fcf3c7d
Merge pull request #1665 from smoogipoo/beatmap-serialization
...
Implement a JSON Beatmap decoder
2017-12-23 03:16:30 +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
e8e551606d
Merge branch 'master' into fix-info-wedge
2017-12-22 22:45:07 +09: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
166d6b555b
Merge pull request #1725 from smoogipoo/fix-editor-approachcircles
...
Make editor discard approach circles
2017-12-22 22:30:10 +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
def2e5bd17
Make editor discard approach circles
...
Temporary solution for now.
2017-12-22 22:16:54 +09:00
smoogipoo
d54b74e13a
Update framework
2017-12-22 21:44:12 +09:00
smoogipoo
6a29f6020a
Make HitObjects construct nested hit objects
2017-12-22 21:42:54 +09:00
Dean Herbert
f1d170c390
Merge pull request #1549 from EVAST9919/rank-graph-improvements
...
Fix profile rank graph being hidden (and improve visually)
2017-12-22 21:32:10 +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
728d1cb7f6
Formatting and more dynamically testable references
2017-12-22 19:24:54 +09:00