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 |
|
Dean Herbert
|
52805cd82b
|
Merge branch 'master' into fix-repeat-confusion
|
2018-01-23 15:22:37 +09:00 |
|
Dan Balasescu
|
fcea12f83d
|
Merge branch 'master' into allow-quick-retry-key
|
2018-01-23 14:59:15 +09:00 |
|
Dean Herbert
|
0edcf1690b
|
Merge pull request #1945 from smoogipoo/bdl-cache-changes
Update usage of DI in-line with framework changes
|
2018-01-23 14:31:05 +09:00 |
|
Dean Herbert
|
2a9b773b49
|
Update framework
|
2018-01-23 14:10:51 +09:00 |
|
Dean Herbert
|
b793c2ec93
|
Merge branch 'master' into bdl-cache-changes
|
2018-01-23 14:10:35 +09:00 |
|
smoogipoo
|
33c52ba30f
|
Fix off-by-ones in RepeatPoint code
|
2018-01-23 13:58:43 +09:00 |
|
smoogipoo
|
d37844c068
|
Clean up off-by-one offsets from repeat-related properties
|
2018-01-23 13:37:25 +09:00 |
|
Dean Herbert
|
fa1f4304f6
|
Remove usings
|
2018-01-23 13:24:04 +09:00 |
|
Dean Herbert
|
f823650b10
|
Allow user choice of the quick retry hotkey
|
2018-01-23 13:05:07 +09:00 |
|
Dean Herbert
|
4f360eac56
|
Merge pull request #1908 from andy840119/mania_stage_fix
Split the playfield columns and change the key number by mod
|
2018-01-23 11:03:56 +09:00 |
|
Dean Herbert
|
b799dac5ac
|
Merge branch 'master' into mania_stage_fix
|
2018-01-23 10:55:33 +09:00 |
|
Dan Balasescu
|
9b471dea33
|
Back to max 10 special keys for now, change xmldoc to normal comment
|
2018-01-23 10:51:01 +09:00 |
|
Dan Balasescu
|
2bc67629b8
|
Improve xmldoc + remove explicit Special2 value
Special2 value is implicit at Special1 + 1 (2).
|
2018-01-23 10:03:34 +09:00 |
|
Dan Balasescu
|
8f4d62ec25
|
Merge pull request #1955 from fangerm/license-year
Update license year
|
2018-01-23 09:36:58 +09:00 |
|
Felix Ang
|
d294fcfb0b
|
Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?)
|
2018-01-22 18:42:03 +01:00 |
|
Felix Ang
|
423559ec6c
|
Update license year.
|
2018-01-22 18:22:38 +01:00 |
|