Dan Balasescu
|
841805f8f0
|
Merge pull request #1163 from peppy/move-screen-restrictions
Move beatmap/ruleset change restrictions to OsuGame
|
2017-08-22 16:48:13 +09:00 |
|
smoogipooo
|
2f2abf122b
|
Add exceptions galore.
|
2017-08-22 16:46:12 +09:00 |
|
smoogipooo
|
e337fbcf4f
|
Make availableColumns into a ctor argument.
|
2017-08-22 16:22:40 +09:00 |
|
smoogipooo
|
0189f01402
|
Explicitly store defaultSpeedAdjustment, and make it un-removable
|
2017-08-22 16:15:50 +09:00 |
|
smoogipooo
|
5a3c0de7ad
|
Fix further incorrect comparison.
|
2017-08-22 16:10:58 +09:00 |
|
smoogipooo
|
a737f5fe0d
|
CI fixes.
|
2017-08-22 16:06:25 +09:00 |
|
smoogipooo
|
d20ea97e7f
|
Add NUnit test for ScrollingHitObjectContainer
Tests ordering of SpeedAdjustmentContainers and DrawableHitObjects added to the ScrollingHitObjectContainer.
|
2017-08-22 16:06:19 +09:00 |
|
smoogipooo
|
c3cfad4eb5
|
Add RemoveSpeedAdjustment
|
2017-08-22 16:06:14 +09:00 |
|
smoogipooo
|
4fc77be624
|
Fix incorrect sorting of hit objects into SpeedAdjustmentContainers
|
2017-08-22 16:06:09 +09:00 |
|
smoogipooo
|
6f662d721c
|
Fix possible CollectionModifiedException while adding new SpeedAdjustmentContainers
|
2017-08-22 16:06:04 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
5fcd94880d
|
Fix incorrect inequality with multiple speed adjustments at the same start time.
|
2017-08-22 16:05:53 +09:00 |
|
Dean Herbert
|
09dd0cabd6
|
Move beatmap/ruleset change restrictions to OsuGame
Allows test cases to more freely exist
|
2017-08-22 15:59:32 +09:00 |
|
Dean Herbert
|
18645fcf29
|
Update volume control logic to use key bindings
Fixes them not working at all, too.
|
2017-08-22 14:48:04 +09:00 |
|
Dean Herbert
|
ff8ad30127
|
Add support for binding mousewheel actions
|
2017-08-22 14:44:34 +09:00 |
|
smoogipooo
|
909cae5861
|
CI fixes.
|
2017-08-22 14:21:28 +09:00 |
|
smoogipooo
|
68c7226d12
|
Fix cherry pick issues.
|
2017-08-22 14:18:17 +09:00 |
|
smoogipooo
|
9a7c9e9af0
|
Disable reversing for now - this needs to be re-implemented in a later PR.
|
2017-08-22 14:17:57 +09:00 |
|
smoogipooo
|
cd3c825bd2
|
Fix mania playfield not working.
|
2017-08-22 14:07:46 +09:00 |
|
smoogipooo
|
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 |
|
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 |
|