1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 09:39:04 +08:00
Commit Graph

10550 Commits

Author SHA1 Message Date
Dean Herbert
df221b6786 Remove usage of ValueTuple to allow for dynamic recompilation 2018-01-29 17:45:23 +09:00
Thomas Tan
33c5fdcedb AppVeyor fix 2018-01-29 16:30:46 +08:00
Thomas Tan
c36859ea3a Create Slider.StackedPositionAt method 2018-01-29 16:22:14 +08:00
Thomas Tan
f66ecae3ff Merge remote-tracking branch 'upstream/master' into starrating-fix 2018-01-29 16:19:11 +08:00
Dean Herbert
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
Dan Balasescu
2bae22999d
Merge branch 'master' into global-mod-binding 2018-01-29 15:18:11 +09:00
Dan Balasescu
188fc1e6c2
Merge pull request #1991 from peppy/update-framework
Update framework
2018-01-29 15:18:01 +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
fc11cac5a0 Update framework 2018-01-29 15:03:19 +09:00
Dean Herbert
c38f06fd61
Merge pull request #1984 from FreezyLemon/add-r#-annotation-support
Add JetBrains.Annotations NuGet package
2018-01-29 14:07:17 +09:00
Dean Herbert
b789db3a1e Update framework 2018-01-29 13:53:35 +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
8425f3ee93
Merge branch 'master' into fix-ticks-appearing-late 2018-01-29 13:40:30 +09:00
Dean Herbert
2b14438fe4 Merge remote-tracking branch 'upstream/master' into url-parsing-support 2018-01-29 12:55:32 +09:00
Dan Balasescu
cb939d5370
Merge pull request #1986 from peppy/fix-csproj-case
Fix incorrect case on migration file
2018-01-28 08:59:11 +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
cff3f25cd7 make all line endings CR LF (windows style) 2018-01-26 12:46:58 +01: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
Dean Herbert
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
Aergwyn
b95719c23e Merge branch 'master' into fix-ticks-appearing-late 2018-01-26 09:07:33 +01:00
Dean Herbert
5bb547530b
Merge branch 'master' into ruleset-configs 2018-01-26 17:03:38 +09:00
Dan Balasescu
14092006ef
Merge pull request #1953 from Aergwyn/fix-repeats-appearing-early
Fix RepeatPoint animations
2018-01-26 16:41:28 +09:00
Dan Balasescu
755ae9802c
Merge branch 'master' into fix-repeats-appearing-early 2018-01-26 15:45:20 +09:00
smoogipoo
1ab2a4075f Update resources 2018-01-26 15:39:37 +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
Dean Herbert
db58e4dbfe Update framework again 2018-01-26 15:02:55 +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
3b9318e894 Update framework 2018-01-26 07:39:03 +09:00
Thomas Tan
469b13441b Fix mistake 2018-01-26 04:02:35 +08:00
Thomas Tan
b04e2cbb5c Fix osu star rating calculation
The main bug was that the beatmap was not being processed prior to
having its Skill values calculated, causing stacking to be ignored in
difficulty calculation. The fix involves processing the beatmap with
OsuBeatmapProcessor.

Another minor bug was that sliders were not taking into account the
stacked position midway through the slider (PositionAt does not return
stacked position.), so I corrected by adding StackOffset.
2018-01-26 03:39:19 +08:00
Dean Herbert
03154dbc63 Fix incorrect initial migration
Also adds variant to settings
2018-01-25 23:41:03 +09:00
smoogipoo
92df704fbd Fix up taiko not having any important frames 2018-01-25 21:37:38 +09:00
smoogipoo
45e8a2b69b Remove ManiaPlayfield local scrollTime bindable
Now not needed due to having this databased.
2018-01-25 20:49:25 +09:00
Aergwyn
214938b98d fix SliderTicks appearing too late 2018-01-25 10:52:03 +01: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
c2a58223c5 Update framework 2018-01-25 17:55:41 +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
Dan Balasescu
08ffd886e3
Merge pull request #1975 from peppy/new-hitsounds
Add new default hitsounds (thanks to cYsmix)
2018-01-25 11:32:57 +09:00
Dean Herbert
794d82d83f Add new default hitsounds
Getting these in for more widespread feedback.
2018-01-25 10:21:52 +09:00
Dean Herbert
59f62ad8cf
Merge pull request #1973 from UselessToucan/MakeMusicControllerDraggableAgain
Make MusicController draggable again
2018-01-25 09:18:07 +09:00
Dean Herbert
fd7d7c3953
Merge branch 'master' into MakeMusicControllerDraggableAgain 2018-01-25 09:01:54 +09:00