smoogipooo
|
4eec59f669
|
Only set the number of availableColumns once, at ManiaRulesetContainer level.
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
|
2017-08-22 14:07:37 +09:00 |
|
smoogipooo
|
964982e2e6
|
Remove now unneeded ApplyBeatmap.
|
2017-08-22 14:05:28 +09:00 |
|
Dean Herbert
|
3254e16e9c
|
Merge pull request #1090 from tgi74/master
Fix replays crashing and not finding their associated beatmap
|
2017-08-22 12:59:49 +09:00 |
|
Dean Herbert
|
31bb1ebe0e
|
Add comment and index on column
|
2017-08-22 12:42:35 +09:00 |
|
Dean Herbert
|
881eecb528
|
Merge branch 'master' into master
|
2017-08-22 12:35:36 +09:00 |
|
Dean Herbert
|
7c0c0775ee
|
Merge pull request #1140 from jorolf/mask-settings-overlay
mask the settings overlay
|
2017-08-22 00:30:11 +09:00 |
|
Dean Herbert
|
7693fc1382
|
Merge branch 'master' into mask-settings-overlay
|
2017-08-22 00:22:39 +09:00 |
|
Dan Balasescu
|
24eeaea5db
|
Merge pull request #1154 from peppy/chat-local-echo-v2
Add local chat echo support
|
2017-08-22 00:04:44 +09:00 |
|
Dean Herbert
|
5c489eb3f0
|
Update framework
|
2017-08-21 23:46:37 +09:00 |
|
Dean Herbert
|
a9fe1d94f7
|
Remove unnecessary using
|
2017-08-21 23:41:51 +09:00 |
|
Dean Herbert
|
7d1c270126
|
Review fixes
|
2017-08-21 23:34:08 +09:00 |
|
Dean Herbert
|
1d0b89d592
|
Restore usage of AddRange
|
2017-08-21 18:51:14 +09:00 |
|
Dean Herbert
|
102caf4b91
|
Merge branch 'master' into chat-local-echo-v2
|
2017-08-21 18:27:32 +09:00 |
|
Dean Herbert
|
fb43895908
|
Merge pull request #1151 from peppy/action-key-counter
Update KeyCounterCollection to support action-based buttons
|
2017-08-21 18:27:24 +09:00 |
|
Dean Herbert
|
7903f49d27
|
Merge branch 'master' into action-key-counter
|
2017-08-21 17:47:19 +09:00 |
|
Dean Herbert
|
9ba2258f80
|
Add spaces for smoogipoo
|
2017-08-21 17:44:39 +09:00 |
|
Dean Herbert
|
877c69d5fe
|
Add local chat echo support
|
2017-08-21 17:43:26 +09:00 |
|
Dean Herbert
|
5068bbfd87
|
Merge pull request #1153 from smoogipooo/fix-taiko-barlines
Fix taiko major bar lines not showing triangles
|
2017-08-21 17:10:11 +09:00 |
|
Dean Herbert
|
4ea82694bd
|
Merge branch 'master' into fix-taiko-barlines
|
2017-08-21 16:53:47 +09:00 |
|
Dean Herbert
|
26788e73c7
|
Merge pull request #1150 from smoogipooo/fix-taiko-drumroll-conversion
Fix TaikoBeatmapConverter attempting to convert taiko-specific drum rolls to hits
|
2017-08-21 16:53:31 +09:00 |
|
Dean Herbert
|
52dadad1e1
|
Merge branch 'master' into fix-taiko-barlines
|
2017-08-21 16:46:25 +09:00 |
|
Dean Herbert
|
8c84732a40
|
Merge branch 'master' into fix-taiko-drumroll-conversion
|
2017-08-21 16:35:31 +09:00 |
|
Dean Herbert
|
ea450fecf5
|
Merge branch 'master' into action-key-counter
|
2017-08-21 16:25:44 +09:00 |
|
smoogipooo
|
6e0d2182cb
|
CI.
|
2017-08-21 16:24:16 +09:00 |
|
smoogipooo
|
9369c18d77
|
Update framework.
|
2017-08-21 16:18:04 +09:00 |
|
Dean Herbert
|
2a57dc2bda
|
Merge pull request #1148 from smoogipooo/fix-speed-multipliers
Make DifficultyPoint.SpeedMultiplier actually reflect an increase/decrease in speed
|
2017-08-21 16:17:46 +09:00 |
|
smoogipooo
|
5d13efa76d
|
Remove the concept of "queued hit objects", add a default speed adjustment.
|
2017-08-21 16:17:00 +09:00 |
|
Dean Herbert
|
ced919edd3
|
Merge branch 'master' into fix-speed-multipliers
|
2017-08-21 15:55:52 +09:00 |
|
Dean Herbert
|
be8bc5bdc8
|
Merge branch 'master' into action-key-counter
|
2017-08-21 15:54:54 +09:00 |
|
smoogipooo
|
6a7e868a2e
|
Make taiko major bar line triangles show up again. Fixes #1081
|
2017-08-21 15:36:01 +09:00 |
|
smoogipooo
|
7a5708ce92
|
Further support for null judgements.
|
2017-08-21 15:35:16 +09:00 |
|
Dean Herbert
|
76fb84e082
|
Merge pull request #1152 from peppy/fix-sqlite-ci-failures
Fix CI failing on SQLite concurrency errors
|
2017-08-21 13:23:36 +09:00 |
|
Dean Herbert
|
e7c9aec1b1
|
Ensure the sqlite connection is correctly closed before the game ends
Hopefully fixes CI race conditions between consecutive tests.
|
2017-08-21 13:05:47 +09:00 |
|
Dean Herbert
|
a63923a497
|
Remove type check for now
|
2017-08-21 12:50:48 +09:00 |
|
Dean Herbert
|
16e96888ab
|
Update KeyCounterCollection to support action-based buttons
|
2017-08-21 12:39:22 +09:00 |
|
smoogipooo
|
0970439e34
|
Fix TaikoBeatmapConverter attempting to convert taiko-specific drum rolls to hits. Fixes #1149
|
2017-08-21 12:05:56 +09:00 |
|
smoogipooo
|
6a7b410bc3
|
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
|
2017-08-21 11:58:54 +09:00 |
|
Dan Balasescu
|
aa5afc30ef
|
Merge pull request #1142 from peppy/taiko-actions
Add key binding support to taiko
|
2017-08-21 00:32:21 +09:00 |
|
Dean Herbert
|
8364339617
|
Adjust with proposed formatting
|
2017-08-20 23:47:07 +09:00 |
|
Dean Herbert
|
325eaa8671
|
Add mouse buttons defaults for taiko
|
2017-08-20 22:26:33 +09:00 |
|
Dean Herbert
|
a18b2bd5f0
|
Hook everything up
|
2017-08-20 22:21:16 +09:00 |
|
Dean Herbert
|
ec08b2940d
|
Add taiko default keys
|
2017-08-20 21:56:37 +09:00 |
|
Dean Herbert
|
09b5eef26e
|
Fix incorrect osu! defaults
|
2017-08-20 21:56:28 +09:00 |
|
Dean Herbert
|
59fc6cbed7
|
Add action support to InputDrum
|
2017-08-20 21:51:56 +09:00 |
|
Dean Herbert
|
ff84eb219b
|
Add action support to taiko
|
2017-08-20 21:38:09 +09:00 |
|
Dean Herbert
|
a2c184ea43
|
Merge pull request #1133 from swoolcock/fix-slider-tracking-outside-follow-circle
Fix sliders not checking the correct cursor position
|
2017-08-20 18:42:24 +09:00 |
|
Dean Herbert
|
aebda8b032
|
Merge branch 'master' into fix-slider-tracking-outside-follow-circle
|
2017-08-20 18:27:38 +09:00 |
|
Dean Herbert
|
17b793a175
|
Merge pull request #1138 from Tom94/better-slider-step
Remove now unused TestSliderBar class
|
2017-08-20 14:42:35 +09:00 |
|
Dean Herbert
|
deb9a7b6ae
|
Merge branch 'master' into better-slider-step
|
2017-08-20 14:29:26 +09:00 |
|
Dean Herbert
|
477b8053d6
|
Merge pull request #1141 from jorolf/keybinding-missing-ruleset
Fix osu crashing if a ruleset went missing
|
2017-08-20 14:26:10 +09:00 |
|