|
|
46a7de1845
|
Merge branch 'master' into fix-taiko-fastforwarding
|
2018-01-31 18:30:41 +09:00 |
|
|
|
ef6adb0c27
|
Merge pull request #1921 from aQaTL/mute-toggle
Ability to mute the game using F4 (or button on volume control)
|
2018-01-31 18:30:31 +09:00 |
|
|
|
888d2362fd
|
Merge branch 'master' into fix-taiko-fastforwarding
|
2018-01-31 18:30:15 +09:00 |
|
|
|
fef69cea04
|
Revert "Add volume ducking"
This reverts commit 01325de3a2897a24b2ba0f585d7e976d0fb44b70.
|
2018-01-31 18:12:25 +09:00 |
|
|
|
47b92f3d1d
|
Fix mute button not prolonging volume control display
|
2018-01-31 18:00:44 +09:00 |
|
|
|
93ffa1f8a2
|
Fix button alignment and animation
|
2018-01-31 17:36:53 +09:00 |
|
|
|
86f5c9d6f1
|
Add inactive volume ducking, rather than outright mute
|
2018-01-31 16:57:26 +09:00 |
|
|
|
97ae44f23c
|
Remove outwards exposure of mute property
|
2018-01-31 16:56:26 +09:00 |
|
|
|
2865dd3a10
|
Replace missed hardcoded int with enum reference
|
2018-01-31 16:20:01 +09:00 |
|
|
|
5a99651561
|
Remove unnecessary arrays
|
2018-01-31 16:10:55 +09:00 |
|
|
|
042a34e1c2
|
Add migration to ensure database aligns to changed enum
|
2018-01-31 16:10:48 +09:00 |
|
|
|
b47061f43d
|
Merge remote-tracking branch 'upstream/master' into mute-toggle
|
2018-01-31 14:20:15 +09:00 |
|
|
|
340412e470
|
Merge pull request #1944 from ThePyrotechnic/restart-crashfix
Fixed holding retry hotkey at end of map causing hard crash
|
2018-01-30 18:40:09 +09:00 |
|
|
|
df65443f07
|
Merge branch 'master'
Conflicts:
osu-framework
osu.Game/Screens/Play/Player.cs
|
2018-01-30 18:31:03 +09:00 |
|
|
|
749fb29445
|
Merge pull request #1992 from smoogipoo/rename-inputmanager
Rename "InputManager" to "Container" where keybindings are involved
|
2018-01-30 15:02:17 +09:00 |
|
|
|
b4cd8ea716
|
GlobalKeyBindingContainer -> GlobalActionContainer
Consitent with "FrameworkActionContainer".
|
2018-01-30 14:54:30 +09:00 |
|
|
|
ef3fb8c05a
|
InputManager -> Container where KeyBindings are involved
|
2018-01-30 14:49:12 +09:00 |
|
|
|
445af2ba7a
|
Merge pull request #1983 from peppy/global-mod-binding
Remember mod selection when re-entering song select
|
2018-01-29 15:26:48 +09:00 |
|
|
|
2bae22999d
|
Merge branch 'master' into global-mod-binding
|
2018-01-29 15:18:11 +09:00 |
|
|
|
188fc1e6c2
|
Merge pull request #1991 from peppy/update-framework
Update framework
|
2018-01-29 15:18:01 +09:00 |
|
|
|
6e0cb1adb3
|
Remove redundant arguments
|
2018-01-29 15:05:07 +09:00 |
|
|
|
ea0ef96557
|
Merge branch 'master' into global-mod-binding
|
2018-01-29 15:04:20 +09:00 |
|
|
|
fc11cac5a0
|
Update framework
|
2018-01-29 15:03:19 +09:00 |
|
|
|
c38f06fd61
|
Merge pull request #1984 from FreezyLemon/add-r#-annotation-support
Add JetBrains.Annotations NuGet package
|
2018-01-29 14:07:17 +09:00 |
|
|
|
b789db3a1e
|
Update framework
|
2018-01-29 13:53:35 +09:00 |
|
|
|
0879366a30
|
Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support
|
2018-01-29 13:52:21 +09:00 |
|
|
|
cb939d5370
|
Merge pull request #1986 from peppy/fix-csproj-case
Fix incorrect case on migration file
|
2018-01-28 08:59:11 +09:00 |
|
|
|
247833174c
|
Fix incorrect case on migration file
|
2018-01-27 23:20:49 +09:00 |
|
|
|
cff3f25cd7
|
make all line endings CR LF (windows style)
|
2018-01-26 12:46:58 +01:00 |
|
|
|
8f0ab2040f
|
Add Jetbrains.Annotations NuGet package
|
2018-01-26 12:46:28 +01:00 |
|
|
|
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 |
|
|
|
545a4bd082
|
Merge pull request #1929 from smoogipoo/ruleset-configs
Implement ruleset-specific config managers and attach them to the global OnScreenDisplay
|
2018-01-26 17:54:38 +09:00 |
|
|
|
5bb547530b
|
Merge branch 'master' into ruleset-configs
|
2018-01-26 17:03:38 +09:00 |
|
|
|
14092006ef
|
Merge pull request #1953 from Aergwyn/fix-repeats-appearing-early
Fix RepeatPoint animations
|
2018-01-26 16:41:28 +09:00 |
|
|
|
755ae9802c
|
Merge branch 'master' into fix-repeats-appearing-early
|
2018-01-26 15:45:20 +09:00 |
|
|
|
1ab2a4075f
|
Update resources
|
2018-01-26 15:39:37 +09:00 |
|
|
|
5742e61e68
|
Merge remote-tracking branch 'origin/master' into ruleset-configs
|
2018-01-26 15:39:09 +09:00 |
|
|
|
929a710dfc
|
Merge remote-tracking branch 'peppy/databased-config' into ruleset-configs
|
2018-01-26 15:37:57 +09:00 |
|
|
|
81c759f1e1
|
Make field readonly
|
2018-01-26 15:17:56 +09:00 |
|
|
|
db58e4dbfe
|
Update framework again
|
2018-01-26 15:02:55 +09:00 |
|
|
|
0a505dde2e
|
Remove MaskingAffectsInput override
|
2018-01-26 14:47:16 +09:00 |
|
|
|
7a2420ead2
|
Fix a couple of regressions
|
2018-01-26 08:21:09 +09:00 |
|
|
|
3b9318e894
|
Update framework
|
2018-01-26 07:39:03 +09:00 |
|
|
|
03154dbc63
|
Fix incorrect initial migration
Also adds variant to settings
|
2018-01-25 23:41:03 +09:00 |
|
|
|
92df704fbd
|
Fix up taiko not having any important frames
|
2018-01-25 21:37:38 +09:00 |
|
|
|
45e8a2b69b
|
Remove ManiaPlayfield local scrollTime bindable
Now not needed due to having this databased.
|
2018-01-25 20:49:25 +09:00 |
|
|
|
80b8780f56
|
Revert "Remove game-wise settings store for the time being"
This reverts commit 72df2c681b.
|
2018-01-25 18:08:50 +09:00 |
|
|
|
c2a58223c5
|
Update framework
|
2018-01-25 17:55:41 +09:00 |
|
|
|
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 |
|
|
|
08ffd886e3
|
Merge pull request #1975 from peppy/new-hitsounds
Add new default hitsounds (thanks to cYsmix)
|
2018-01-25 11:32:57 +09:00 |
|
