Roman Kapustin
8702a70524
Resolve merge conflicts in DirectOverlay
2018-06-08 21:03:16 +03:00
Dean Herbert
621be3bbfc
Merge branch 'master' into disallow-beatmap-change
2018-06-07 00:38:40 +09:00
Dan Balasescu
b59c45ca57
Merge branch 'master' into fix-database-migration-failure
2018-06-06 22:44:35 +09:00
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
Dean Herbert
0a97b8ae25
Implement DebugUtils locally
...
Has been removed from framework
2018-06-06 18:33:10 +09:00
Dean Herbert
601ef3b6f7
Consume osu.Framework via nuget
2018-06-05 14:14:56 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
Dean Herbert
3a823d6c25
Fix multiple issues causing database reset to fail
2018-06-04 02:12:16 +09:00
Dean Herbert
80806be047
Don't start transactions for migration
...
It looks like transactions are used internally during migration.
2018-05-29 16:23:38 +09:00
smoogipoo
a3470f9ec3
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
smoogipoo
3a5228af43
Make GameBeatmap late-bind its AudioManager for ctor Beatmap access
2018-05-28 17:55:41 +09:00
HoutarouOreki
e2d840c2de
Rename CursorOverrideContainer to MenuCursorContainer
2018-05-25 21:13:40 +02:00
smoogipoo
a25462e10f
Fix testcase audio + dependency overrides not working
2018-05-23 18:52:09 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
smoogipoo
6c0c932c48
Reorder OsuGameBase methods
2018-05-23 14:56:40 +09:00
Roman Kapustin
c492f62eda
Use PreviewTrackManager in the PlayButton
2018-05-09 14:52:46 +03:00
Dean Herbert
64ddee5646
Change load order to ensure runner is loaded before blocking op
2018-04-22 04:26:27 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
Dean Herbert
421e9e0641
Add xmldoc to some high-level classes to explain their separation
2018-04-08 12:58:34 +09:00
Dean Herbert
9ad4e9284a
Add skin source fallback chain
2018-03-20 16:40:11 +09:00
Dean Herbert
d1c2aa71d0
Add beatmap sample override support
2018-03-20 16:24:06 +09:00
Dean Herbert
07642546bb
Make APIAccess a component
2018-03-14 11:29:54 +09:00
Dean Herbert
83cd2fd317
Move token saving logic to APIAccess
2018-03-14 10:15:05 +09:00
Dean Herbert
afc3646450
Move API configuration hooks out of OsuGameBase
...
Also makes username more private, and password completely private.
2018-03-14 10:15:05 +09:00
Dean Herbert
3726db53b5
Allow instantiation of skins
2018-02-23 13:38:12 +09:00
Dean Herbert
4c14b32783
Add basic skin database model layout and importing
2018-02-22 15:46:11 +09:00
Dean Herbert
835136aecb
Merge branch 'master' into api-interface
2018-02-20 09:33:53 +09:00
Dean Herbert
d70d40e3b8
Add back forgotten score store to valid importers
2018-02-19 15:52:14 +09:00
Dean Herbert
75dcf72520
Improve testability of API
2018-02-16 13:57:39 +09:00
Dean Herbert
b9ef32b09b
Further xmldoc and restoring of Cleanup method
2018-02-15 16:31:42 +09:00
Dean Herbert
a0a65abcac
Crentalise all import logic
2018-02-15 14:22:39 +09:00
Dean Herbert
d3dd31dadb
Make deletion and purging logic even more global
2018-02-15 14:22:39 +09:00
Dean Herbert
edc3638175
DatabaseWriteUsage
2018-02-12 17:55:11 +09:00
Dean Herbert
cc948d688f
Fix unrelated spacing issue
2018-02-12 15:39:13 +09:00
smoogipoo
b4cd8ea716
GlobalKeyBindingContainer -> GlobalActionContainer
...
Consitent with "FrameworkActionContainer".
2018-01-30 14:54:30 +09:00
smoogipoo
ef3fb8c05a
InputManager -> Container where KeyBindings are involved
2018-01-30 14:49:12 +09:00
Dean Herbert
6e0cb1adb3
Remove redundant arguments
2018-01-29 15:05:07 +09:00
Dean Herbert
80b8780f56
Revert "Remove game-wise settings store for the time being"
...
This reverts commit 72df2c681b
2018-01-25 18:08:50 +09:00
Dean Herbert
72df2c681b
Remove game-wise settings store for the time being
2018-01-24 18:01:39 +09:00
Dean Herbert
5a00ae36d1
Add database-based configuration for rulesets
2018-01-24 17:45:28 +09:00
smoogipoo
b4e1872322
osu!-side changes in-line with framework BDL cache changes
2018-01-22 12:56:30 +09:00
smoogipoo
43f8a8e8c5
Rename OsuCursorVisualiser -> CursorOverrideContainer
2018-01-15 14:00:13 +09:00
smoogipoo
78441c05cb
OsuCursorContainer -> OsuCursorVisualiser
2018-01-12 19:45:09 +09:00
smoogipoo
16d739580b
IProvideLocalCursor -> IProvideCursor
2018-01-12 19:37:03 +09:00
smoogipoo
620e125fad
Fix cursor being displayed on intro/disclaimer
2018-01-12 19:34:55 +09:00
smoogipoo
512e4d2c9f
Rewrite the way that cursor overrides are done game-wide
2018-01-12 18:13:17 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
Dean Herbert
94b761e63e
Remove local storage for now
2017-12-31 12:22:17 +09:00
Dean Herbert
f2d302f8dc
Create a LargeTextureStore for cached (but not atlased) global textures
...
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
2017-12-31 07:05:04 +09:00
Dean Herbert
6f5f4f76e5
Use Logger.Error when exceptions are involved
2017-12-25 18:21:15 +09:00
Dean Herbert
d402222f17
Fix DisposeTrack and improve AsyncLazy to support disposal
2017-11-30 05:05:07 +09:00
Dean Herbert
df16a019ed
Add a global reduction of audio track volume
...
Music is overpowering compared to our current game samples. We will need to do further adjustments on this, but for now let's reduce the track volume globally.
2017-11-26 17:08:58 +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
Dean Herbert
b805174143
Output the inner exception to the log when possible
2017-10-20 14:33:35 +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
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
8aea6068ba
Add fallback logic for the case where previous database can't be migrated
2017-10-19 21:37:09 +09:00
Dean Herbert
1fbbee14e4
Allow migration from sqlite-net to EF
...
Bonus stage
2017-10-19 20:04:59 +09:00
Dean Herbert
e4a066dc5f
Run cleanup tasks only on startup via manual calls
2017-10-17 19:58:33 +09:00
Dean Herbert
cd41862e3b
Add back transaction support for beatmap importing
2017-10-17 15:00:27 +09:00
Dean Herbert
129cca0704
Tidy up context creation
2017-10-16 12:59:59 +09: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
b178be21d1
Let's not rename columns yet
2017-10-14 14:30:58 +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
Thomas Müller
78f2037d84
Remove now obsolete RatioAdjust
2017-10-12 09:42:06 +02:00
TocoToucan
cbae19b604
Fix BeatmapMetadata removing
2017-10-10 00:17:12 +03:00
TocoToucan
81b9e08fb6
Fix foreign key constraint failure
2017-10-09 00:30:52 +03:00
TocoToucan
5d27c66efa
Use one DbContext with configured CommandTimeout for all stores
2017-10-08 18:18:28 +03:00
TocoToucan
6a4198d0d6
Initial EF Core commit
2017-10-04 22:52:12 +03:00
Dean Herbert
a1b313620c
Set a busy timeout when creating an SQLIteConnection
2017-09-25 11:51:48 +08:00
Dean Herbert
390c212dcb
Don't die on a null connection during disposal
...
May be caused by a startup error. This shouldn't result in an additional exception here.
2017-09-19 20:04:13 +09:00
Dean Herbert
096f53d769
Use new static IsDebug method
2017-09-19 16:07:00 +09:00
Dean Herbert
396a56ddf4
Remove global OsuContextMenuContainer
2017-09-14 15:41:32 +09:00
Dean Herbert
5b9d906ad5
Improve beatmap track disposal logic
...
- [ ] Depends on https://github.com/ppy/osu-framework/pull/1035
2017-09-12 16:56:46 +09:00
naoey
20f93c83d6
Make downloads happen in BeatmapManager.
2017-09-09 00:57:40 +05:30
Dean Herbert
67b3cbce2f
Fix beatmap background being disposed too early
...
Causes weird transitions on the music controller
2017-08-25 13:04:32 +09:00
Dean Herbert
881eecb528
Merge branch 'master' into master
2017-08-22 12:35:36 +09:00
Dean Herbert
e7c9aec1b1
Ensure the sqlite connection is correctly closed before the game ends
...
Hopefully fixes CI race conditions between consecutive tests.
2017-08-21 13:05:47 +09:00
tgi74000
dc31a0f0ac
Merged ppy/master
2017-08-17 13:01:42 +02:00
Dean Herbert
3df51540e1
Code review fixes
2017-08-16 17:39:57 +09:00
Dean Herbert
2bd0981738
Improve default key binding logic
...
Defaults will be added to the database as long as the database has unbalanced counts for any actions.
2017-08-15 23:59:58 +09:00
Dean Herbert
46bfa4db29
Load defaults, pass around live IEnumerable, add PK for updating
2017-08-14 22:31:23 +09:00
Dean Herbert
7c9d6c9c83
Initial refactoring of key binding logic
2017-08-14 20:19:25 +09:00
Dean Herbert
48d4ed55e9
Move a lot of code to framework
2017-08-11 16:11:46 +09:00
Dean Herbert
a93a92a2bb
Remove GlobalHotkeys
2017-08-10 19:52:45 +09:00
Dean Herbert
34b12fbfa4
Add global actions; improve default assignment
2017-08-09 17:10:32 +09:00
tgi74000
b00d1cd077
Merged ppy:master
2017-08-09 08:49:29 +02:00
Dean Herbert
eee6404986
Store bindings to database
2017-08-09 12:37:47 +09:00
tgi74000
3d4db427ff
Pass RuleSet to ScoreStore, compute and store MD5 for legacy replays compatibility
2017-08-08 17:17:53 +02:00
Dean Herbert
3a6f3cdd8a
Add the ability to create migrations on a per-store level
...
Now stores store versions to the database itself.
2017-07-27 20:38:40 +09:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
898a601098
Introduce a reference counting file store
2017-07-26 20:22:02 +09:00
Dean Herbert
9e20a02c0a
Split out BeatmapDatabase into BeatmapStore
...
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Thomas Müller
e469a114a6
Update dependency caching according to framework
2017-07-21 19:03:43 +02:00
Dean Herbert
3bdd4d7d02
Centralise TrackManager.AddItem logic to avoid duplicate adds
2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4
Remove usage of SetExclusive
...
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
Dean Herbert
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
Thomas Müller
d68f17b697
Use tooltip and context menu containers as newly required
2017-07-06 15:15:12 +03:00
