1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 16:07:24 +08:00
Commit Graph

10346 Commits

Author SHA1 Message Date
Dean Herbert
1920a4e029 Prepare tests for fixing 2018-01-29 18:47:14 +09:00
Dean Herbert
f996acd7e6 Add back old non-visual tests 2018-01-29 18:37:11 +09:00
Dean Herbert
c07a31a484 Add new (failing) tests 2018-01-29 17:45:39 +09:00
Dean Herbert
df221b6786 Remove usage of ValueTuple to allow for dynamic recompilation 2018-01-29 17:45:23 +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
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
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
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
Dean Herbert
03154dbc63 Fix incorrect initial migration
Also adds variant to settings
2018-01-25 23:41:03 +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
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
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
Dean Herbert
b3b4e04950
Merge pull request #1965 from Aergwyn/fix-settings
Fix settings button
2018-01-25 08:54:19 +09:00
Dean Herbert
b06f60ac3f
Merge branch 'master' into fix-settings 2018-01-25 07:17:21 +09:00
Dean Herbert
d08e8b0c97
Merge pull request #1950 from ThePyrotechnic/local-name-fix
Use obtained value for displayed name.
2018-01-25 07:05: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
a9cf9ec5bb
Merge pull request #1972 from smoogipoo/mania-stage-sounds
Make mania play the next note's sounds if no note is hit
2018-01-25 01:21:31 +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
Dan Balasescu
3a7f20e530
Merge pull request #1898 from UselessToucan/RefactorPlayerOverlaysInitialization
Do not assign hudOverlay's and breakOverlay's members in Player class
2018-01-24 18:31:24 +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
49e61b5658 Update framework 2018-01-24 17:59:27 +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
Aergwyn
52c4d22c41 review changes
- use doubles instead of floats
- simplify logic
2018-01-24 09:44:50 +01:00
smoogipoo
7f299b2533 Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization 2018-01-24 17:44:28 +09:00
Dan Balasescu
4aeb5271d4
Merge pull request #1959 from james58899/fix-sb-path
Fix storyboard using incorrect path separator
2018-01-24 15:29:08 +09:00
Aergwyn
205d3ed896 fix settings not getting injected 2018-01-23 19:42:21 +01:00
Michael Manis
60078e962a Merge branch 'local-name-fix' of https://github.com/ThePyrotechnic/osu into local-name-fix 2018-01-23 10:59:23 -05:00
Michael Manis
6dfd0b5cc2 Unnecessary because of prior commit. 2018-01-23 10:55:22 -05:00