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

309 Commits

Author SHA1 Message Date
Dean Herbert
1728dd6502 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:42:09 +09:00
Dean Herbert
7e5d5a197b Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 16:41:01 +09:00
Dean Herbert
f62677222c Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 13:08:53 +09:00
tgi74000
3454ec1ca3 Set Value instead of BindTo 2018-04-15 20:23:57 +02:00
tgi74000
4c08aa3dfb Merge remote-tracking branch 'upstream/master' 2018-04-15 20:22:16 +02:00
Dean Herbert
2eefe722f3 Move cache to a slightly more familiar place and add comment 2018-04-16 00:38:32 +09:00
Dean Herbert
c9615f837a Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot 2018-04-16 00:20:06 +09:00
tgi74000
b23b0a445b Add support for replay mods 2018-04-13 15:41:35 +02:00
Dean Herbert
a0f9f8d512 Update frramework again 2018-04-13 21:47:50 +09:00
smoogipoo
733f70cbd5 Merge remote-tracking branch 'origin/master' into instant-hide-screenshot 2018-04-13 21:13:09 +09:00
smoogipoo
cd594ce12b BDL cache screenshot manager 2018-04-13 20:46:01 +09:00
Dean Herbert
9f5a52b641 Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler 2018-04-13 19:54:15 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
2e5bbe7074 Don't expose CursorOverrideContainer via DI + internalise access 2018-04-13 17:36:38 +09:00
TocoToucan
7c3441e2d0 ActiveInputHandlers -> IgnoredInputHandler 2018-04-12 17:06:35 +03:00
Dean Herbert
421e9e0641 Add xmldoc to some high-level classes to explain their separation 2018-04-08 12:58:34 +09:00
naoey
c304c1eecf
Make LinkFlowContainer handle beatmap id lookup in game. 2018-04-04 21:23:51 +05:30
Dean Herbert
1d3c9098b8 Load component asynchronously 2018-03-22 21:42:57 +09:00
Dean Herbert
74191e1b73 Merge remote-tracking branch 'upstream/master' into take_screenshot 2018-03-22 20:49:17 +09:00
Dean Herbert
e5f83530b8 Only allow settings or notifications to be visible at once
Resolves #2273.
2018-03-22 19:49:31 +09:00
TocoToucan
245200d3ee Add simple screenshot notification 2018-03-16 21:25:00 +03:00
TocoToucan
604e725f3f Remove redundant code 2018-03-16 20:42:05 +03:00
TocoToucan
5a1af062d3 Handle GlobalAction.TakeScreenshot in ScreenshotManager 2018-03-14 22:55:24 +03:00
TocoToucan
0e69ab1615 Introduce ScreenshotManager class 2018-03-14 00:17:12 +03:00
TocoToucan
e6c22e2287 Taking screenshot support initial commit 2018-03-10 21:59:20 +03:00
Dean Herbert
f78538fea8
Merge branch 'master' into user-profile-recent 2018-03-07 19:41:52 +09:00
Dean Herbert
fac4cd6a32 Move to overlayContent 2018-03-07 14:20:47 +09:00
jorolf
3a420ba826 add the volume overlay 2018-03-03 19:08:35 +01:00
Dean Herbert
eacb9ba743
Merge branch 'master' into user-profile-recent 2018-02-28 23:49:33 +09:00
naoey
2e535afb84
Remove redundant subsection title.
- Also handle opening UserProfile in LinkFlowContainer similar to how
beatmaps and channels are handled
2018-02-28 15:25:29 +05:30
Dean Herbert
d2f98642a1
Merge branch 'master' into confine-mode-reset 2018-02-26 20:59:53 +09:00
Dean Herbert
e9c5834387 Add query method for now 2018-02-23 13:26:01 +09:00
Dean Herbert
402d71a8d9 Add user skin setting storage 2018-02-22 16:29:05 +09:00
Dean Herbert
4c14b32783 Add basic skin database model layout and importing 2018-02-22 15:46:11 +09:00
Dean Herbert
c84ded258f Reset mouse confine mode on input setting reset hotkey 2018-02-22 10:08:56 +09:00
Dean Herbert
a0a65abcac Crentalise all import logic 2018-02-15 14:22:39 +09:00
Dan Balasescu
0589708da5
Merge branch 'master' into inactive-volume-duck 2018-02-01 16:21:33 +09:00
Dean Herbert
cdf4d9b033 Remove empty line 2018-01-31 18:33:18 +09:00
Dean Herbert
335f0d577c Add the ability to duck volume when the game is inactive 2018-01-31 18:16:55 +09:00
Dean Herbert
28b67e3d77
Merge branch 'master' into url-parsing-support 2018-01-30 17:47:55 +09:00
Dan Balasescu
2bae22999d
Merge branch 'master' into global-mod-binding 2018-01-29 15:18:11 +09:00
Dean Herbert
6e0cb1adb3 Remove redundant arguments 2018-01-29 15:05:07 +09:00
Dean Herbert
a5b0d51205 Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-01-27 14:06:58 +09:00
Dean Herbert
7852015db3 Remember mod selection when re-entering song select
Removes mod application when exiting back to main menu.

Alternative to #1968.
Closes #1961.
2018-01-26 19:32:57 +09:00
smoogipoo
9ac035f3d5 Merge branch 'bdl-cache-changes' into ruleset-configs 2018-01-22 13:11:45 +09:00
smoogipoo
b4e1872322 osu!-side changes in-line with framework BDL cache changes 2018-01-22 12:56:30 +09:00
smoogipoo
7910b47868 Move ConfigManager registration/dependency injection to RulesetContainer 2018-01-18 17:00:23 +09:00
Dean Herbert
73d69e2fd9 Add more xmldoc 2018-01-17 20:32:26 +09:00
Dean Herbert
38c5434b82 Remove placeholder methods in OsuGame
Let's add these when they can actually be implemented.
2018-01-17 20:32:20 +09:00
Dean Herbert
3892965894 Remove unnecessary region and make methods public 2018-01-17 19:45:10 +09:00