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

596 Commits

Author SHA1 Message Date
Dean Herbert
4e49fbf7fb Switch protected properties to private where feasible 2021-05-28 02:30:31 +09:00
Dean Herbert
d24a712dd4 Move protected properties to one location and mark setters private where feasible 2021-05-28 02:27:06 +09:00
Dean Herbert
df703b68ec Merge branch 'master' into realm-key-binding-store 2021-05-25 13:41:48 +09:00
smoogipoo
a74405d0ed Merge branch 'master' into restructure-spectator-client 2021-05-20 18:53:42 +09:00
smoogipoo
df80531a0a Split online connectivity into OnlineSpectatorClient 2021-05-20 16:30:56 +09:00
smoogipoo
6beeb7f7c4 Rename SpectatorStreamingClient -> SpectatorClient 2021-05-20 15:55:07 +09:00
smoogipoo
d197a7f6f5 Rename multiplayer client classes 2021-05-20 15:39:45 +09:00
Dean Herbert
9770c316e2 Add back the construction of the KeyBindingStore
This reverts commit 21b6adbf79.
2021-04-26 18:26:57 +09:00
Dean Herbert
21b6adbf79 Remove DI caching of RealmKeyBindingStore 2021-04-26 17:52:17 +09:00
Dean Herbert
8961203f08 Move guid initialisation to database model itself 2021-04-26 17:06:03 +09:00
Dean Herbert
78f274d51a Merge branch 'master' into realm-key-binding-store 2021-04-22 12:13:23 +09:00
Dean Herbert
dbb8f7f4a9 Tidy up initialisation code and avoid using DI on inherited class 2021-04-19 11:30:55 +09:00
Dean Herbert
5b06a68b93
Merge pull request #12330 from Cublibre/master
Send a warning notification if device is unplugged and at low battery
2021-04-15 19:21:04 +09:00
Dean Herbert
4852630c93 Fix import multiple file types via drag potentially reaching the wrong importer 2021-04-13 14:03:42 +09:00
Christine Chen
43b97fe0ad Refactor PowerStatus (now called BatteryInfo) 2021-04-12 10:52:52 -04:00
Salman Ahmed
419fd4470c Reorder method declaration 2021-04-11 15:19:51 -04:00
Salman Ahmed
2b947a44da Cache power status at base instead 2021-04-11 13:18:25 -04:00
Salman Ahmed
1fd4cb8963
Merge branch 'master' into master 2021-04-11 10:19:16 +03:00
Christine Chen
08311abc5e Remove setters, cache CreatePowerStatus() and use a dummy LocalPowerStatus class in test scene 2021-04-10 00:00:21 -04:00
Christine Chen
493c095535 Fixed code style 2021-04-08 20:28:23 -04:00
Christine Chen
6bccb3aab6 Use DI to implement battery detection, add BatteryCutoff property
- Removed the Xamarin.Essentials package from osu.Game and added it to osu.iOS and osu.Android only.
- iOS and Android implementations use Xamarin.Essentials.Battery, while the Desktop implementation
only returns 100% battery for now.
- Added a BatteryCutoff property to PowerStatus so it can be different for each platform (default 20%, 25% on iOS)
2021-04-08 19:55:11 -04:00
Dean Herbert
8aff53172d Remove necessity for nested PassThroughInputManger 2021-04-08 15:18:31 +09:00
Dean Herbert
e7f47c635f Fix gameplay mouse cursor being overridden by menu cursor
Closes https://github.com/ppy/osu/issues/12313.
2021-04-07 19:00:05 +09:00
Dean Herbert
38e95a0e73 Merge branch 'master' into fix-overzealousmouse-button-blocking 2021-04-05 22:07:41 +09:00
Dean Herbert
30cae46cbd Group large drag drop imports into a single operation 2021-03-31 14:57:28 +09:00
Dean Herbert
05961e98d5 Ensure GlobalActions are handled before anything else game-wide 2021-03-30 19:03:15 +09:00
Dean Herbert
03592fa696 Merge branch 'master' into realm-migration-operation-blocking 2021-03-19 21:33:26 +09:00
Dean Herbert
b1cd01ceb8 Apply ConfigureAwait changes to game side 2021-03-08 14:36:35 +09:00
Dean Herbert
172e2e9b3f Fix audio previews not being adjusted in volume correctly 2021-02-17 20:51:17 +09:00
Dean Herbert
55d5d8d5be Send version hash on hub connection 2021-02-15 16:51:40 +09:00
Dean Herbert
33c9ecac8a Fix MessageFormatter not working for custom endpoints 2021-02-12 14:54:19 +09:00
Dean Herbert
df7aaa5c81 Move implementation to OsuGameBase to ensure it applies to test scenes
This also removed a previous attempt at the same thing, which happened
to not be applying due to the reference to the applied bindable not
being held. Whoops.
2021-02-11 15:02:36 +09:00
Dean Herbert
52f0f3f3b2 Add a note about SelectedMods behavioural quirks 2021-02-10 14:38:15 +09:00
Dean Herbert
d69a4914e0 Add method to block all realm access during migration operation 2021-01-22 17:28:47 +09:00
Dean Herbert
34a7ce912e Correctly close context before attempting migration 2021-01-21 19:02:09 +09:00
Dean Herbert
259f6504fb Merge branch 'master' into realm-key-binding-store 2021-01-21 15:45:59 +09:00
Dean Herbert
68f2e7f61a Use realm support for Guid 2021-01-19 18:22:36 +09:00
Dean Herbert
f1a785f407 Merge branch 'master' into realm-key-binding-store 2021-01-19 18:22:34 +09:00
Dean Herbert
0b165dce4b Fix multiplayer mod select showing autoplay as a choice 2021-01-18 17:50:32 +09:00
Bartłomiej Dach
dee46d7ba2 Use GroupBy() instead 2021-01-16 23:42:28 +01:00
Bartłomiej Dach
bb0d289993 Split variable for readability 2021-01-16 23:24:28 +01:00
Bartłomiej Dach
1d7be6a604 Merge branch 'master' into android-multiple-import-support-suppot 2021-01-16 23:13:11 +01:00
Dean Herbert
2988700bea
Merge branch 'master' into realm-key-binding-store 2021-01-14 16:37:09 +09:00
Dean Herbert
8a08d3f4ef Fix transactions not actually being committed 2021-01-14 16:13:10 +09:00
Dean Herbert
fcb4a53f37 Rename realm persisted properties to avoid casting necessity 2021-01-13 18:36:37 +09:00
Dean Herbert
542f535247 Pull out thread local contexts and have main realm refresh in update loop 2021-01-13 18:36:37 +09:00
Dean Herbert
a6997a6fc6 Move ruleset key binding registration to an explicit method rather than the constructor 2021-01-12 15:21:02 +09:00
Dean Herbert
536e7229d0 Remove unused EF class and unnecessary interface 2021-01-12 14:45:36 +09:00
Dean Herbert
6736db327a Remove scheduler being passed in for now 2021-01-12 14:45:36 +09:00
Dean Herbert
f9717e8b69 Don't migrate existing key bindings across if realm is already populated 2021-01-11 16:31:36 +09:00
Dean Herbert
1abed11fb7 Add basic migration logic of key bindings to realm 2021-01-11 16:31:36 +09:00
Dean Herbert
43f417b53a Add and consume IKeyBindingStore interface 2021-01-11 15:52:49 +09:00
Dean Herbert
a9a3a95991 Replace KeybindingStore with realm version 2021-01-11 15:52:49 +09:00
Dean Herbert
d5ac97ece8 Add realm store / key binding implementations 2021-01-11 15:52:49 +09:00
Dean Herbert
9cfede2e7e Setup context, write usage, wrapper classes 2021-01-11 15:52:49 +09:00
Lucas A
7ae4979882 Fix merge conflicts. 2020-12-27 13:52:45 +01:00
Shivam
a933483848 Merge branch 'master' into tourney-switching-ui 2020-12-26 15:45:29 +01:00
Shivam
9e15dccc56 Move graceful exit to OsuGameBase 2020-12-26 15:36:21 +01:00
Dean Herbert
5d4b73baa5 RealtimeMultiplayer -> Multiplayer 2020-12-25 14:10:59 +09:00
Dean Herbert
eb795a2127 Move all endpoint information to a configuration class 2020-12-24 17:58:38 +09:00
Lucas A
6a80e1303d LINQ-ify Import() logic and ignore case of file extensions. 2020-12-23 12:56:04 +01:00
smoogipoo
959959dbed Add multiplayer client to OsuGameBase 2020-12-21 00:21:41 +09:00
Lucas A
f1aefcdf86 Handle multiple extensions in the import files. 2020-12-20 10:57:47 +01:00
Lucas A
cc0442a9a1 Fix CI inspections. 2020-12-16 20:42:30 +01:00
Lucas A
5d7294451f Refactor Import() overload to take a list of import tasks instead. 2020-12-16 14:28:16 +01:00
Lucas A
aa7d22460d Override Import() instead. 2020-12-08 19:46:55 +01:00
Lucas A
005fa3a7ee Add ability to import files from a stream. 2020-12-01 20:28:15 +01:00
Dean Herbert
709370c69b Move schedule call outwards 2020-11-16 16:49:31 +09:00
Dean Herbert
9a7fdb2b7e Move skin deletion logic to OsuGameBase to promote thread safety
`CurrentSkinInfo` is used in multiple places expecting thread safety,
while ItemRemoved events are explicitly mentioning they are not thread
safe. As SkinManager itself doesn't have the ability to schedule to the
update thread, I've just moved the logic to `OsuGameBase`. We may want
to move the current skin bindable out of the manager class in the
future to match things like `BeatmapManager`.

