1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 21:27:24 +08:00
Commit Graph

197 Commits

Author SHA1 Message Date
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Dean Herbert
b20afb915d Fix right mouse activated absolute scroll not working 2018-07-09 15:26:22 +09:00
Dan Balasescu
126678c226
Merge branch 'master' into multiple_previews_different_overlays 2018-06-12 19:26:51 +09:00
smoogipoo
14b7530994 Use a global ruleset config cache 2018-06-11 15:07:42 +09:00
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