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
Thomas Müller
f5829860a2
Get rid of AlwaysReceiveInput
2017-06-23 18:02:24 +02:00
EVAST9919
1711258038
Context Menu
2017-06-12 12:56:07 +03:00
Jorolf
a43890ffb4
update osu to use the framework's TooltipContainer
2017-06-03 14:50:35 +02:00
Dean Herbert
cba7796777
Fix ratio container being added to a level too high
...
That's a bad ratio container! How did we not notice this until now?
2017-05-17 18:49:30 +09:00
Dean Herbert
622b155fda
OsuConfig -> OsuSetting
2017-05-15 10:56:27 +09:00
Dean Herbert
489f586887
Add FPS display toggling.
...
Kinda temporary but better than nothing.
2017-05-03 20:34:53 +09:00
Dean Herbert
96a5d7032d
Fix regression causing menu cursor to stick to screen edges.
2017-04-21 22:37:55 +09:00
Dean Herbert
d656090aab
Move tooltips below the cursor.
2017-04-21 14:01:31 +09:00
Dean Herbert
4ca27a5395
Merge branch 'master' into tooltips
2017-04-20 15:08:26 +09:00
Jorolf
ea67b41683
move tooltip outside of the cursor
2017-04-20 00:42:40 +02:00
Dean Herbert
1f7ed72dc6
Update font/size.
2017-04-19 17:32:30 +09:00
Dean Herbert
af13f97435
Fix regressions and test cases.
2017-04-17 19:44:03 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase.
2017-04-17 17:43:48 +09:00
Dean Herbert
83b083ce64
Move SQLite connections out of database classes; make abstract Database.
2017-04-17 14:37:52 +09:00
Dean Herbert
1233fb5b82
Split noto out into individual ranges.
2017-04-04 11:34:55 +09:00
Dean Herbert
317dc94b4c
Adjust appearance.
2017-03-17 21:09:31 +09:00
Dean Herbert
f9f31ca092
Add statefulness to MenuCursor.
2017-03-17 20:45:27 +09:00
Dean Herbert
292de44a0b
WIP menu cursor.
2017-03-17 20:45:27 +09:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero.
2017-03-09 15:52:40 +09:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa
Merge branch 'master' into replay
2017-03-07 11:41:16 +09:00
Thomas Müller
9fd16be2d4
Refactor IsDebug
2017-03-06 19:59:29 +01:00
Dean Herbert
1e48b0a037
Ensure AssemblyName is never null (seems to be on CI server).
2017-03-06 19:00:15 +09:00
Dean Herbert
0ee38571a6
Move version-related properties to OsuGameBase.
2017-03-06 17:30:44 +09:00
Dean Herbert
95e2e2b027
Replay loading via drag-drop huzzah!
2017-03-04 19:02:43 +09:00
Dean Herbert
5ff4028c29
Make beatmap importing async.
2017-02-24 18:12:50 +09:00
Thomas Müller
a5dfa7ab06
Remove unnecessary using statements
2017-02-23 21:38:10 +01:00
Dean Herbert
da2bfe6d3c
Framework updates.
2017-02-23 16:42:12 +09:00
Dean Herbert
4fc2cd227c
Add CJK support via font Noto Medium.
2017-02-09 10:35:25 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
Dean Herbert
9b9ed32245
Remove all @2x references, updates resource and framework.
2017-02-06 22:19:47 +09:00
EVAST9919
ac7feafe9a
Merge branch 'master' into login_fix
2017-01-28 11:24:08 +02:00
Dean Herbert
1853bbdda8
Move window/volume configuration to framework level.
2017-01-25 18:44:51 +09:00
Drew DeVault
f5f545df62
Refactor OsuColour into injected instance class
...
Which should allow you to change the color palette in the future for
skinning purposes.
2017-01-12 23:49:05 -05:00
Andrey Zavadskiy
acc50e3473
fixed wrong parameter for token
2016-12-24 10:16:22 +03:00
Andrey Zavadskiy
5fbc0e408b
Remove unnesessary Username field check
2016-12-24 09:16:17 +03:00
Andrey Zavadskiy
7c96102229
When we have empty login, api.Token becames empty
...
So we can't sign in having Token without login
2016-12-22 16:09:42 +03:00
Andrey Zavadskiy
4817d4bf10
Stop using password field in .ini at all
2016-12-22 15:41:06 +03:00
Andrey Zavadskiy
b066a7d905
Stop saving password
2016-12-22 15:26:31 +03:00
Andrey Zavadskiy
1c79ebff9f
Fix loggining on start even after logout and exit
2016-12-21 01:51:01 +03:00
Andrey Zavadskiy
c7de449713
Token fix
...
If "Save Password" is checked, Token will be saved
2016-12-21 00:37:54 +03:00
Dean Herbert
f356640cb7
Add missing licence headers.
2016-12-06 19:07:15 +09:00
Thomas Müller
b81bf7085f
Add missing licence headers and fixup using statements.
2016-12-03 13:56:35 +01:00
Dean Herbert
6ccce88a0e
Add proper user data retrieval on connect.
2016-12-01 16:44:24 +09:00
Dean Herbert
01dc7cb5c2
Thread safety, username saving correctly etc.
2016-11-30 19:22:36 +09:00
Thomas Müller
b12b82fdd3
Fix depth values.
2016-11-29 20:50:12 +01:00
Dean Herbert
fbf35c904d
Fix Config regression with DI.
2016-11-29 18:49:03 +09:00
Drew DeVault
89effca12e
Remove need for PlaySongSelect ctor to take a db
2016-11-25 00:44:46 -05:00
Dean Herbert
885df47864
Add simple implementation of HitExplosions.
2016-11-16 19:24:48 +09:00
Dean Herbert
2cbe2b34fd
Change default font weight to Medium.
2016-11-15 19:34:50 +09:00
Thomas Müller
ac99e2d488
Avoid using load to construct the drawable hierarchy whereever possible.
2016-11-12 18:34:36 +01:00
Dean Herbert
cc0f61f545
Merge branch 'refs/heads/master' into dependency-injection
...
# Conflicts:
# osu-framework
# osu.Game/GameModes/OsuGameMode.cs
# osu.Game/GameModes/Play/Player.cs
# osu.Game/OsuGame.cs
# osu.Game/Overlays/MusicController.cs
# osu.Game/Overlays/Options/EditorSection.cs
# osu.Game/Overlays/Options/Input/MouseOptions.cs
# osu.Game/Overlays/Options/Online/InGameChatOptions.cs
# osu.Game/Overlays/Options/SkinSection.cs
2016-11-12 20:18:26 +09:00
Drew DeVault
0d4560a054
Update to latest DI stuff
2016-11-10 17:40:42 -05:00
Drew DeVault
2362665b8a
Re-cache the new FontStore when overwritten
...
Fixes issues with font loading
2016-11-10 16:43:04 -05:00
Drew DeVault
fe9034323b
Get the game running, though not perfectly
2016-11-10 16:42:29 -05:00
Drew DeVault
ee24cd310c
Convert everything to DI pattern
2016-11-10 16:41:18 -05:00
Drew DeVault
19fd6fe249
Introduce dependency injection
2016-11-10 16:38:25 -05:00
Dean Herbert
788c11de10
Merge pull request #103 from huoyaoyuan/music-controller
...
Music controller
2016-11-10 12:54:56 +09:00
Dean Herbert
d70e8806b4
Merge remote-tracking branch 'refs/remotes/upstream/master' into options-fixes
2016-11-09 11:41:36 +09:00
Dean Herbert
4426a683ed
Move OptionsOverlay to OsuGame.
2016-11-08 19:26:12 +09:00
Dean Herbert
3b0114671e
Max sidebar draggable.
2016-11-08 19:16:39 +09:00
Dean Herbert
30323876a8
Use preload for options (fix icons).
2016-11-08 18:49:20 +09:00
Dean Herbert
a61fb5ef5d
Initial updates to make generic containers work.
2016-11-07 21:13:56 +09:00
Huo Yaoyuan
c470140d64
Merge branch 'master'
2016-11-06 00:11:30 +08:00
Dean Herbert
7cc19d74c6
Add full Exo font set and bring song select panels closer to final design.
2016-11-05 18:22:09 +09:00
Huo Yaoyuan
2d86cb1e81
Merge branch 'master'
2016-11-05 16:21:59 +08:00
Drew DeVault
2aa85a4b18
Split up options into subclasses
2016-11-03 19:06:22 -04:00
Drew DeVault
2aaff01675
Implement config persistence through BasicStorage
2016-11-03 19:06:22 -04:00
Huo Yaoyuan
f2a8cc0c29
Merge branch 'master'
2016-11-03 20:38:34 +08:00
Dean Herbert
b86f308af6
Add async workflow.
2016-11-01 23:24:14 +09:00
Huo Yaoyuan
6aba03e1ca
OsuGameMode<-WorkingBeatMap->OsuGameBase.
2016-10-28 21:03:59 +08:00
Dean Herbert
74f1a9622f
Add initial game-wide beatmap flow.
2016-10-28 19:55:48 +09:00
Dean Herbert
33ef55df88
Allow BeatmapDatabase to be constructed without a host.
2016-10-27 17:34:50 +09:00
Dean Herbert
d3a857edb9
Make importing work properly.
...
Moves import code to BeatmapDatabase.
2016-10-24 11:39:53 -04:00
Drew DeVault
8e31965fb4
Refactor beatmap import secondary process
...
Doesn't launch a new game window and now supports several files at once.
2016-10-24 11:39:18 -04:00
Dean Herbert
4edefb935c
Improve the initialisation logic of OsuGameBase.
2016-10-16 17:33:53 +09:00
Drew DeVault
2a3f047895
Start implementing legacy decoder
2016-10-13 12:16:48 +09:00
Drew DeVault
72c4a26aea
Move control of databases into osu-framework
2016-10-12 11:32:27 -04:00
Drew DeVault
2d810f72fa
Add initial DB schema and support code
2016-10-12 11:32:07 -04:00
Dean Herbert
29d223dc41
Update framework and simplify some references.
2016-10-12 19:52:49 +09:00
Dean Herbert
4052a665bf
Remove all non-load Game access.
2016-10-12 15:47:08 +09:00
Thomas Müller
dd04b33232
Use AddInternal instead of AddTopLevel.
2016-10-09 20:06:23 +09:00
Dean Herbert
9b76a0ffb8
Expose CursorContainer.
2016-10-08 15:53:55 +09:00
Dean Herbert
7db555be5d
Move toolbar to OsuGame.
2016-10-01 18:01:52 +09:00
Dean Herbert
f0681f35c4
Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout
...
# Conflicts:
# osu.Game/OsuGame.cs
# osu.Game/OsuGameBase.cs
# osu.Game/osu.Game.csproj
2016-10-01 17:10:27 +09:00
Dean Herbert
d93718d953
Add template toolbar.
2016-09-30 18:45:27 +09:00
Dean Herbert
b4c9dca54b
Merge remote-tracking branch 'upstream/master' into api-channels-messages
...
Conflicts:
osu.Game/Online/Chat/Message.cs
2016-09-29 23:54:33 +09:00
Dean Herbert
154226b9a3
Basic white-boxing of all game modes.
2016-09-29 23:51:17 +09:00
Dean Herbert
2db962dc33
Add basic tweening mouse cursor.
...
# Conflicts:
# osu-framework
2016-09-29 23:46:33 +09:00
Dean Herbert
154b914a3a
Fix API scheduling.
2016-09-27 19:22:08 +09:00
Dean Herbert
28045b7136
Add back basic API support for channel/message retrieval.
2016-09-27 18:33:52 +09:00
Dean Herbert
7bdb2fcfc7
Add basic implementation of VisualTest framework for osu! project.
...
Comes with one complimentary test.
2016-09-24 15:47:17 +09:00
