|
|
0189f01402
|
Explicitly store defaultSpeedAdjustment, and make it un-removable
|
2017-08-22 16:15:50 +09:00 |
|
|
|
5a3c0de7ad
|
Fix further incorrect comparison.
|
2017-08-22 16:10:58 +09:00 |
|
|
|
a737f5fe0d
|
CI fixes.
|
2017-08-22 16:06:25 +09:00 |
|
|
|
d20ea97e7f
|
Add NUnit test for ScrollingHitObjectContainer
Tests ordering of SpeedAdjustmentContainers and DrawableHitObjects added to the ScrollingHitObjectContainer.
|
2017-08-22 16:06:19 +09:00 |
|
|
|
c3cfad4eb5
|
Add RemoveSpeedAdjustment
|
2017-08-22 16:06:14 +09:00 |
|
|
|
4fc77be624
|
Fix incorrect sorting of hit objects into SpeedAdjustmentContainers
|
2017-08-22 16:06:09 +09:00 |
|
|
|
6f662d721c
|
Fix possible CollectionModifiedException while adding new SpeedAdjustmentContainers
|
2017-08-22 16:06:04 +09:00 |
|
|
|
b7b8d8b764
|
Let's not construct scrolling containers in load() for now
This isn't utilized at the moment, and we should be avoiding this here in the first place.
|
2017-08-22 16:05:59 +09:00 |
|
|
|
5fcd94880d
|
Fix incorrect inequality with multiple speed adjustments at the same start time.
|
2017-08-22 16:05:53 +09:00 |
|
|
|
09dd0cabd6
|
Move beatmap/ruleset change restrictions to OsuGame
Allows test cases to more freely exist
|
2017-08-22 15:59:32 +09:00 |
|
|
|
18645fcf29
|
Update volume control logic to use key bindings
Fixes them not working at all, too.
|
2017-08-22 14:48:04 +09:00 |
|
|
|
ff8ad30127
|
Add support for binding mousewheel actions
|
2017-08-22 14:44:34 +09:00 |
|
|
|
68c7226d12
|
Fix cherry pick issues.
|
2017-08-22 14:18:17 +09:00 |
|
|
|
88151eff3f
|
Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.
|
2017-08-22 14:07:39 +09:00 |
|
|
|
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 |
|
|
|
964982e2e6
|
Remove now unneeded ApplyBeatmap.
|
2017-08-22 14:05:28 +09:00 |
|
|
|
31bb1ebe0e
|
Add comment and index on column
|
2017-08-22 12:42:35 +09:00 |
|
|
|
881eecb528
|
Merge branch 'master' into master
|
2017-08-22 12:35:36 +09:00 |
|
|
|
7693fc1382
|
Merge branch 'master' into mask-settings-overlay
|
2017-08-22 00:22:39 +09:00 |
|
|
|
a9fe1d94f7
|
Remove unnecessary using
|
2017-08-21 23:41:51 +09:00 |
|
|
|
7d1c270126
|
Review fixes
|
2017-08-21 23:34:08 +09:00 |
|
|
|
1d0b89d592
|
Restore usage of AddRange
|
2017-08-21 18:51:14 +09:00 |
|
|
|
102caf4b91
|
Merge branch 'master' into chat-local-echo-v2
|
2017-08-21 18:27:32 +09:00 |
|
|
|
7903f49d27
|
Merge branch 'master' into action-key-counter
|
2017-08-21 17:47:19 +09:00 |
|
|
|
9ba2258f80
|
Add spaces for smoogipoo
|
2017-08-21 17:44:39 +09:00 |
|
|
|
877c69d5fe
|
Add local chat echo support
|
2017-08-21 17:43:26 +09:00 |
|
|
|
52dadad1e1
|
Merge branch 'master' into fix-taiko-barlines
|
2017-08-21 16:46:25 +09:00 |
|
|
|
ea450fecf5
|
Merge branch 'master' into action-key-counter
|
2017-08-21 16:25:44 +09:00 |
|
|
|
6e0d2182cb
|
CI.
|
2017-08-21 16:24:16 +09:00 |
|
|
|
5d13efa76d
|
Remove the concept of "queued hit objects", add a default speed adjustment.
|
2017-08-21 16:17:00 +09:00 |
|
|
|
ced919edd3
|
Merge branch 'master' into fix-speed-multipliers
|
2017-08-21 15:55:52 +09:00 |
|
|
|
be8bc5bdc8
|
Merge branch 'master' into action-key-counter
|
2017-08-21 15:54:54 +09:00 |
|
|
|
7a5708ce92
|
Further support for null judgements.
|
2017-08-21 15:35:16 +09:00 |
|
|
|
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 |
|
|
|
a63923a497
|
Remove type check for now
|
2017-08-21 12:50:48 +09:00 |
|
|
|
16e96888ab
|
Update KeyCounterCollection to support action-based buttons
|
2017-08-21 12:39:22 +09:00 |
|
|
|
6a7b410bc3
|
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
|
2017-08-21 11:58:54 +09:00 |
|
|
|
9b20da94e7
|
change Query to AllRulesets
|
2017-08-19 22:07:03 +02:00 |
|
|
|
bae1340b50
|
mask the settings overlay
|
2017-08-19 17:00:01 +02:00 |
|
|
|
3ea7be1ccf
|
Fix selecting unranked beatmaps in song select crashing the game. Fixes #1134.
|
2017-08-19 12:28:54 +09:00 |
|
|
|
f831832c59
|
CI fix
|
2017-08-19 00:13:06 +02:00 |
|
|
|
6d401b5f21
|
Merge branch 'master' into leaderboard-scores
|
2017-08-19 00:00:40 +02:00 |
|
|
|
86d97aa16b
|
Merge branch 'master' into taiko-timingchanges-2
|
2017-08-18 22:44:36 +09:00 |
|
|
|
c34033c94a
|
Merge branch 'master' into fix-track-not-resetting
|
2017-08-18 22:31:59 +09:00 |
|
|
|
bc7621607a
|
Merge upstream/master in.
|
2017-08-18 22:20:45 +09:00 |
|
|
|
d6249e7a63
|
Add support for binding mouse buttons to actions
|
2017-08-18 20:01:41 +09:00 |
|
|
|
4901ac9e35
|
Add some comments explaining why the Track is being forcefully added to the TrackManager
|
2017-08-18 18:01:18 +09:30 |
|
|
|
ffc8f763e5
|
Merge branch 'master' into fix-track-not-resetting
|
2017-08-18 17:24:22 +09:00 |
|
|
|
7ad4c046db
|
Make current value behaviour between channels and tabs consistent.
- Trim whitespace
|
2017-08-18 13:35:48 +05:30 |
|
|
|
90885a31ae
|
Round 2 of CI fixes.
|
2017-08-18 15:09:54 +09:00 |
|
