Dean Herbert
1f4a943f74
Fix test case runs not being correctly isolated on mono
2017-10-16 15:23:28 +09:00
Dean Herbert
7049a73490
Remove ValidTypes from databased stored; explicitly expose query methods instead
2017-10-16 14:47:33 +09:00
Dean Herbert
1a16784db9
Add BindingRedirects rule to fix dependency when running via nunit
...
See https://github.com/ErikEJ/EntityFramework.SqlServerCompact/issues/463
2017-10-16 14:18:01 +09:00
Dean Herbert
5b6c331434
Fix all keybindings being reset every startup
2017-10-16 14:12:08 +09:00
Dean Herbert
a5ccf12e4a
Fix ValueTuple mess
2017-10-16 14:04:04 +09:00
Dean Herbert
29b46a5c5e
Add missing reference to System.ValueTuple
2017-10-16 13:23:41 +09:00
Dean Herbert
4981630131
Fix formatting regressions
2017-10-16 13:12:51 +09:00
Dean Herbert
0a6dcdd405
Fix remaining warnings
2017-10-16 13:09:10 +09:00
Dean Herbert
8a0b184dd6
Revert "Return back DatabaseBackedStore's query and populate functions"
...
This reverts commit 7cf5d63cd3
2017-10-16 12:59:59 +09:00
Dean Herbert
04e5f764a3
Revert "Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects"
2017-10-16 12:59:59 +09:00
TocoToucan
56e8c7303c
Revert "Fix inconsistent lock usage in BeatmapManager"
...
This reverts commit 4a064da30f
2017-10-16 12:59:59 +09:00
Dean Herbert
e3d31bdd10
Not implemented instead of incorrect
2017-10-16 12:59:59 +09:00
Dean Herbert
129cca0704
Tidy up context creation
2017-10-16 12:59:59 +09:00
Huo Yaoyuan
5a684f926f
CI fixes.
2017-10-16 12:59:59 +09:00
Huo Yaoyuan
c2836a8393
Use format string for double instead of Math.Round.
2017-10-16 12:59:59 +09:00
Huo Yaoyuan
f837117495
Use localisation engine instead of asking current culture directly.
2017-10-16 12:59:59 +09:00
Huo Yaoyuan
90592b0757
Construct DwarableScore using null weight.
2017-10-16 12:59:59 +09:00
TocoToucan
4a064da30f
Fix inconsistent lock usage in BeatmapManager
2017-10-15 21:56:33 +03:00
Dean Herbert
0a8b3ad619
Add one more licence header
2017-10-16 00:58:56 +09:00
Dean Herbert
a232033469
Fix some file headers and unused files
2017-10-16 00:54:09 +09:00
TocoToucan
db2750592d
Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects
2017-10-15 14:01:35 +03:00
Huo Yaoyuan
06fe874594
CI fixes.
2017-10-15 16:53:30 +08:00
Huo Yaoyuan
9b3676c562
Use format string for double instead of Math.Round.
2017-10-15 16:44:15 +08:00
Huo Yaoyuan
192ebe776f
Use localisation engine instead of asking current culture directly.
2017-10-15 16:30:52 +08:00
Huo Yaoyuan
bed5a64ee2
Construct DwarableScore using null weight.
2017-10-15 16:15:35 +08:00
TocoToucan
7cf5d63cd3
Return back DatabaseBackedStore's query and populate functions
2017-10-15 00:40:41 +03:00
Dean Herbert
89c17ed13e
Initialise batteries
...
Note that this is in the wrong place. But so is the rest of this code.
2017-10-14 21:40:26 +09:00
smoogipoo
9924f518b7
Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
...
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/BeatmapMetadata.cs
# osu.Game/osu.Game.csproj
# osu.Game/packages.config
2017-10-14 16:36:37 +09:00
Dan Balasescu
31b26e1d0a
Merge branch 'master' into back-to-desktop
2017-10-14 16:18:28 +09:00
smoogipoo
167eefa397
Add logging
2017-10-14 15:16:08 +09:00
Dean Herbert
179542daf1
Standardise AssemblyInfos
2017-10-14 15:02:20 +09:00
Dean Herbert
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
smoogipoo
b178be21d1
Let's not rename columns yet
2017-10-14 14:30:58 +09:00
Dean Herbert
37ed710cbe
Merge branch 'master' into fix-duplicate-user
2017-10-14 13:36:53 +09:00
smoogipoo
674ad4a30c
Fix compile errors
2017-10-14 12:49:03 +09:00
smoogipoo
b83d7cd4df
Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
...
# Conflicts:
# osu-framework
# osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
# osu.Game/Beatmaps/BeatmapInfo.cs
# osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
2017-10-14 12:38:59 +09:00
Dean Herbert
9385fd1cfa
Merge branch 'master' into better-medal-loading
2017-10-14 12:29:15 +09:00
Dean Herbert
ed152c08ac
Fix regressions
2017-10-14 12:27:32 +09:00
smoogipoo
c3b9644d77
Move infoFlow to local variable
2017-10-14 11:59:18 +09:00
smoogipoo
1efb33210f
Only update positions when the medalContainer is loaded.
2017-10-14 11:40:49 +09:00
Dean Herbert
cd722e4abb
Fix beatmap author being stored in two different places
2017-10-14 11:39:55 +09:00
Dean Herbert
3644fa46be
Make sure the loading overlay is hidden when preview is user cancelled
2017-10-14 10:53:39 +09:00
Jorolf
2938ca9488
fix loading animation not playing
2017-10-13 20:44:05 +02:00
Dean Herbert
c660957329
Hide (most) profile sections that aren't populated yet
2017-10-13 20:29:19 +09:00
Dean Herbert
15373c71b6
Allow scores to open beatmap overlay
...
Reshuffles depth of beatmap and profile overlays for now.
2017-10-13 20:09:03 +09:00
Dean Herbert
7550b461e3
Add individual beatmap set lookup request
2017-10-13 19:57:59 +09:00
Dean Herbert
ead88224c5
Move ModIcon tooltip to base implementation
2017-10-13 19:14:43 +09:00
Dean Herbert
146d800bda
Make weight nullable rather than using weird negative defaults
2017-10-13 19:02:50 +09:00
Dean Herbert
520b806305
Merge remote-tracking branch 'upstream/master' into ranks-section
2017-10-13 18:49:05 +09:00
Dean Herbert
070aceef1e
Move font and text size to class ProfileLink class
2017-10-13 17:03:31 +09:00
Dean Herbert
77c98a34e3
Merge remote-tracking branch 'upstream/master' into user_overlay_tooltip
2017-10-13 17:00:26 +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
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
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
182bb71eb0
Merge branch 'master' into editor-waveform
2017-10-12 20:49:48 +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
a22fe901a3
Merge branch 'master' into remove-ratio-adjust
2017-10-12 19:26:03 +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
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
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
smoogipoo
622659336d
Merge + update framework
2017-10-12 17:02:39 +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
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
Dean Herbert
1a88ffe862
Merge remote-tracking branch 'upstream/master' into catch-improvements
2017-10-11 19:10:18 +09:00
Huo Yaoyuan
cf7f3411fc
Ignore filename case in BeatmapManager. Fixes #1295 .
2017-10-11 15:01:02 +08:00
Dean Herbert
71fc5c4da2
Merge branch 'master' into fix-storyboard-exception
2017-10-11 12:26:34 +09:00
Dean Herbert
6de100d446
Merge branch 'master' into iconbutton-refactor
2017-10-11 12:05:38 +09:00
TocoToucan
4653470779
Fix RulesetStore preparation
2017-10-10 22:29:16 +03:00
TocoToucan
8b01f8671f
Merge from ppy/master
2017-10-10 21:07:36 +03:00
Dean Herbert
03fbf47bc2
Add juicy streams
2017-10-10 20:22:42 +09:00
smoogipoo
b8d2a04fe1
Only split beatmap lines twice
2017-10-10 19:24:24 +09:00
smoogipoo
ad344eb719
Use IsNullOrWhiteSpace instead of trimming
2017-10-10 19:21:38 +09:00
smoogipoo
8cea875f5f
Remove unused using
2017-10-10 18:35:30 +09:00
smoogipoo
c2f3c0e6df
Add TestCaseIconButton to demonstrate IconButton usages
2017-10-10 18:32:09 +09:00
smoogipoo
071b1b049c
Fix properties not being set leading to colours not being set
2017-10-10 18:31:56 +09:00
smoogipoo
44141a38b8
Make it possible to change colours before load()
2017-10-10 18:04:41 +09:00
smoogipoo
bbd1a7059e
xmldoc + hook up IconColour
2017-10-10 17:25:39 +09:00
smoogipoo
d7fb59ee0e
Expose colours of IconButton
2017-10-10 17:20:23 +09:00
