1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 02:27:25 +08:00
Commit Graph

5638 Commits

Author SHA1 Message Date
smoogipoo
6fba6eddbf Merge branch 'text-transform' into replay-rewinding 2017-11-04 00:48:42 +09:00
smoogipoo
edd0d166b1 Add text transforms to OsuSpriteText 2017-11-04 00:42:36 +09:00
smoogipoo
3b189c1ffe Fix BreakOverlay not properly working with rewinding
In various ways:
* It wouldn't show up if rewound after the break was complete.
* The time would increase backwards if rewind happened during a break.
* Etc.
* Basically the fix is to use transformations everywhere. BreakOverlay could be refactored further, but this is enough to make it work for now.
2017-11-03 21:20:36 +09:00
Dean Herbert
3adcfa8c38 Many fixes 2017-11-03 17:54:35 +09:00
Dean Herbert
2f205d1f63 Merge branch 'single-osu-logo' into intro-v2 2017-11-03 15:37:24 +09:00
Dean Herbert
6a206c616b Update in line with framework changes 2017-11-03 14:34:12 +09:00
smoogipoo
0620d0bd7a AllJudged does not need to be virtual anymore 2017-11-02 21:56:09 +09:00
smoogipoo
326891f51c Add "Final" to better determine when to stop processing the hitobject 2017-11-02 21:54:28 +09:00
Dean Herbert
8f78d84ad6 Make intro resume slower 2017-11-02 21:52:23 +09:00
Dean Herbert
c99ffb4aa3 Fix potential nullref 2017-11-02 21:52:12 +09:00
Dean Herbert
9b2d41f4eb Fix quick retry looking bad 2017-11-02 21:52:01 +09:00
smoogipoo
8ee13ef0ae Properties are unnecessary 2017-11-02 21:33:31 +09:00
smoogipoo
fe00ac7e41 Make DrawableHitObject/ScoreProcessor support rewinding 2017-11-02 21:21:07 +09:00
Dean Herbert
b8b05fe8d2 Make the osu! logo shared game-wide
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
2017-11-02 20:38:02 +09:00
Dean Herbert
b0785b2f09 Fix a possible horrendous endless auth loop 2017-11-02 20:26:26 +09:00
smoogipoo
f219b7f9fb Fix bonusScore being stored locally instead of incrementally changing 2017-11-02 19:31:30 +09:00
Dan Balasescu
05e5e3d279
Merge branch 'master' into fix-visualtests-configuration 2017-11-01 17:33:15 +09:00
Dean Herbert
ed89f03900 Make ParallaxContainer public 2017-11-01 17:10:59 +09:00
Dean Herbert
6fa02ce9bb Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
Dean Herbert
27156aeb93 Fix the shit 2017-11-01 17:07:03 +09:00
Dean Herbert
fd5bc6fe58 Make ParallaxContainer public 2017-11-01 17:06:55 +09:00
Dean Herbert
09e0bd7a78 Remove unused class file 2017-11-01 16:58:12 +09:00
Dean Herbert
15197b9a76 Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 16:57:59 +09:00
Dean Herbert
d6c86ebcb1 Merge branch 'master' into intro 2017-11-01 15:38:14 +09:00
Dean Herbert
8138796ee3 Fix VisualTests configuration being completely wrong 2017-11-01 14:53:33 +09:00
smoogipoo
687a850216 Merge remote-tracking branch 'origin/master' into migrate-osu-game 2017-11-01 12:57:55 +09:00
smoogipoo
3462fdcad9 Remove some apparently unneeded references from osu.Game 2017-10-31 16:57:01 +09:00
smoogipoo
9b1ec83eb4 Propagate sqlite build assets to parent projects 2017-10-31 16:56:50 +09:00
Dean Herbert
ca8afc0c80 Merge remote-tracking branch 'upstream/master' into intro 2017-10-31 15:49:28 +09:00
Dean Herbert
ba7c0695c5
Merge branch 'master' into delayed-load 2017-10-30 22:48:33 +09:00
smoogipoo
7b72c6d811 Merge branch 'master' into webrequest-updates 2017-10-30 22:39:01 +09:00
smoogipoo
04b271cce9 Migrate osu.Game project to VS2017 project structure 2017-10-30 22:24:11 +09:00
smoogipoo
437b6d67a4 Merge branch 'webrequest-updates' into migrate-osu-game 2017-10-30 22:10:30 +09:00
smoogipoo
cd5324f1d1 Update API code to use the new Add* methods on requests 2017-10-30 21:33:44 +09:00
Dean Herbert
f486ab1f6c
Merge branch 'master' into song_select_delete 2017-10-30 21:07:02 +09:00
Dean Herbert
d871c3fdda Fix test not working due to null refs 2017-10-30 20:55:23 +09:00
Dean Herbert
d8b3f984f5
Merge branch 'master' into webrequest-updates 2017-10-30 19:50:45 +09:00
Dean Herbert
1ae0eff6ad Add some sanity to request/drawable creation logic 2017-10-30 19:40:42 +09:00
Dean Herbert
23a729c83a Make avatars use a delayed load wrapper 2017-10-30 19:39:23 +09:00
Dean Herbert
a51e64b2d1 Remove unnecessary schedule 2017-10-30 19:16:16 +09:00
Dean Herbert
069f4b1fcf Make DrawableScore abstract and move shared class to own file 2017-10-30 19:15:19 +09:00
Dean Herbert
096998d5f4 Fix user bindable being assigned rather than bound 2017-10-30 19:08:15 +09:00
Dean Herbert
b660366d96 ScoreContainer -> PaginatedScoreContainer 2017-10-30 19:06:40 +09:00
Dean Herbert
dce7d1c910 Move pp score representation to own file 2017-10-30 19:05:13 +09:00
Dean Herbert
fcb88de626
Merge branch 'master' into recent-scores 2017-10-30 18:48:26 +09:00
smoogipoo
f94505243d Use AllowRetryOnTimeout where to maintain previous functionality 2017-10-30 17:28:53 +09:00
Dean Herbert
7bc0ef44f2
Merge branch 'master' into beatmap-preview-fix 2017-10-30 16:22:47 +09:00
Dean Herbert
eccf56a551
Merge branch 'master' into settingsitem-getboundcopy 2017-10-30 16:20:39 +09:00
smoogipoo
b59401357e Remove singular RetryCount usage, update framework 2017-10-27 12:53:08 +09:00
EVAST9919
a7bcae4869 Add startup value for the slider 2017-10-26 15:18:06 +03:00
EVAST9919
08637253df Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-26 15:04:44 +03:00
EVAST9919
189b51551d Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-26 14:40:40 +03:00
Shane Woolcock
22d222354c Change SettingsItem to use GetBoundCopy to ensure it has the right class for numeric bindables 2017-10-26 18:45:20 +10:30
smoogipoo
bfee3317aa Update WebRequest usage in-line with framework 2017-10-26 16:37:44 +09:00
DerpyCrabs
de10300675 Fix case-sensitive linux build 2017-10-26 10:44:38 +07:00
Jorolf
b2c3ba05d7 remove redundant stuff 2017-10-25 20:15:45 +02:00
Jorolf
0449639f41 remove inner classes and make User property a bindable 2017-10-25 20:07:12 +02:00
Dean Herbert
b89112c2a1 Fix incorrect alignment 2017-10-25 23:56:18 +09:00
Dean Herbert
41cc2f725a Fix incorrect comment 2017-10-25 23:56:10 +09:00
Dean Herbert
4d4b505ef7 Add AsNoTracking to common read-only queries 2017-10-25 23:56:05 +09:00
Dean Herbert
c260b0d2a5 Explicitly return list 2017-10-25 23:53:09 +09:00
Dean Herbert
e62928102c Merge remote-tracking branch 'upstream/master' into user-iqueryable 2017-10-25 23:49:56 +09:00
Dean Herbert
ead3ca1f27 Merge branch 'master' into fix-threaded-context-issues 2017-10-25 23:42:08 +09:00
Dan Balasescu
e2ee76332f Merge branch 'master' into fix-threaded-context-issues 2017-10-25 23:30:28 +09:00
Dean Herbert
4ef80ee6c4 Fix potential incorrect update in KeyBindingStore 2017-10-25 23:21:47 +09:00
Dan Balasescu
ffec5dd717 Merge branch 'master' into add-missing-indices 2017-10-25 22:58:26 +09:00
Dean Herbert
6f7ba55f80 Fill out xmldoc 2017-10-25 22:19:47 +09:00
Dean Herbert
c1d133977e FirstOrDefault -> SingleOrDefault 2017-10-25 22:17:17 +09:00
Dean Herbert
da01e81fc4 Async direct panel lookup 2017-10-25 22:14:47 +09:00
Dean Herbert
ed84cd2035 Greatly improve performance of direct panel loading
Still needs to be async'd
2017-10-25 22:14:41 +09:00
Dean Herbert
90af472717 Cache available rulesets as they are pretty static for now 2017-10-25 22:14:36 +09:00
Dean Herbert
2d0f4d3859 Fix OnlineBeatmapSetID not being correctly populated 2017-10-25 22:14:16 +09:00
Dean Herbert
195d75d045 Flip flop let's expose IEnumerables for now 2017-10-25 22:12:20 +09:00
Dean Herbert
4e1922c556 Fix query methods not using IQueryable/Expressions
No database-level where clauses were being used in many cases they should be.
2017-10-25 22:10:45 +09:00
Dean Herbert
a5fb700229 Fix KeyBinding updates 2017-10-25 22:08:56 +09:00
Dean Herbert
5001e9f264 Fix Hide/Restore/Delete etc. 2017-10-25 22:08:34 +09:00
Dean Herbert
8452e315f4 Allow "refreshing" instances via DatabaseBackedStore 2017-10-25 22:06:25 +09:00
Dean Herbert
487b888f4f Add missing database indices
Also add missing unique constraints where applicable.
2017-10-25 22:05:10 +09:00
Dan Balasescu
d927e57af6 Merge branch 'master' into fix-direct-import-stall 2017-10-25 21:48:27 +09:00
Dan Balasescu
946288ba2e Merge branch 'master' into fix-direct-import-stall 2017-10-25 21:46:00 +09:00
Dan Balasescu
05e1a7a5f8 Merge branch 'master' into online-beatmap-id-sanity 2017-10-25 21:38:33 +09:00
TocoToucan
5107489cda Remove DatabaseBackedStore Reset functions 2017-10-25 15:12:14 +03:00
TocoToucan
63fe569afa Remove DatabaseBackedStore Prepare functions 2017-10-25 14:53:20 +03:00
Dean Herbert
66f1d2fb2e Ensure all parsed "Online" IDs are above zero or null
Some .osu file sources (or database sources) may be in a bad state. We want to get these ones right as they cannot be enforced by the database itself (via FKs or constraints).
2017-10-25 14:34:39 +09:00
Dean Herbert
f1f7557f6e Add importing state to download notification 2017-10-25 11:49:00 +09:00
Dean Herbert
040fa3aa15 Fix import after direct download being scheduled to update thread
Caused a stall as experienced in #1364.
2017-10-25 11:43:30 +09:00
Dean Herbert
c765785d00 Mark several long-running tasks as long-running 2017-10-25 11:42:55 +09:00
Jorolf
a2dfef301a remove unused parameters 2017-10-24 20:56:05 +02:00
Jorolf
f65d4b626e don't use c# 7 feature 2017-10-24 20:46:15 +02:00
Jorolf
9109b1b3f1 Merge branch 'master' of git://github.com/ppy/osu into recent-scores 2017-10-24 20:34:26 +02:00
Jorolf
aadc699e73 show recent scores 2017-10-24 20:31:38 +02:00
Dean Herbert
15b9307b6c Fix WaveOverlayContainer appearing incorrectly on first PopIn 2017-10-24 20:26:27 +09:00
Dean Herbert
808c97fcb4 Fix multiple requests potentially being triggered during connect sequence
As the Success callbacks happen in a scheduled context, if the Update thread is in a stalled state, this loop can generate many unnecessary API requests.
2017-10-24 17:13:59 +09:00
Dean Herbert
4eef9c0067 Merge branch 'master' into bugfix-nofail-scoreprocessor 2017-10-24 15:48:42 +09:00
Jacob Odgård Tørring
493fe1d621 Makes HasFailed private set and removes alreadyFailed 2017-10-24 08:34:10 +02:00
Jacob Odgård Tørring
86419e0ded Merge remote-tracking branch 'upstream/master' into bugfix-nofail-scoreprocessor 2017-10-24 08:05:31 +02:00
Dean Herbert
542c6501a7 Fix VolumeControl and OnScreenDisplay being added to the wrong container 2017-10-24 13:10:17 +09:00
Dean Herbert
635f26badc Remove unnecessary using 2017-10-24 11:59:57 +09:00
Dan Balasescu
ecd641c44a Merge branch 'master' into startup-load-improvements 2017-10-24 11:54:31 +09:00
Dean Herbert
9ec870a821 Add comment pertaining to why Schedule() is required 2017-10-24 11:50:18 +09:00
Dean Herbert
e98bfec644 Remove Thread.Sleep and tidy up new method 2017-10-24 11:40:38 +09:00
Dean Herbert
00bb82215b Merge branch 'master' into revert-to-default-glow 2017-10-24 10:48:08 +09:00
Dan Balasescu
9eab2deee7 Merge branch 'master' into config-slider-keyboardstep 2017-10-24 10:10:39 +09:00
Dean Herbert
0e04260b3c Move ToolbarUserArea initialisation to BDL 2017-10-24 10:08:42 +09:00
Dean Herbert
777cdcbdc1 Load even more components async 2017-10-24 10:08:42 +09:00
Dean Herbert
9b7d569a65 Add a single-file loading sequence for main components
This stops aync loading from getting overloaded with tasks, which was happening previously.
2017-10-24 10:08:42 +09:00
Dan Balasescu
cf6079fd07 Merge branch 'master' into import-test-fixes 2017-10-24 09:36:48 +09:00
Dean Herbert
4e4f6c1a47 Merge branch 'master' into update-framework 2017-10-24 08:14:58 +09:00
Dean Herbert
26d8b67f25 Merge branch 'master' into config-slider-keyboardstep 2017-10-24 08:14:56 +09:00
Dean Herbert
b877177b83 Merge branch 'master' into bugfix-nofail-scoreprocessor 2017-10-24 08:14:54 +09:00
Dean Herbert
ffe94ea880 Merge branch 'master' into revert-to-default-glow 2017-10-24 08:14:53 +09:00
Dean Herbert
22b3f5dd19 Merge remote-tracking branch 'upstream/master' into import-test-fixes 2017-10-23 22:03:37 +09:00
Dean Herbert
dc9c474033 Move all TestCases to Testing project
This allows tests to successfully retrieve rulesets, as they are referenced.
2017-10-23 19:32:02 +09:00
Dean Herbert
1a3debc91d Ensure thread safety on shared contexts
Let's call this one temporary.
2017-10-23 17:56:04 +09:00
Dean Herbert
e7931ef4c7 Add a default icon when a ruleset isn't present 2017-10-23 17:32:28 +09:00
Dean Herbert
df20845fbb Share one context per file store for performance reasons
There is now a CreateContext method for retrieving a stand-alone context for threaded use.

