864d106635
Merge branch 'master' into fix-replays
2018-01-18 00:49:02 +09:00
a05032779f
Remove unneeded event binding
2018-01-18 00:04:33 +09:00
ac41cb59ea
Typo fix, removed unnecessary braces
2018-01-17 14:36:33 +01:00
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
c79603290d
Move TriggerChange to LoadComplete()
2018-01-17 21:52:57 +09:00
e7524445ee
Use Restart()
2018-01-17 21:33:19 +09:00
54ed608ddb
Mute global track volume when a beatmap preview is playing
2018-01-17 21:26:12 +09:00
d96234bf40
Enforce that there's only one configmanager per ruleset
2018-01-17 21:08:23 +09:00
92da02db87
Add extension to filename
2018-01-17 21:07:37 +09:00
73d69e2fd9
Add more xmldoc
2018-01-17 20:32:26 +09:00
38c5434b82
Remove placeholder methods in OsuGame
...
Let's add these when they can actually be implemented.
2018-01-17 20:32:20 +09:00
9f4ebad6e3
Add mania config manager
2018-01-17 20:21:25 +09:00
379688e2f2
Add todo
2018-01-17 20:15:17 +09:00
da22b3ec49
No more sorting
2018-01-17 20:12:39 +09:00
0b7e1ce667
Add a way to have ruleset-specific configs
2018-01-17 19:45:18 +09:00
3892965894
Remove unnecessary region and make methods public
2018-01-17 19:45:10 +09:00
5a80c49640
Improve reference xmldoc
2018-01-17 19:44:15 +09:00
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
be225eff90
Merge branch 'master' into fix-replays
2018-01-17 18:01:41 +09:00
a01e46bb68
Fix ScoreStore replays not getting users
2018-01-17 17:55:55 +09:00
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
783ca40c64
Update with upstream changes
2018-01-17 16:51:47 +09:00
54b0f4b912
Merge branch 'master' into url-parsing-support
2018-01-17 16:16:55 +09:00
52b48f2b7e
Fix replays not correctly considering negative time diffs
2018-01-17 15:23:07 +09:00
538c20a947
Prevent not saving audio levels when user alt tabs before the window closes
2018-01-16 21:31:33 +01:00
0340e4f8dc
Option in settings to toggle mute/unmute when losing/gaining window focus
2018-01-16 20:33:30 +01:00
9277586907
Toggle mute/unmute keyboard shortcut
2018-01-16 17:46:54 +01:00
5212194e3f
Merge remote-tracking branch 'ppy/master' into fix-cursor-hiding
2018-01-17 00:44:42 +09:00
5e1cd8ddc4
Apply conditionals directly rather than using an in-between property
2018-01-16 20:34:40 +09:00
e7a0a02466
Don't limit keyboard input based on menu button scale
2018-01-16 20:34:40 +09:00
39af9321cf
Remove unnecessary overrides
2018-01-16 20:34:40 +09:00
02564db43f
Merge remote-tracking branch 'origin/master' into fix-cursor-hiding
2018-01-16 20:20:47 +09:00
9b33499fe7
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
2018-01-16 20:04:34 +09:00
d8275c4f9b
Fix beatmap query not including beatmap files
2018-01-16 18:20:46 +09:00
5edff5c5fc
Merge branch 'master' into fix-cursor-hiding
2018-01-16 18:15:22 +09:00
56df27fcc2
Merge branch 'master' into fix-event-bindings
2018-01-16 17:49:01 +09:00
976f7cec39
Merge branch 'master' into playfield-judgements
2018-01-16 15:26:13 +09:00
807e455a58
Merge branch 'master' into more-nested-playfields
2018-01-16 14:50:09 +09:00
0459f0a069
Invert CanShowCursor conditional to fix cursor not showing in VisualTests
2018-01-16 13:40:02 +09:00
480a75b8d9
Merge branch 'master' into hr-crashing-game
2018-01-16 13:18:02 +09:00
c3ca40dcff
Local functions related CI fixes
2018-01-15 23:27:00 +03:00
3c11978cfa
Use local functions
2018-01-15 21:42:17 +03:00
a81f32a388
PlayerGroup -> PlayerSettingsGroup
2018-01-15 20:52:52 +03:00
65ecc18141
Cap ApproachRate in HardRock mod at 10.0f
2018-01-15 16:11:00 +01:00
8c5ef0a330
Remove base OnJudgement from Playfield to properly accomodate nested playfields
2018-01-15 20:48:57 +09:00
c32ff9c43b
Move nested playfields to the base Playfield
2018-01-15 20:39:57 +09:00
0ae0dac192
Fix DrawableHitObject not binding nested hitobject events
2018-01-15 20:35:38 +09:00
28586317dd
Give stages a size again
2018-01-15 19:44:42 +09:00
561786c5ef
Generate the correct default bindings for variants
2018-01-15 19:25:14 +09:00
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