Closes https://github.com/ppy/osu/issues/10837.
2020-11-16 16:43:19 +09:00
Dean Herbert
c97c6bbf52 Add and consume user cache class 2020-11-06 17:00:29 +09:00
Dean Herbert
14bb079feb Rename ScorePerformanceManager to ScorePerformanceCache 2020-11-06 13:15:33 +09:00
Dean Herbert
5113d4af8f Rename BeatmapDifficultyManager to BeatmapDifficultyCache 2020-11-06 13:14:29 +09:00
Dean Herbert
fb105a1e9c Remove unnecessary field storage 2020-11-02 14:49:25 +09:00
Dean Herbert
73b290aca3 Merge branch 'master' into results-dynamic-pp-calc 2020-11-02 14:47:33 +09:00
Dean Herbert
175fd512b0 Send frames to streaming client from replay recorder 2020-10-22 17:48:15 +09:00
Dean Herbert
93db75bd41 Begin shaping the spectator streaming component 2020-10-22 17:48:15 +09:00
Bartłomiej Dach
ba818e3ae0
Merge branch 'master' into results-dynamic-pp-calc 2020-10-19 21:41:07 +02:00
Dean Herbert
28eae5d26b Fix migration test failures due to finalizer disposal of LocalConfigManager 2020-10-19 19:03:22 +09:00
Dean Herbert
1989141968
Merge branch 'master' into tourney-asset-refactor 2020-10-07 21:34:07 +09:00
Lucas A
7f5cf04b2b Fix merge conflicts. 2020-10-07 13:28:49 +02:00
Dean Herbert
faeb9910e5 Revert "Exit import process after first handler is run"
This reverts commit 4139301afa.
2020-10-02 17:06:55 +09:00
Dean Herbert
4139301afa Exit import process after first handler is run 2020-10-02 16:52:45 +09:00
Dean Herbert
50eca202f4 User IEnumerable for HandledExtensions 2020-10-02 16:17:10 +09:00
Dean Herbert
fc65cb4375 Ensure precedence is given to newer registered handlers 2020-10-02 16:14:21 +09:00
Dean Herbert
e49ec092c9 Expose ability to register a component as an import handler 2020-10-02 16:08:11 +09:00
Lucas A
ddede85704 Split performance calculation to its own class. 2020-09-27 12:44:29 +02:00
smoogipoo
be2d34d5dc Merge branch 'master' into score-recalc 2020-09-09 21:31:31 +09:00
smoogipoo
aeae009512 Disable online beatmap lookups in tests 2020-09-09 20:12:40 +09:00
smoogipoo
117c7ec6b2 Merge branch 'master' into score-recalc 2020-09-09 14:38:36 +09:00
Dean Herbert
e1053c4b6f Revert exposure changes to GlobalActionContainer 2020-09-08 18:36:11 +09:00
Salman Ahmed
4d9a06bde9 Expose the global binding container to OsuGameTestScene 2020-09-04 10:24:54 +03:00
smoogipoo
1e5e5cae0c Add support for standardised -> classic changes 2020-08-28 21:34:34 +09:00
smoogipoo
4d15f0fe52 Implement basic score recalculation 2020-08-28 19:16:46 +09:00
Shivam
c167727ac6 Merge branch 'master' into tourney-asset-refactor
# Conflicts:
#	osu.Game/IO/OsuStorage.cs
2020-08-09 12:38:41 +02:00
smoogipoo
adf4f56dce Move MusicController to OsuGameBase 2020-08-06 19:01:23 +09:00
smoogipoo
6e42b8219c Move track to MusicController, compiles 2020-08-06 16:24:14 +09:00
Dean Herbert
f812767c95 Add fallback hash generation to fix android startup crash 2020-08-03 18:49:06 +09:00
Dean Herbert
1dfd2112c6 Source hash from osu.Game.dll rather than executable 2020-07-30 15:32:08 +09:00
Dean Herbert
6c7e806eac Include executable hash when submitting multiplayer scores 2020-07-29 12:39:18 +09:00
smoogipoo
107b5ca4f2 Add support for bindable retrieval 2020-07-21 23:13:04 +09:00
smoogipoo
6df1b1d9ea Add a background beatmap difficulty manager 2020-07-16 20:43:14 +09:00
smoogipoo
d1aedd15c4 Add noto-thai font 2020-07-15 13:35:40 +09:00
Shivam
c3cd2a74f5 Move general purpose migration to MigratableStorage 2020-07-01 22:57:16 +02:00
smoogipoo
ab15b6031d Update with framework-side storage changes 2020-07-01 17:12:07 +09:00
smoogipoo
f3b5149648 Move some suggestions to warnings, resolve issues 2020-06-03 16:48:44 +09:00
Dean Herbert
912c999f40 Fix minor typo in OsuGameBase 2020-05-28 19:05:35 +09:00
Dean Herbert
f989f1aa00 Change event flow to avoid firing store delete events on update 2020-05-27 16:08:47 +09:00
Salman Ahmed
3d3cc2c15e
Dispose BeatmapOnlineLookupQueue cache download request 2020-05-22 17:26:37 +03:00
Dean Herbert
052ad79fc6 Convert dangerous events to IBindables 2020-05-19 16:44:22 +09:00
Dean Herbert
75a40578e8 Revert ContextFactory to private 2020-05-12 12:39:52 +09:00
Dean Herbert
6c350db097 Add connection flushing support 2020-05-11 21:39:44 +09:00
Dean Herbert
1348bdaa15 Merge branch 'custom-data-directory' into migration-backend 2020-05-09 19:32:29 +09:00
Dean Herbert
abd1115c6d Fix test failures 2020-05-08 19:08:43 +09:00
Dean Herbert
754afb9c0b Expose ContextFactory to allow for connection flushing 2020-05-07 22:11:57 +09:00
Dean Herbert
7781408643 Update in line with framework storage changes 2020-05-06 18:28:24 +09:00
Dean Herbert
5edabbdee2 Redirect log output to custom data directory 2020-05-04 17:35:35 +09:00
Dean Herbert
6621d363da Add basic custom data directory support 2020-05-04 17:01:05 +09:00
Lucas A
8cdae790c3 Load user rulesets from the game data directory 2020-04-03 21:40:09 +02:00
Dean Herbert
d8041a0dcb Increase sample concurrency to better match stable 2020-03-22 02:16:28 +09:00
Dean Herbert
ae112cf14f Reorder torus loading to provide regular as default 2020-03-13 13:43:48 +09:00
Dean Herbert
4a774d02e0 Remove exo font loading 2020-03-13 13:43:37 +09:00
Dan Balasescu
aafdfbca1f
Merge pull request #8129 from peppy/fix-dummy-track-completion-feedback
Fix DummyWorkingBeatmap's track completion attempting to change game-wide beatmap
2020-03-05 17:57:57 +09:00
smoogipoo
9307caa3bf Fix typos 2020-03-05 16:58:07 +09:00
Dean Herbert
a311ace626 Add migration test 2020-03-05 15:07:00 +09:00
Dean Herbert
38d91ccd0d Add comment regarding no-longer-required schedule 2020-03-04 19:11:35 +09:00
Dean Herbert
75968fb4ba Update resources once more 2020-03-04 11:50:22 +09:00
Dean Herbert
f1f4f1ffbd Add torus font 2020-03-03 18:17:51 +09:00
Dean Herbert
8ea354571c Update naming 2020-01-22 23:04:37 +09:00
Huo Yaoyuan
1b33581667 Construct DllResourceStore with assemblies 2019-12-28 21:13:18 +08:00
Dean Herbert
41d4609c92 Fix crash on trying to retrieve mods from unavailable ruleset 2019-12-15 02:37:30 +09:00
Dean Herbert
b94d5bf82e Fix error when entering multiplayer game in different ruleset 2019-12-14 00:42:54 +09:00
Dan Balasescu
ef94df917c
Add whitespace 2019-12-13 21:56:03 +09:00
Dean Herbert
bc31146560 Mods -> SelectedMods 2019-12-13 21:45:38 +09:00
Dean Herbert
440a8470e1 Move available mods to global context
This also tidies up ModSelectOverlay and setting creation flow in general.
2019-12-13 21:36:50 +09:00
Dean Herbert
a1f8ab1735 Fix unrequired type keyword 2019-12-13 20:13:53 +09:00
Dean Herbert
9a941c4f94 Update font loading to use new method 2019-11-29 02:15:13 +09:00
Huo Yaoyuan
bbeab6fa76 Use auto property. 2019-11-12 19:53:25 +08:00
Dean Herbert
faa5997b48
Move scaling container to OsuGame so OsuGameBase doesn't apply… (#6804)
Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale
2019-11-12 16:40:49 +09:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
8ac708ada5 Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale 2019-11-11 13:58:35 +09:00
smoogipoo
12cd57744b Make RulestStore initialise at construction time 2019-10-15 16:14:06 +09:00
smoogipoo
cc533e8fe4 Remove BindableBeatmap 2019-10-01 17:24:47 +09:00
smoogipoo
04ac414249 Fix memory leaks due to audio track recycle order 2019-10-01 13:49:09 +09:00
Dean Herbert
d01c30fd52
Merge branch 'master' into introduce-session-statics 2019-09-28 20:16:52 +08:00
Dean Herbert
c83db94eb7 Use isolated storage/api 2019-09-25 15:00:08 +09:00
iiSaLMaN
e3e245ab20 Introduce SessionStatics 2019-09-23 08:15:27 +03:00
Dean Herbert
5b094f8e1d Actually register the RulesetConfigCache as a component 2019-09-06 01:13:58 +09:00
Dean Herbert
40c1c6072e Add "osu!classic" as a bundled skin choice 2019-08-29 16:39:42 +09:00
Dean Herbert
6539c6da17
Merge branch 'master' into watch-replays-4 2019-07-02 13:24:16 +09:00
Salman Ahmed
9a617dd143
Add Venera Medium in Store 2019-06-30 03:16:58 +03:00
naoey
ab0bb8b678
Implement replay downloading with ArchiveDownloadModelManager 2019-06-28 09:33:13 +05:30
Dean Herbert
9e1cb90dd8 Remove existing argument for ItemAdded event
For all usages, it looks like this was unnecessary.
2019-06-26 11:40:41 +09:00
Dean Herbert
97d65783db Remove osu!-side DebugUtils 2019-06-20 12:48:45 +09:00
Dean Herbert
b2b3df3885 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-12 18:28:43 +09:00
Lucas A
2e911d0e96 Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build 2019-06-10 19:13:54 +02:00
smoogipoo
f090e292c9 Move ArchiveModelManager import process to async flow 2019-06-10 13:42:22 +09:00
Dean Herbert
115a75e4c6 Use a constant for lazer variables 2019-06-03 13:16:05 +09:00
Dean Herbert
b52276c489 Pass individual components to DummyWorkingBeatmap, not game 2019-05-31 14:51:12 +09:00
Dean Herbert
f33a5bc54c Centralise and update WorkingBeatmap creation in test cases 2019-05-31 14:40:53 +09:00
Dean Herbert
a20eda7b5f Fix remaining cases to work without things 2019-05-28 23:54:42 +09:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
Dean Herbert
1fd44d7945 Move OsuScreenDependencies to GameBase 2019-05-15 13:00:11 +09:00
Dean Herbert
0d57cf6599 Remember FPS display state after changing via Ctrl+F11 hotkey 2019-05-14 13:13:51 +09:00
Dean Herbert
24e64c1333 Add proper co-dependent beatmap/score deletion via events 2019-05-09 15:15:28 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
f0114d776d Use interface to access API
Allows for better testability.
2019-03-13 12:58:18 +09:00
Dean Herbert
431d439500 Make attribute public 2019-03-01 20:15:09 +09:00
Dean Herbert
9885913fff Fix iOS builds not being able to read their deploy version 2019-03-01 20:01:16 +09:00
Dean Herbert
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
Dean Herbert
ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
Dean Herbert
6b3d53750c Fix remaining cases of not using host-created TextureLoaderStore 2019-01-25 11:48:28 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
171287591c Merge branch 'updateable-beatmap-sprite' into timeshift-wip
# Conflicts:
#	osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
#	osu.Game/Graphics/Containers/LinkFlowContainer.cs
2018-12-26 20:52:36 +09:00
smoogipoo
96c9e5f209 Make DefaultBeatmap readonly 2018-12-25 18:34:45 +09:00
smoogipoo
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
Dean Herbert
d3f5111fa1 Use relative URL 2018-12-06 12:18:21 +09:00
smoogipoo
5f0bde581c Fix OsuBindableBeatmap not being able to be auto-constructed 2018-12-05 20:42:16 +09:00
smoogipoo
4ba7690e04 Initial scoremanager/scorestore structure 2018-11-28 16:50:16 +09:00
smoogipoo
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
5197bf77e4
Merge pull request #3478 from peppy/fix-case-sensitivity-import-extensions
Fix files with upper-case extensions failing to import correctly
2018-09-26 19:40:00 +09:00
smoogipoo
e259911875 Use invariant tolower 2018-09-26 18:44:03 +09:00
Paul Teng
dd36b6a381 Remove unused field storage 2018-09-24 21:08:58 -04:00
Dean Herbert
6efecc4b35 Fix files with upper-case extensions failing to import correctly 2018-09-23 05:23:49 +09:00
Dean Herbert
f149a66a4d Use LargeTextureStore for all online texture retrieval
Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885.
2018-09-09 02:45:37 +09:00
Dean Herbert
cc533a05c5 Update framework 2018-09-07 19:00:43 +09:00
Dean Herbert
01389f0443 Merge remote-tracking branch 'upstream/master' into update-framework-with-everyrthing 2018-09-06 18:04:58 +09:00
Dean Herbert
ab7c0ccd18 Merge remote-tracking branch 'smoogipoo/spritetext-rewrite' into update-framework-with-everyrthing 2018-09-06 18:00:54 +09:00
Dean Herbert
4e012042ab Fix renaming variables too eagerly 2018-09-06 17:57:09 +09:00
Dean Herbert
91aada8be5 Fix ScaleAdjust going missing 2018-09-06 14:20:55 +09:00
Dean Herbert
29b0d62f21 Changes in line with framework refcount changes 2018-09-06 13:29:57 +09:00
smoogipoo
d5acc96efa Apply changes in line with osu!framework changes 2018-09-05 14:59:37 +09:00
Dean Herbert
d9e9c61731 Begin loading fonts earlier in startup
Should result in a considerably faster font load, as they can be concurrently loaded alongside EF.
2018-09-01 17:48:03 +09:00
Dean Herbert
1d86083981 Hide unnecessary log output 2018-07-24 12:13:48 +02:00
Dean Herbert
0c24244340 Remove SingletonContextFactory
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.

# Conflicts:
#	osu.Game/Database/SingletonContextFactory.cs
2018-07-18 16:50:56 +09:00
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
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00