Dean Herbert
|
8e644e878a
|
Merge remote-tracking branch 'upstream/master' into fix-info-wedge
|
2017-12-23 21:40:27 +09: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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Dean Herbert
|
6ef575c005
|
Update framework
|
2017-12-22 15:46:45 +09:00 |
|
Dan Balasescu
|
a3d947301b
|
Merge branch 'master' into beatmap-serialization
|
2017-12-22 07:38:05 +09:00 |
|
Dean Herbert
|
be526d68e8
|
Merge pull request #1599 from naoey/leaderboard-scopes
Make leaderboard tabs and active ruleset filter scores
|
2017-12-22 01:23:24 +09: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
|
efc790e5c3
|
Merge pull request #1676 from Aergwyn/add-confirmation-dialog
Added confirmation dialog for "Delete ALL beatmaps"
|
2017-12-22 00:44:07 +09:00 |
|
Dean Herbert
|
40587411c1
|
Merge branch 'master' into add-confirmation-dialog
|
2017-12-22 00:32:25 +09:00 |
|
Dean Herbert
|
68035aa6a6
|
Merge pull request #1717 from peppy/remove-unnecessary-blocking
Remove manual audio thread synchronisation logic
|
2017-12-22 00:32:10 +09:00 |
|