Dean Herbert
77c98a34e3
Merge remote-tracking branch 'upstream/master' into user_overlay_tooltip
2017-10-13 17:00:26 +09:00
Dean Herbert
91d64573c3
Merge pull request #1286 from jorolf/direct-previews
...
Add osu!direct previews
2017-10-13 14:27:19 +09:00
Dean Herbert
5b16f5d3b5
Remove unused field
2017-10-13 14:19:25 +09:00
Dean Herbert
f9a1240325
Merge remote-tracking branch 'upstream/master' into direct-previews
2017-10-13 14:06:46 +09:00
Dean Herbert
abf5418080
Apply some renames and refactoring of loading logic
...
Reduced publicly facing properties where possible. Also fixes a potentially bad state issue when the beatmapset was changed while a load was in progress.
2017-10-13 14:06:34 +09:00
Dan Balasescu
7aab21e407
Merge pull request #1355 from peppy/catch-improvements
...
Add (mostly correct) droplets
2017-10-12 22:44:02 +09:00
Dean Herbert
bb6b656ec6
Fix code review issues
2017-10-12 22:27:22 +09:00
Dean Herbert
d234791bdd
Merge remote-tracking branch 'upstream/master' into catch-improvements
2017-10-12 22:25:47 +09:00
Dean Herbert
d9207c0cf6
Merge pull request #1360 from smoogipoo/editor-waveform-timeline
...
Add editor compose mode timeline with waveform display
2017-10-12 22:24:37 +09:00
Dean Herbert
c0d64bf409
Use Gray instead of FromHex for grays
2017-10-12 22:19:29 +09:00
Dean Herbert
37fc69b9f7
Set a default zoom level that isn't the whole track
2017-10-12 22:19:02 +09:00
Dean Herbert
37b88d834e
Adjust padding slightly
2017-10-12 22:10:37 +09:00
Dean Herbert
d98f1a2bb7
Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline
2017-10-12 21:48:08 +09:00
Dean Herbert
24588eeb6a
Merge pull request #1338 from smoogipoo/editor-waveform
...
Waveform display for use in the editor
2017-10-12 21:45:10 +09:00
Dean Herbert
fb8d8ec552
Update framework
2017-10-12 21:26:25 +09:00
Dean Herbert
182bb71eb0
Merge branch 'master' into editor-waveform
2017-10-12 20:49:48 +09:00
Dan Balasescu
8d28999dd6
Merge pull request #1365 from peppy/remove-codeanalysis-reference
...
Remove references to CodeAnalysisRulesets
2017-10-12 20:49:34 +09:00
Dean Herbert
70c55b23f4
Remove references to CodeAnalysisRulesets
...
Having these produce warnings under certain compile environments.
2017-10-12 20:37:20 +09:00
Dean Herbert
af17408cad
Merge pull request #1359 from Tom94/remove-ratio-adjust
...
Remove now obsolete RatioAdjust
2017-10-12 19:43:41 +09:00
Dean Herbert
a22fe901a3
Merge branch 'master' into remove-ratio-adjust
2017-10-12 19:26:03 +09:00
Dean Herbert
1eec6d8167
Merge pull request #1363 from peppy/fix-creator-username
...
Make creatorUsername a property so it is correctly deserialised
2017-10-12 19:23:18 +09:00
Dean Herbert
8a5e25ce4b
Simplify waveform construction
2017-10-12 19:19:42 +09:00
Dean Herbert
4d78a0492c
Make creatorUsername a property so it is correctly deserialised
2017-10-12 19:15:59 +09:00
Thomas Müller
882e4b68bb
Merge branch 'master' into remove-ratio-adjust
2017-10-12 12:05:41 +02:00
Thomas Müller
78a4045154
Merge pull request #1362 from peppy/fix-spm-queue
...
Fix potential read from empty queue in SPM counter
2017-10-12 12:05:24 +02:00
Thomas Müller
d9bf465b9c
Update framework
2017-10-12 11:49:10 +02:00
Dan Balasescu
753383a740
Merge branch 'master' into remove-ratio-adjust
2017-10-12 18:48:32 +09:00
smoogipoo
ab62390336
Make TimelineButtons combined take up the full height of the timeline
2017-10-12 18:32:39 +09:00
Dean Herbert
1b031ca328
Fix potential read from empty queue in SPM counter
2017-10-12 18:28:26 +09:00
smoogipoo
a6901c0a27
Change TimelineButton icon colour to white when hovered
2017-10-12 18:17:36 +09:00
smoogipoo
a5817e6e75
Add a way to change the IconButton icon colour
2017-10-12 18:17:23 +09:00
smoogipoo
f08f7a4ecb
Merge remote-tracking branch 'smoogipoo/editor-waveform' into editor-waveform-timeline
2017-10-12 17:52:40 +09:00
smoogipoo
5ccfc1918e
Hook up more bindables for hitobjects/hitsounds
2017-10-12 17:51:01 +09:00
smoogipoo
db672becbc
Implement waveform checkbox
2017-10-12 17:50:51 +09:00
smoogipoo
3c35a7a6ae
graph -> waveform
2017-10-12 17:37:40 +09:00
Dan Balasescu
18c67dd936
Merge branch 'master' into editor-waveform
2017-10-12 17:32:42 +09:00
smoogipoo
4586877239
Implement magnification buttons
2017-10-12 17:31:21 +09:00
Dan Balasescu
818cbc0082
Merge pull request #1341 from peppy/fix-medal-overlay
...
Fix visual regressions in MedalOverlay
2017-10-12 17:05:17 +09:00
smoogipoo
622659336d
Merge + update framework
2017-10-12 17:02:39 +09:00
Dean Herbert
881eeaa650
Update framework
2017-10-12 16:57:05 +09:00
Dean Herbert
00f7007036
Merge remote-tracking branch 'upstream/master' into fix-medal-overlay
2017-10-12 16:56:40 +09:00
Thomas Müller
78f2037d84
Remove now obsolete RatioAdjust
2017-10-12 09:42:06 +02:00
smoogipoo
de8f9325a3
Implement TimelineButton and use for the magnification buttons
2017-10-12 16:10:33 +09:00
smoogipoo
2844764e3c
Hit Objects/Hit Sounds -> Hitobjects/Hitsounds
2017-10-12 15:37:45 +09:00
smoogipoo
e12fa49436
Integrate timeline into Compose
2017-10-12 15:37:00 +09:00
smoogipoo
6fbf52c3eb
Remove unused usings
2017-10-12 15:32:18 +09:00
smoogipoo
df6409308a
Merge remote-tracking branch 'origin/master' into editor-waveform-timeline
...
# Conflicts:
# osu-framework
2017-10-12 15:32:11 +09:00
Dean Herbert
4a4c01f221
Fix CI problems
2017-10-11 21:25:15 +09:00
EVAST9919
82b333740d
Apply suggestions
2017-10-11 15:20:23 +03:00
EVAST9919
db38438a1e
Merge remote-tracking branch 'refs/remotes/ppy/master' into user_overlay_tooltip
2017-10-11 15:12:17 +03:00
