Dan Balasescu
|
9be595a234
|
Merge pull request #1315 from peppy/close-beatmap-overlay
Close BeatmapSetOverlay when clicking outside of it
|
2017-09-27 14:02:08 +09:00 |
|
Dan Balasescu
|
4881d01b7e
|
Merge branch 'master' into close-beatmap-overlay
|
2017-09-27 13:51:13 +09:00 |
|
Dan Balasescu
|
529b98ba35
|
Merge pull request #1316 from peppy/fix-concurrent-tests
Assign a name to individual import tests to avoid file contention
|
2017-09-27 13:51:07 +09:00 |
|
Dean Herbert
|
e64860ad45
|
Fix test case not working as expected
|
2017-09-27 12:46:34 +08:00 |
|
Dean Herbert
|
faad3fc7d3
|
Arbitrarily move colour assignment
|
2017-09-27 12:40:32 +08:00 |
|
Dan Balasescu
|
b0c5f90645
|
Merge branch 'master' into fix-concurrent-tests
|
2017-09-27 13:39:08 +09:00 |
|
Dan Balasescu
|
f0cfd5271c
|
Merge pull request #1318 from peppy/osu-direct-default-mode
Load osu!direct overlay to "newest maps" tab by default
|
2017-09-27 13:38:10 +09:00 |
|
Dean Herbert
|
ec50834e98
|
Load osu!direct overlay to "newest maps" tab by default
|
2017-09-27 12:23:48 +08:00 |
|
Dean Herbert
|
05c6829deb
|
Move all APIAccess State changes to the local thread
Previously changes to the state were triggering events like Logout, which could get things into a bad state.
|
2017-09-27 12:18:24 +08:00 |
|
Dean Herbert
|
bbc990a6fd
|
Assign a name to individual import tests to avoid file contention
|
2017-09-27 11:26:56 +08:00 |
|
Dean Herbert
|
3018d32b13
|
Close BeatmapSetOverlay when clicking outside of it
|
2017-09-27 11:22:47 +08:00 |
|
Dean Herbert
|
d5ed218488
|
Fix timeline sizes being updated potentially before the track has a length
|
2017-09-27 11:07:43 +08:00 |
|
Dean Herbert
|
7ad21d9a6d
|
Simplify marker part construction
|
2017-09-27 11:07:23 +08:00 |
|
Dean Herbert
|
eae29820c0
|
Fix marker being cleared each beatmap change
|
2017-09-27 11:07:17 +08:00 |
|
Dean Herbert
|
708632bca8
|
Remove second unnecessary colour set
|
2017-09-27 10:06:36 +08:00 |
|
EVAST9919
|
c696f74578
|
Fix broken testcase and apply suggested changes
|
2017-09-27 01:10:48 +03:00 |
|
EVAST9919
|
3cd6319ffa
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
|
2017-09-27 00:32:38 +03:00 |
|
Dean Herbert
|
3fd4a97a19
|
Merge pull request #1278 from Damnae/storyboard_integration
Storyboard integration
|
2017-09-26 20:47:07 +08:00 |
|
Dean Herbert
|
7c70d3d2cb
|
Merge branch 'master' into storyboard_integration
|
2017-09-26 20:19:26 +08:00 |
|
Dean Herbert
|
9892572db4
|
Merge pull request #1312 from Xinnoh/patch-1
changed description for hidden
|
2017-09-26 20:12:46 +08:00 |
|
Dean Herbert
|
00067d0d18
|
Merge branch 'master' into patch-1
|
2017-09-26 19:28:03 +08:00 |
|
Dean Herbert
|
76cba2b311
|
Merge pull request #1299 from smoogipoo/editor-timing-timeline
Initial implementation of the editor summary timeline
|
2017-09-26 19:27:34 +08:00 |
|
smoogipoo
|
10dbd68c1e
|
Simplify null check
|
2017-09-26 20:11:45 +09:00 |
|
smoogipoo
|
c578509a20
|
Bind to the screen Beatmap instead of the game-wide Beatmap
|
2017-09-26 17:58:40 +09:00 |
|
Sinnoh
|
3b9c2d1d5f
|
changed description for hidden
ctb doesn't have approach circles
|
2017-09-26 16:50:12 +08:00 |
|
smoogipoo
|
3937ebdc3d
|
Add missing license headers
|
2017-09-26 15:58:30 +09:00 |
|
Dan Balasescu
|
b8b54e95a5
|
Merge branch 'master' into editor-timing-timeline
|
2017-09-26 15:54:01 +09:00 |
|
smoogipoo
|
10e5fe40b2
|
A bit of cleanup
|
2017-09-26 15:51:45 +09:00 |
|
smoogipoo
|
5953c1084e
|
Re-namespace SummaryTimeline
|
2017-09-26 15:45:27 +09:00 |
|
smoogipoo
|
85cb541fef
|
Implement MarkerPart for the marker
|
2017-09-26 15:45:08 +09:00 |
|
smoogipoo
|
a1f88a17b1
|
Re-namespace and split out timeline parts from the SummaryTimeline
|
2017-09-26 15:44:40 +09:00 |
|
Dean Herbert
|
797e77e651
|
Merge pull request #1253 from DrabWeb/online-beatmap-set-overlay
Online beatmap set overlay
|
2017-09-26 09:17:49 +08:00 |
|
Dean Herbert
|
40f597f762
|
Add download button to grid view panels
|
2017-09-26 00:18:35 +08:00 |
|
Dean Herbert
|
c1081e02b2
|
Close beatmap overlay on stray mouse clicks
|
2017-09-25 23:41:27 +08:00 |
|
Dean Herbert
|
f129902ee0
|
Avoid nullrefs when data is not present
|
2017-09-25 23:35:02 +08:00 |
|
Dean Herbert
|
f9300ec3fe
|
Populate author using existing data for now
|
2017-09-25 23:34:56 +08:00 |
|
Dean Herbert
|
c2bb3ea7bc
|
Add minimal viable implementation of BeatmapSetOver in game
|
2017-09-25 17:58:03 +08:00 |
|
Dean Herbert
|
5be11f539b
|
Rename to BeatmapSetOverlay
|
2017-09-25 17:26:27 +08:00 |
|
Damnae
|
2d4616fd43
|
Apply beatmap settings when creating the DrawableStoryboard.
|
2017-09-25 11:03:57 +02:00 |
|
smoogipoo
|
d86e81f07c
|
Better expression to avoid invalid values
|
2017-09-25 18:00:52 +09:00 |
|
smoogipoo
|
d787c740fa
|
Fix bookmarks not working
We should be dealing with the array in every situation, with the exception of the database.
|
2017-09-25 17:46:51 +09:00 |
|
Damnae
|
0996867112
|
Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard.
|
2017-09-25 10:40:22 +02:00 |
|
smoogipoo
|
7fb8008e44
|
Merge remote-tracking branch 'origin/master' into editor-timing-timeline
# Conflicts:
# osu-framework
|
2017-09-25 17:20:55 +09:00 |
|
Dean Herbert
|
b83596b44d
|
Merge branch 'master' into online-beatmap-set-overlay
|
2017-09-25 16:15:58 +08:00 |
|
Dan Balasescu
|
2d0555b552
|
Merge pull request #1306 from peppy/set-busy-timeout
Add BusyTimeout to avoid hard crashes on database contention
|
2017-09-25 17:14:47 +09:00 |
|
Dan Balasescu
|
c8cad6d9aa
|
Merge branch 'master' into set-busy-timeout
|
2017-09-25 17:05:40 +09:00 |
|
Dean Herbert
|
4151285190
|
Merge pull request #1303 from MrTheMake/chat-commands
Initial implementation of chat commands
|
2017-09-25 15:58:20 +08:00 |
|
Dean Herbert
|
a80f0d4858
|
Merge branch 'master' into chat-commands
|
2017-09-25 15:52:35 +08:00 |
|
Dean Herbert
|
6349c50510
|
Merge pull request #1309 from huoyaoyuan/net46
Use .net 4.6 features
|
2017-09-25 13:26:16 +08:00 |
|
Dean Herbert
|
b6a6042b5c
|
Update framework
|
2017-09-25 13:09:06 +08:00 |
|