We may want to add safety against this context being disposed (or just return a fresh one if it is).
2017-10-23 16:35:35 +09:00
Dean Herbert
4a68dd88cb Centralise BeginTransaction and disable transaction use for now 2017-10-23 14:53:13 +09:00
Dean Herbert
8fab6abf90 Update WebRequest usage in line with framework changes 2017-10-23 14:46:17 +09:00
Shane Woolcock
ea2934d92c Add KeyboardStep values for configuration options 2017-10-23 16:06:08 +10:30
Dean Herbert
1b455019a8 Merge remote-tracking branch 'upstream/master' into revert-to-default-glow 2017-10-23 11:56:17 +09:00
Nabile Rahmani
5af6fb41f5 Fixed .NET Standard build on Linux. 2017-10-23 02:03:46 +02:00
Jacob Odgård Tørring
9b54e834d9 Implements virtual Failcondition in scoreprocessor and enforces nofail in UpdateFailed 2017-10-22 20:32:59 +02:00
Dean Herbert
c089842adf Merge branch 'master' into import-test-fixes 2017-10-23 02:21:42 +09:00
DerpyCrabs
cf468d6708 Fix linux build
Build is failing on linux because of case sensitive file system. This change fixes it.
2017-10-22 20:14:38 +07:00
Dean Herbert
61c1dd3636 Don't output database logs unless DEBUG_DATABASE is specified compile-time 2017-10-22 19:46:08 +09:00
Dean Herbert
7ba22f0028 Merge remote-tracking branch 'upstream/master' into import-test-fixes 2017-10-22 17:50:03 +09:00
Dan Balasescu
9a005fb63a Merge branch 'master' into key-binding-store-improvements 2017-10-22 17:33:43 +09:00
Dean Herbert
5b2219a692 Add back test cleanup before run 2017-10-22 16:20:04 +09:00
Dean Herbert
1514d8451e Use a more elegant method of setting the connection timeout 2017-10-22 16:20:04 +09:00
Dean Herbert
9aa46bfb0d Add transaction usage for key binding defaults 2017-10-22 16:17:55 +09:00
Dean Herbert
29fcd210aa Centralise transaction committing 2017-10-22 16:17:40 +09:00
Dean Herbert
39b356880e Fix typo 2017-10-22 15:32:47 +09:00
Dean Herbert
6818ebdaff Change the way migrations are checked for
This method allows switching between sqlite-net and EF builds without completely breaking. Note that DB migration still only happens in a forward direction, but this will allow switching back and forth without eventually being unable to start the game.
2017-10-22 15:27:16 +09:00
Shane Woolcock
2e6a68d358 Rename indicator class, add colour/fade easing, and add tooltip 2017-10-22 16:12:30 +10:30
Dean Herbert
f45eb96a5b Merge remote-tracking branch 'upstream/master' into revert-to-default-glow 2017-10-22 13:27:53 +09:00
Shane Woolcock
5785af9f6a Reenable revert indicator on audio device since the potential crash was addressed in #1101 2017-10-22 14:22:57 +10:30
Dean Herbert
1a7e23b5c1 Don't query database on keypress 2017-10-21 23:39:31 +09:00
Dean Herbert
4f392a867a Use a transaction for key binding population 2017-10-21 23:39:24 +09:00
Shane Woolcock
59b10981dc CI fixes 2017-10-21 17:06:28 +10:30
Shane Woolcock
f5946c0e07 Fix wrong license header 2017-10-21 16:28:03 +10:30
Shane Woolcock
840ba9f48e Allow the default indicator colour to be specified, and fix bug where disabled bindables could be reset 2017-10-21 16:05:37 +10:30
Shane Woolcock
b4d575fbcd Fix namespace and unnecessary using 2017-10-21 13:22:21 +10:30
Shane Woolcock
290fac8990 Temporarily disable revert functionality for audio device, since it crashes 2017-10-21 13:17:03 +10:30
Shane Woolcock
98044a17d3 Fix misaligned settings buttons 2017-10-21 13:16:06 +10:30
Shane Woolcock
2c7343e965 Add revert-to-default glow for settings items 2017-10-21 12:44:47 +10:30
Dean Herbert
270f984ae7 Merge remote-tracking branch 'upstream/master' into db-migration-fixes 2017-10-21 00:15:21 +09:00
Dean Herbert
47213d2498 Rely on storage.DeleteDatabase for guaranteed database deletion
Relies on https://github.com/ppy/osu-framework/pull/1100 being merged for most effectiveness.
2017-10-21 00:15:02 +09:00
Dan Balasescu
a9b9d82b74 Merge branch 'master' into fix-ef-hiding 2017-10-20 17:22:50 +09:00
Dean Herbert
b805174143 Output the inner exception to the log when possible 2017-10-20 14:33:35 +09:00
Dean Herbert
980a6c93b4 Merge branch 'master' into fix-ef-hiding 2017-10-20 14:24:46 +09:00
Dean Herbert
f18a3117a2 Merge branch 'master' into notification-thread-safety 2017-10-20 14:24:33 +09:00
Dean Herbert
f9d5eadd05 Fix TestCase failing in an infinite loop 2017-10-20 12:21:18 +09:00
Dean Herbert
35ce6fd2bd Merge branch 'master' into notification-thread-safety 2017-10-20 11:48:14 +09:00
Dean Herbert
93b2fc6dc5 Fix issues with deletion
Main fix is avoiding nullrefs being thrown when metadata isn't present on a beatmap (quite a common scenario).
2017-10-20 11:18:08 +09:00
Dean Herbert
f69fa0cf1f Fix selection after hiding all difficulties in a set 2017-10-20 11:16:56 +09:00
Dean Herbert
7f83cf6780 Fix hiding not always working
Because we are not sharing a single context, we need to use Update to attach the entity to the local context.
2017-10-20 11:16:45 +09:00
Dean Herbert
d32059a7ba Ignore include-ignore warnings for now 2017-10-20 09:25:54 +09:00
Dean Herbert
ca78078436 Add more logging output 2017-10-20 08:06:07 +09:00
Dean Herbert
0e1328a30e Add maximum try count before bailing 2017-10-20 08:01:38 +09:00
Dean Herbert
efaf98c5cf Allow recovery from a very broken database 2017-10-20 00:48:27 +09:00
Dean Herbert
9b1ed5b3aa Keep trying until delete succeeds
Turns out it can fail if file handles are still open.
2017-10-19 23:33:27 +09:00
Dean Herbert
d9fd05a5af Hidden cannot be null 2017-10-19 23:19:30 +09:00
Dean Herbert
8aea6068ba Add fallback logic for the case where previous database can't be migrated 2017-10-19 21:37:09 +09:00
Dan Balasescu
afaf3b4116 Merge branch 'master' into notification-thread-safety 2017-10-19 21:12:53 +09:00
Dean Herbert
1672e0d6b6 Add fallback logic in case migration fails
Nuke it all.
2017-10-19 21:11:43 +09:00
Dean Herbert
1fbbee14e4 Allow migration from sqlite-net to EF
Bonus stage
2017-10-19 20:04:59 +09:00
Dean Herbert
f7d0df1743 Fix beatmap difficulty and metadata deletion 2017-10-19 17:50:46 +09:00
Dean Herbert
b02dd196f6 Don't make one factory each context
A factory is supposed to be re-used.
2017-10-19 17:29:39 +09:00
Dean Herbert
36c00577af Reduce database log output
Also hard-disables it for uninteresting log levels, providing a further performance boost.
2017-10-19 16:35:06 +09:00
Dean Herbert
12900a8b15 Remove unnecessary second call to AutoTransactionsEnabled 2017-10-19 15:53:11 +09:00
Dean Herbert
908c6d827f ValueTuple please 2017-10-19 14:49:23 +09:00
Dean Herbert
5d5ea5fb2e Fix all remaining db structure issues 2017-10-19 14:05:11 +09:00
Dean Herbert
71d614b813 FIx missing columns yet again 2017-10-18 21:57:54 +09:00
Dean Herbert
ac4b2797dc valuetuple nightmare 2017-10-18 20:07:25 +09:00
Dean Herbert
0dac770e38 Remove TestCase cleanup temporarily until context disposal is sorted 2017-10-18 19:52:08 +09:00
Dean Herbert
b73b4755eb Ignore r# locked context inspection here 2017-10-18 18:41:04 +09:00
Dean Herbert
a85de09c0f Fix beatmap carousel interactions with deletion when not yet displayed 2017-10-18 18:36:35 +09:00
Dean Herbert
668f68dd63 Remove some unnecessary update calls 2017-10-18 18:27:57 +09:00
Dean Herbert
4841d4a937 Fix deletion and use single context for imports and deletions for now 2017-10-18 18:27:17 +09:00
Dean Herbert
cf5290fead Remove unnecessary locking; operations are now thread-safe 2017-10-18 13:48:15 +09:00
Dean Herbert
2f3319552d Merge remote-tracking branch 'upstream/master' into EfCore 2017-10-18 11:43:37 +09:00
EVAST9919
bae91d7de7 Simplify gradient usage in Letterbox Overlay 2017-10-18 05:06:17 +03:00
Dean Herbert
518e5a2245 Make ProgressNotification's status and progress thread-safe
Quite regularly a task will hold a reference to a progress notification and udpate it as progress is made. Therefore these operations should be thread-safe.
2017-10-18 10:07:20 +09:00
Dean Herbert
4193004fbf Improve performance of imports by keeping a context hot 2017-10-17 20:29:47 +09:00
Dean Herbert
4e8019b313 Add some more missing indices 2017-10-17 19:59:22 +09:00
Dean Herbert
e4a066dc5f Run cleanup tasks only on startup via manual calls 2017-10-17 19:58:33 +09:00
Dean Herbert
b9d0fb96ed Fix cascade deletions 2017-10-17 18:26:28 +09:00
Dean Herbert
12639c6819 Use a different database name for now to avoid conflicts when switching versions 2017-10-17 17:52:20 +09:00
Dean Herbert
3e415e3269 Fix tooling failures 2017-10-17 17:52:02 +09:00
Dean Herbert
0177fcbe5f Fix xmldoc 2017-10-17 17:08:47 +09:00
Dean Herbert
7a18d373ec Improve performance of beatmap imports (still needs revision) 2017-10-17 17:08:42 +09:00
Dean Herbert
64dfce258f Fix file prefix not being read when calling storage.Exists 2017-10-17 17:08:19 +09:00
Dean Herbert
e02640637a Fix KeyBindingStore regression 2017-10-17 17:08:01 +09:00
Dean Herbert
ad54ca9268 Fix TestCasePlaySongSelect 2017-10-17 16:04:54 +09:00
Dean Herbert
cf3881b18c Fix not being able to restore hidden beatmaps via context menu 2017-10-17 15:50:52 +09:00
Dean Herbert
e487b6f82a Standardise context retrieval 2017-10-17 15:50:42 +09:00
Dean Herbert
cd41862e3b Add back transaction support for beatmap importing 2017-10-17 15:00:27 +09:00
Dean Herbert
fe44a28d48 Add back startup tasks runner 2017-10-17 12:46:38 +09:00
Dean Herbert
66894d11ea Connection -> context 2017-10-17 12:46:29 +09:00
Dean Herbert
c92e0e2dc1 Fix username display on beatmap panels 2017-10-17 11:24:59 +09:00
Dean Herbert
0df474accb Simplify file storing 2017-10-17 11:22:50 +09:00
Dean Herbert
31dc5c97f2 Fix intro and duplicate inserts 2017-10-17 11:22:42 +09:00
Dean Herbert
ef10bb73db osu.Game csproj fixes 2017-10-17 10:31:54 +09:00
Dean Herbert
799f510217 FileStore logic fixes 2017-10-17 10:25:18 +09:00
Dean Herbert
81476ebe75 Correct and simplify BeatmapStore and BeatmapManager 2017-10-17 10:17:21 +09:00
Dean Herbert
eff1c20e38 CI fixing 2017-10-16 22:00:54 +09:00
Dean Herbert
e378d0685d Remove weird additions 2017-10-16 20:37:10 +09:00
Dean Herbert
9ee6d1e3f9 Correct and simplify KeyBindingStore 2017-10-16 18:42:49 +09:00
Dean Herbert
acc299c7b9 Correct and simplify RulesetStore 2017-10-16 17:02:31 +09:00
Dean Herbert
ec51314e37 Remove duplicate command 2017-10-16 16:11:34 +09:00
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
EVAST9919
e3ce641ea0 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-15 00:15:25 +03:00
EVAST9919
bd7bc2c0d2 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-preview-fix 2017-10-15 00:14:59 +03:00
EVAST9919
f4428980a6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-15 00:10:15 +03:00
EVAST9919
24ca7a5119 Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-15 00:09:50 +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
EVAST9919
e8f85a08b8 Fix audio preview still playing after closing the beatmap overlay 2017-10-14 05:58:06 +03: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
EVAST9919
6711331f66 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-14 05:18:03 +03:00
EVAST9919
7a72f2e3f5 Make sure we restore the clock rate on exiting 2017-10-14 05:15:18 +03:00
EVAST9919
bdcc70e0bb Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-14 05:06:36 +03:00
EVAST9919
502940ddf3 Fix deleting last visible beatmap doesn't trigger selecting null beatmap 2017-10-14 05:05:38 +03:00
EVAST9919
c5de97a06f Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-14 05:05:01 +03:00
Dean Herbert
3644fa46be Make sure the loading overlay is hidden when preview is user cancelled 2017-10-14 10:53:39 +09:00
EVAST9919
583f8358b6 Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-14 04:32:12 +03: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