179542daf1
Standardise AssemblyInfos
2017-10-14 15:02:20 +09:00
c5046f6b3c
Add back osu.Desktop project
...
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.
This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
9385fd1cfa
Merge branch 'master' into better-medal-loading
2017-10-14 12:29:15 +09:00
c3b9644d77
Move infoFlow to local variable
2017-10-14 11:59:18 +09:00
1efb33210f
Only update positions when the medalContainer is loaded.
2017-10-14 11:40:49 +09:00
3644fa46be
Make sure the loading overlay is hidden when preview is user cancelled
2017-10-14 10:53:39 +09:00
2938ca9488
fix loading animation not playing
2017-10-13 20:44:05 +02:00
c660957329
Hide (most) profile sections that aren't populated yet
2017-10-13 20:29:19 +09:00
15373c71b6
Allow scores to open beatmap overlay
...
Reshuffles depth of beatmap and profile overlays for now.
2017-10-13 20:09:03 +09:00
7550b461e3
Add individual beatmap set lookup request
2017-10-13 19:57:59 +09:00
ead88224c5
Move ModIcon tooltip to base implementation
2017-10-13 19:14:43 +09:00
146d800bda
Make weight nullable rather than using weird negative defaults
2017-10-13 19:02:50 +09:00
520b806305
Merge remote-tracking branch 'upstream/master' into ranks-section
2017-10-13 18:49:05 +09:00
070aceef1e
Move font and text size to class ProfileLink class
2017-10-13 17:03:31 +09:00
77c98a34e3
Merge remote-tracking branch 'upstream/master' into user_overlay_tooltip
2017-10-13 17:00:26 +09:00
5b16f5d3b5
Remove unused field
2017-10-13 14:19:25 +09:00
f9a1240325
Merge remote-tracking branch 'upstream/master' into direct-previews
2017-10-13 14:06:46 +09:00
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
bb6b656ec6
Fix code review issues
2017-10-12 22:27:22 +09:00
d234791bdd
Merge remote-tracking branch 'upstream/master' into catch-improvements
2017-10-12 22:25:47 +09:00
c0d64bf409
Use Gray instead of FromHex for grays
2017-10-12 22:19:29 +09:00
37fc69b9f7
Set a default zoom level that isn't the whole track
2017-10-12 22:19:02 +09:00
37b88d834e
Adjust padding slightly
2017-10-12 22:10:37 +09:00
d98f1a2bb7
Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline
2017-10-12 21:48:08 +09:00
182bb71eb0
Merge branch 'master' into editor-waveform
2017-10-12 20:49:48 +09:00
70c55b23f4
Remove references to CodeAnalysisRulesets
...
Having these produce warnings under certain compile environments.
2017-10-12 20:37:20 +09:00
a22fe901a3
Merge branch 'master' into remove-ratio-adjust
2017-10-12 19:26:03 +09:00
8a5e25ce4b
Simplify waveform construction
2017-10-12 19:19:42 +09:00
4d78a0492c
Make creatorUsername a property so it is correctly deserialised
2017-10-12 19:15:59 +09:00
753383a740
Merge branch 'master' into remove-ratio-adjust
2017-10-12 18:48:32 +09:00
ab62390336
Make TimelineButtons combined take up the full height of the timeline
2017-10-12 18:32:39 +09:00
a6901c0a27
Change TimelineButton icon colour to white when hovered
2017-10-12 18:17:36 +09:00
a5817e6e75
Add a way to change the IconButton icon colour
2017-10-12 18:17:23 +09:00
f08f7a4ecb
Merge remote-tracking branch 'smoogipoo/editor-waveform' into editor-waveform-timeline
2017-10-12 17:52:40 +09:00
5ccfc1918e
Hook up more bindables for hitobjects/hitsounds
2017-10-12 17:51:01 +09:00
db672becbc
Implement waveform checkbox
2017-10-12 17:50:51 +09:00
3c35a7a6ae
graph -> waveform
2017-10-12 17:37:40 +09:00
18c67dd936
Merge branch 'master' into editor-waveform
2017-10-12 17:32:42 +09:00
4586877239
Implement magnification buttons
2017-10-12 17:31:21 +09:00
622659336d
Merge + update framework
2017-10-12 17:02:39 +09:00
00f7007036
Merge remote-tracking branch 'upstream/master' into fix-medal-overlay
2017-10-12 16:56:40 +09:00
78f2037d84
Remove now obsolete RatioAdjust
2017-10-12 09:42:06 +02:00
de8f9325a3
Implement TimelineButton and use for the magnification buttons
2017-10-12 16:10:33 +09:00
2844764e3c
Hit Objects/Hit Sounds -> Hitobjects/Hitsounds
2017-10-12 15:37:45 +09:00
e12fa49436
Integrate timeline into Compose
2017-10-12 15:37:00 +09:00
6fbf52c3eb
Remove unused usings
2017-10-12 15:32:18 +09:00
df6409308a
Merge remote-tracking branch 'origin/master' into editor-waveform-timeline
...
# Conflicts:
# osu-framework
2017-10-12 15:32:11 +09:00
82b333740d
Apply suggestions
2017-10-11 15:20:23 +03:00
db38438a1e
Merge remote-tracking branch 'refs/remotes/ppy/master' into user_overlay_tooltip
2017-10-11 15:12:17 +03:00
1a88ffe862
Merge remote-tracking branch 'upstream/master' into catch-improvements
2017-10-11 19:10:18 +09:00
