1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 03:02:54 +08:00
Commit Graph

11061 Commits

Author SHA1 Message Date
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
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
ColdVolcano
8eef81e24d Add more cases to TestCase 2018-01-24 16:16:46 -06: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
ColdVolcano
1f51149da8 Add xmldoc 2018-01-24 15:41:51 -06:00
TocoToucan
51e188401f Make MusicController draggable again 2018-01-25 00:38:22 +03:00
ColdVolcano
cee8bb50c9 Fix reference points being wrongly selected 2018-01-24 15:34:52 -06: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
Michael Manis
d12e18d59b merged with master 2018-01-23 10:50:57 -05:00
Aergwyn
4baadfdd16 fix oversight 2018-01-23 16:44:33 +01:00
ColdVolcano
efae00c149 make repeat points look better 2018-01-23 04:31:37 -06:00
james58899
fa800f0977
fix storyboard path 2018-01-23 18:18:54 +08:00
Aergwyn
2c0dd1815c Updated submodule osu-framework 2018-01-23 09:09:19 +01:00
Aergwyn
24b7d91f5b Merge branch 'master' into fix-repeats-appearing-early 2018-01-23 09:04:45 +01:00
Dean Herbert
b197cd56af Allow DI'd OnScreenDisplay to be null 2018-01-23 16:42:31 +09:00
Dean Herbert
1fda45fe10 Fix broken formatting 2018-01-23 16:40:18 +09:00
Dean Herbert
5689e93bed Update framework 2018-01-23 16:24:08 +09:00
Dean Herbert
c01f67b0d8 Merge remote-tracking branch 'upstream/master' into ruleset-configs 2018-01-23 16:23:25 +09:00
Dean Herbert
098cfa7107
Merge pull request #1957 from smoogipoo/fix-repeat-confusion
Clean up off-by-one offsets from repeat-related properties
2018-01-23 16:14:59 +09:00
Dean Herbert
384dc162b3
Merge branch 'master' into fix-repeat-confusion 2018-01-23 16:06:07 +09:00
Dean Herbert
68161fa543
Merge pull request #1956 from peppy/allow-quick-retry-key
Allow user choice of the quick retry hotkey
2018-01-23 15:58:48 +09:00