smoogipoo
ef3fb8c05a
InputManager -> Container where KeyBindings are involved
2018-01-30 14:49:12 +09:00
Dean Herbert
df221b6786
Remove usage of ValueTuple to allow for dynamic recompilation
2018-01-29 17:45:23 +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
Dan Balasescu
ea0ef96557
Merge branch 'master' into global-mod-binding
2018-01-29 15:04:20 +09:00
Dean Herbert
0879366a30
Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support
2018-01-29 13:52:21 +09:00
Dean Herbert
2b14438fe4
Merge remote-tracking branch 'upstream/master' into url-parsing-support
2018-01-29 12:55:32 +09:00
Dean Herbert
247833174c
Fix incorrect case on migration file
2018-01-27 23:20:49 +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
TocoToucan
ce4122b3c4
Display visual settings overlay on PlayerLoader screen
2018-01-26 23:29:54 +03:00
TocoToucan
d82835107c
Remove autohide and clock related logic from Visual settings overlay
2018-01-26 22:20:24 +03:00
TocoToucan
615c831069
Merge from ppy/master
2018-01-26 21:56:17 +03:00
FreezyLemon
8f0ab2040f
Add Jetbrains.Annotations NuGet package
2018-01-26 12:46:28 +01: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
5742e61e68
Merge remote-tracking branch 'origin/master' into ruleset-configs
2018-01-26 15:39:09 +09:00
smoogipoo
929a710dfc
Merge remote-tracking branch 'peppy/databased-config' into ruleset-configs
2018-01-26 15:37:57 +09:00
Dan Balasescu
81c759f1e1
Make field readonly
2018-01-26 15:17:56 +09:00
smoogipoo
0a505dde2e
Remove MaskingAffectsInput override
2018-01-26 14:47:16 +09:00
Dean Herbert
7a2420ead2
Fix a couple of regressions
2018-01-26 08:21:09 +09:00
Dean Herbert
03154dbc63
Fix incorrect initial migration
...
Also adds variant to settings
2018-01-25 23:41:03 +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
smoogipoo
57cd50c45e
Reorder the way input is handled for replays
...
Fixes https://github.com/ppy/osu/issues/1625 .
2018-01-25 17:39:50 +09:00
Dean Herbert
fd7d7c3953
Merge branch 'master' into MakeMusicControllerDraggableAgain
2018-01-25 09:01:54 +09:00
Dean Herbert
b06f60ac3f
Merge branch 'master' into fix-settings
2018-01-25 07:17:21 +09:00
Dean Herbert
284ff226b1
Merge branch 'master' into local-name-fix
2018-01-25 06:50:28 +09:00
TocoToucan
51e188401f
Make MusicController draggable again
2018-01-25 00:38:22 +03:00
Dean Herbert
df43b7d84e
Merge branch 'master' into fix-settings
2018-01-25 01:21:41 +09:00
Dean Herbert
1e80908022
Merge branch 'master' into fix-settings
2018-01-25 01:19:44 +09:00
smoogipoo
b77f08941c
Make mania play the next note's sounds if no note is hit
...
Fixes #1911 .
This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.
2018-01-24 20:05:37 +09:00
Dean Herbert
53c6526b22
Remove unused code file
2018-01-24 18:04:54 +09:00
Dean Herbert
72df2c681b
Remove game-wise settings store for the time being
2018-01-24 18:01:39 +09:00
Dean Herbert
29e98a58f2
Combine Setting and DatabasedSetting
2018-01-24 17:59:49 +09:00
smoogipoo
8d11596b2f
Minor cleanups
2018-01-24 17:48:42 +09:00
Dean Herbert
aa913f6de5
Merge branch 'master' into ruleset-configs
2018-01-24 17:45:47 +09:00
Dean Herbert
5a00ae36d1
Add database-based configuration for rulesets
2018-01-24 17:45:28 +09:00
smoogipoo
7f299b2533
Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization
2018-01-24 17:44:28 +09:00
Aergwyn
205d3ed896
fix settings not getting injected
2018-01-23 19:42:21 +01:00
Michael Manis
6dfd0b5cc2
Unnecessary because of prior commit.
2018-01-23 10:55:22 -05:00
Michael Manis
d12e18d59b
merged with master
2018-01-23 10:50:57 -05:00
james58899
fa800f0977
fix storyboard path
2018-01-23 18:18:54 +08:00
Dean Herbert
b197cd56af
Allow DI'd OnScreenDisplay to be null
2018-01-23 16:42:31 +09:00
Dean Herbert
c01f67b0d8
Merge remote-tracking branch 'upstream/master' into ruleset-configs
2018-01-23 16:23:25 +09:00
Dean Herbert
384dc162b3
Merge branch 'master' into fix-repeat-confusion
2018-01-23 16:06:07 +09:00
Dean Herbert
52805cd82b
Merge branch 'master' into fix-repeat-confusion
2018-01-23 15:22:37 +09:00
Dan Balasescu
fcea12f83d
Merge branch 'master' into allow-quick-retry-key
2018-01-23 14:59:15 +09:00
Dean Herbert
b793c2ec93
Merge branch 'master' into bdl-cache-changes
2018-01-23 14:10:35 +09:00
smoogipoo
d37844c068
Clean up off-by-one offsets from repeat-related properties
2018-01-23 13:37:25 +09:00
Dean Herbert
fa1f4304f6
Remove usings
2018-01-23 13:24:04 +09:00
Dean Herbert
f823650b10
Allow user choice of the quick retry hotkey
2018-01-23 13:05:07 +09:00
Dean Herbert
b799dac5ac
Merge branch 'master' into mania_stage_fix
2018-01-23 10:55:33 +09:00
Felix Ang
d294fcfb0b
Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?)
2018-01-22 18:42:03 +01:00
Felix Ang
423559ec6c
Update license year.
2018-01-22 18:22:38 +01:00
Dean Herbert
76eac9057d
Merge branch 'master' into mania_stage_fix
2018-01-22 19:06:00 +09:00
Dean Herbert
95f941163b
Merge branch 'master' into direct-show-deleted-sets
2018-01-22 17:08:10 +09:00
Dan Balasescu
73799832ef
Merge branch 'master' into direct-show-deleted-sets
2018-01-22 16:54:32 +09:00
Dean Herbert
a931d6e381
Merge branch 'master' into fix-user-download-cancel
2018-01-22 16:27:26 +09:00
Aergwyn
82c8822888
we need to go back
...
reverted change and instead check `DeletePending` when retrieving existing online IDs
2018-01-22 08:04:14 +01:00
smoogipoo
c1331cef1b
Disallow DualStages for non-converted beatmaps
2018-01-22 15:52:54 +09:00
Dean Herbert
56c001fd29
Merge branch 'master' into fix-downloads-during-import
2018-01-22 15:43:39 +09:00
Michael Manis
64d7868c03
Update APi.Username in APIAccess intead of ignoring it.
2018-01-22 01:19:22 -05:00
Michael Manis
794ae5380a
Intverted conditionals.
2018-01-22 01:06:27 -05:00
Michael Manis
87ec36060d
Save the obtained username when online.
2018-01-22 00:50:31 -05:00
Michael Manis
c4252ee022
Use obtained value for displayed name.
2018-01-22 00:50:31 -05:00
Dan Balasescu
152475858b
Merge branch 'master' into fix-downloads-during-import
2018-01-22 14:25:24 +09:00
Dan Balasescu
20be4bbbcd
Merge branch 'master' into better-direct-progress-bar
2018-01-22 14:25:23 +09:00
Michael Manis
35e7399bef
Merge branch 'master' of https://github.com/ppy/osu into restart-crashfix
2018-01-21 23:56:16 -05:00
Dean Herbert
3d4e2d400c
Remove unused using
2018-01-22 13:52:10 +09:00
Dean Herbert
53e40a77dc
Don't show error messages when a download is user-cancelled
...
Resolves #1941 .
2018-01-22 13:25:49 +09:00
Dean Herbert
88beee2d1f
Keep downloads active until their associated import operation finishes
...
This avoids race conditions where a second download can potentially be started while the first is still active.
2018-01-22 13:20:04 +09:00
smoogipoo
9ac035f3d5
Merge branch 'bdl-cache-changes' into ruleset-configs
2018-01-22 13:11:45 +09:00
Dean Herbert
060d80efbe
Continue showing progress bar on direct panels when importing
...
Previously the progrress bar would fade out once downloads completed, which felt unintuitive.
2018-01-22 13:05:07 +09:00
smoogipoo
b4e1872322
osu!-side changes in-line with framework BDL cache changes
2018-01-22 12:56:30 +09:00
Michael Manis
530e0afa2c
Use IsCurrentScreen instead of a bool for both checks now.
2018-01-21 22:27:15 -05:00
Michael Manis
964c6da9a4
Use IsCurrentScreen instead of a bool
2018-01-21 22:00:18 -05:00
Michael Manis
806da21760
Removed rreduntant initialization.
2018-01-21 20:24:19 -05:00
Michael Manis
ad2df8d8df
Fixed tilde-key crash at end of beatmap.
2018-01-21 20:09:44 -05:00
TocoToucan
e88f514cf4
Resolve merge conflicts
2018-01-21 18:32:21 +03:00
TocoToucan
4875443e12
Resolve merge conflicts
2018-01-21 18:11:43 +03:00
aQaTL
c4feb67bce
Using field properties to set mute / unmute instead of separate methods
2018-01-20 11:45:04 +01:00
Aergwyn
596044e19d
show beatmapsets with pending deletion in osu!direct
2018-01-19 17:25:32 +01:00
為什麼
feb79ff9e7
Merge branch 'master' into mania_stage_fix
2018-01-19 20:08:24 +08:00
Dean Herbert
652f273961
Ensure previews stop playing when they are removed from the draw hierarchy
2018-01-19 15:46:42 +09:00
aQaTL
4a85266fca
Using BindableBool to mute the volume when it's value changes
2018-01-18 17:23:02 +01:00
Dan Balasescu
250e936099
Merge branch 'master' into preview-fixes
2018-01-19 00:03:47 +09:00
Aergwyn
56619ae926
use ternary expression
2018-01-18 15:53:53 +01:00
smoogipoo
a94ea7025e
Register/Unregister -> BeginTracking/StopTracking and add exceptions
2018-01-18 18:45:48 +09:00
smoogipoo
dee298c395
No more statics + better unregistration
2018-01-18 17:40:05 +09:00
Dean Herbert
7ceed8b5eb
Stop any playing preview when closing the direct overlay
...
Resolves #1925
2018-01-18 17:28:56 +09:00
smoogipoo
7910b47868
Move ConfigManager registration/dependency injection to RulesetContainer
2018-01-18 17:00:23 +09:00
smoogipoo
c2c478750d
Remove generics from OSD registration methods
2018-01-18 16:57:32 +09:00
smoogipoo
09dfea7e29
Use tracked settings from ConfigManager changes
2018-01-18 15:26:03 +09:00
aQaTL
9c09b33e4e
Removed no longer used "lastVolume" field
2018-01-17 23:17:59 +01:00
aQaTL
18ff57fdf9
Inline changing mute icon properties with object creation
2018-01-17 21:09:46 +01:00
aQaTL
8471a579e0
Removed no longer neccessary "exiting" flag
2018-01-17 20:56:44 +01:00
aQaTL
a8fb732256
Added muted/unmuted icon
2018-01-17 20:43:08 +01:00
Aergwyn
65bac6d31a
return preview instead of nothing if it exists already
...
allows listening to it again after reaching the end
2018-01-17 20:36:47 +01:00
Aergwyn
f86cb30e47
prevent negative width on progress bar
2018-01-17 20:35:28 +01:00
ANDY840119-PC\andy840119
6c67f96fdb
fix ci error
2018-01-18 02:01:01 +09:00
aQaTL
1440edbf8b
Use AudioManager adjustments to mute volume
2018-01-17 17:15:13 +01:00
Dean Herbert
864d106635
Merge branch 'master' into fix-replays
2018-01-18 00:49:02 +09:00
smoogipoo
a05032779f
Remove unneeded event binding
2018-01-18 00:04:33 +09:00
aQaTL
ac41cb59ea
Typo fix, removed unnecessary braces
2018-01-17 14:36:33 +01:00
ANDY840119-PC\andy840119
3b291abf60
Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game/Rulesets/UI/Playfield.cs
2018-01-17 22:27:32 +09:00
smoogipoo
c79603290d
Move TriggerChange to LoadComplete()
2018-01-17 21:52:57 +09:00
Dean Herbert
e7524445ee
Use Restart()
2018-01-17 21:33:19 +09:00
Dean Herbert
54ed608ddb
Mute global track volume when a beatmap preview is playing
2018-01-17 21:26:12 +09:00
smoogipoo
d96234bf40
Enforce that there's only one configmanager per ruleset
2018-01-17 21:08:23 +09:00
smoogipoo
92da02db87
Add extension to filename
2018-01-17 21:07:37 +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
smoogipoo
9f4ebad6e3
Add mania config manager
2018-01-17 20:21:25 +09:00
smoogipoo
379688e2f2
Add todo
2018-01-17 20:15:17 +09:00
smoogipoo
da22b3ec49
No more sorting
2018-01-17 20:12:39 +09:00
smoogipoo
0b7e1ce667
Add a way to have ruleset-specific configs
2018-01-17 19:45:18 +09:00
Dean Herbert
3892965894
Remove unnecessary region and make methods public
2018-01-17 19:45:10 +09:00
Dean Herbert
5a80c49640
Improve reference xmldoc
2018-01-17 19:44:15 +09:00
Dean Herbert
b27577e242
Add temporary browser handling of beatmap difficulty loading
...
until we have an api method to support this.
2018-01-17 19:37:20 +09:00
Dan Balasescu
be225eff90
Merge branch 'master' into fix-replays
2018-01-17 18:01:41 +09:00
smoogipoo
a01e46bb68
Fix ScoreStore replays not getting users
2018-01-17 17:55:55 +09:00
smoogipoo
2ebb3d6e0e
Fix ReplayLoader not being treated as having a replay loaded
...
Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.
2018-01-17 17:37:14 +09:00
Dean Herbert
783ca40c64
Update with upstream changes
2018-01-17 16:51:47 +09:00
Dean Herbert
54b0f4b912
Merge branch 'master' into url-parsing-support
2018-01-17 16:16:55 +09:00
smoogipoo
52b48f2b7e
Fix replays not correctly considering negative time diffs
2018-01-17 15:23:07 +09:00
aQaTL
538c20a947
Prevent not saving audio levels when user alt tabs before the window closes
2018-01-16 21:31:33 +01:00
aQaTL
0340e4f8dc
Option in settings to toggle mute/unmute when losing/gaining window focus
2018-01-16 20:33:30 +01:00
aQaTL
9277586907
Toggle mute/unmute keyboard shortcut
2018-01-16 17:46:54 +01:00
Dean Herbert
5212194e3f
Merge remote-tracking branch 'ppy/master' into fix-cursor-hiding
2018-01-17 00:44:42 +09:00
Dean Herbert
5e1cd8ddc4
Apply conditionals directly rather than using an in-between property
2018-01-16 20:34:40 +09:00
Dean Herbert
e7a0a02466
Don't limit keyboard input based on menu button scale
2018-01-16 20:34:40 +09:00
Dean Herbert
39af9321cf
Remove unnecessary overrides
2018-01-16 20:34:40 +09:00
smoogipoo
02564db43f
Merge remote-tracking branch 'origin/master' into fix-cursor-hiding
2018-01-16 20:20:47 +09:00
Dean Herbert
9b33499fe7
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
2018-01-16 20:04:34 +09:00
smoogipoo
d8275c4f9b
Fix beatmap query not including beatmap files
2018-01-16 18:20:46 +09:00
Dean Herbert
5edff5c5fc
Merge branch 'master' into fix-cursor-hiding
2018-01-16 18:15:22 +09:00
Dean Herbert
56df27fcc2
Merge branch 'master' into fix-event-bindings
2018-01-16 17:49:01 +09:00
Dean Herbert
976f7cec39
Merge branch 'master' into playfield-judgements
2018-01-16 15:26:13 +09:00
Dean Herbert
807e455a58
Merge branch 'master' into more-nested-playfields
2018-01-16 14:50:09 +09:00
smoogipoo
0459f0a069
Invert CanShowCursor conditional to fix cursor not showing in VisualTests
2018-01-16 13:40:02 +09:00
Dan Balasescu
480a75b8d9
Merge branch 'master' into hr-crashing-game
2018-01-16 13:18:02 +09:00
TocoToucan
c3ca40dcff
Local functions related CI fixes
2018-01-15 23:27:00 +03:00
TocoToucan
3c11978cfa
Use local functions
2018-01-15 21:42:17 +03:00
TocoToucan
a81f32a388
PlayerGroup -> PlayerSettingsGroup
2018-01-15 20:52:52 +03:00
aQaTL
65ecc18141
Cap ApproachRate in HardRock mod at 10.0f
2018-01-15 16:11:00 +01:00
smoogipoo
8c5ef0a330
Remove base OnJudgement from Playfield to properly accomodate nested playfields
2018-01-15 20:48:57 +09:00
smoogipoo
c32ff9c43b
Move nested playfields to the base Playfield
2018-01-15 20:39:57 +09:00
smoogipoo
0ae0dac192
Fix DrawableHitObject not binding nested hitobject events
2018-01-15 20:35:38 +09:00
smoogipoo
28586317dd
Give stages a size again
2018-01-15 19:44:42 +09:00
smoogipoo
561786c5ef
Generate the correct default bindings for variants
2018-01-15 19:25:14 +09:00
Dean Herbert
053a29f9a7
Make judgements visually smaller
...
This is a temporary change based on people's feedback. Makes judgements feel a lot better.
nb: This is one of my changes that I've had deployed sinfce the end-of-year 2017 build.
2018-01-15 17:41:17 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering
2018-01-15 15:54:18 +09:00
