EVAST9919
|
e7632b6e6f
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
|
2017-09-28 14:44:31 +03:00 |
|
Dean Herbert
|
4eaf6b4b94
|
Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll
|
2017-09-28 00:14:04 +08:00 |
|
Dan Balasescu
|
5dceee2e36
|
Merge branch 'master' into fix-invisible-marker
|
2017-09-27 14:53:58 +09:00 |
|
Dan Balasescu
|
9c14d3b696
|
Merge branch 'master' into api-state-fixes
|
2017-09-27 14:41:25 +09:00 |
|
Dean Herbert
|
e81d9cb5fc
|
Merge branch 'master' into fix-login-overlay
|
2017-09-27 13:17:46 +08:00 |
|
Dan Balasescu
|
43d56bc9d7
|
Merge branch 'master' into fix-invisible-marker
|
2017-09-27 14:17:42 +09:00 |
|
Dean Herbert
|
a17cc04cde
|
Make APIAccess's state only privately settable
|
2017-09-27 13:16:17 +08:00 |
|
Dean Herbert
|
4a95d64239
|
Fix yellow line in login overlay not following size correctly
Also allows right click context menu to correctly extrude beyond the local masking.
|
2017-09-27 13:06:57 +08:00 |
|
Dan Balasescu
|
67481a1e6a
|
Merge branch 'master' into api-state-fixes
|
2017-09-27 14:02:19 +09:00 |
|
Dan Balasescu
|
4881d01b7e
|
Merge branch 'master' into close-beatmap-overlay
|
2017-09-27 13:51:13 +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 |
|
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
|
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
|
7c70d3d2cb
|
Merge branch 'master' into storyboard_integration
|
2017-09-26 20:19:26 +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 |
|
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
|
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
|
c8cad6d9aa
|
Merge branch 'master' into set-busy-timeout
|
2017-09-25 17:05:40 +09:00 |
|
Dean Herbert
|
a80f0d4858
|
Merge branch 'master' into chat-commands
|
2017-09-25 15:52:35 +08:00 |
|
Dean Herbert
|
2c99fa29f0
|
Merge branch 'master' into net46
|
2017-09-25 12:43:35 +08:00 |
|
Dean Herbert
|
0aebfdd578
|
Merge branch 'master' into icons_jumping_fix
|
2017-09-25 12:07:25 +08:00 |
|
Dean Herbert
|
33a9bb6997
|
Merge branch 'master' into set-busy-timeout
|
2017-09-25 12:05:57 +08:00 |
|
Dean Herbert
|
a1b313620c
|
Set a busy timeout when creating an SQLIteConnection
|
2017-09-25 11:51:48 +08:00 |
|
Dan Balasescu
|
a5622bb293
|
Merge branch 'master' into master
|
2017-09-25 09:58:29 +09:00 |
|
Huo Yaoyuan
|
2b11ecec13
|
Remove usings to extensions.
|
2017-09-24 06:03:52 +08:00 |
|