Jorolf
|
f8cc4238ff
|
cleanup code
|
2017-08-24 22:13:20 +02:00 |
|
Jorolf
|
d81956e974
|
use GameHost to check if caps lock is enabled
|
2017-08-22 15:43:45 +02:00 |
|
Jorolf
|
c29d3437ba
|
fix merge changes
|
2017-08-22 13:35:49 +02:00 |
|
Jorolf
|
2ccd6c6128
|
Merge branch 'master' of git://github.com/ppy/osu into caps-warning
# Conflicts:
# osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
|
2017-08-22 13:29:42 +02:00 |
|
Dean Herbert
|
bf13618c77
|
Merge pull request #1159 from smoogipooo/mania-key-conversion
Implement mania key conversion for converted beatmaps
|
2017-08-22 20:26:32 +09:00 |
|
Dean Herbert
|
9f52ecbb8a
|
Merge branch 'master' into mania-key-conversion
|
2017-08-22 20:08:39 +09:00 |
|
Dan Balasescu
|
a06cd9b419
|
Merge pull request #1161 from peppy/volume-control-fixes
Update volume control logic to use key bindings
|
2017-08-22 19:52:39 +09:00 |
|
Dean Herbert
|
9e96ee989d
|
Merge branch 'master' into volume-control-fixes
|
2017-08-22 18:59:02 +09:00 |
|
Dan Balasescu
|
ad16f41e26
|
Merge pull request #1162 from peppy/nullref-fix
Fix a nullref when reaching the results screen with no user provided
|
2017-08-22 18:56:06 +09:00 |
|
Dean Herbert
|
c5a20e3372
|
Remove permitNulls
|
2017-08-22 18:28:32 +09:00 |
|
Dean Herbert
|
97acff535d
|
Tidy up conditionals
|
2017-08-22 18:21:00 +09:00 |
|
Dean Herbert
|
acf5442ca3
|
Merge branch 'master' into nullref-fix
|
2017-08-22 18:19:15 +09:00 |
|
Dean Herbert
|
236a9ea728
|
Merge pull request #1165 from peppy/move-screen-restrictions
Fix backwards conditional causing crash at song select
|
2017-08-22 18:16:34 +09:00 |
|
Dean Herbert
|
fc076eaff3
|
Merge branch 'master' into move-screen-restrictions
|
2017-08-22 17:52:59 +09:00 |
|
Dean Herbert
|
398169782e
|
Merge pull request #1164 from smoogipooo/fix-speed-adjustments
Fix hit objects not being given the correct speed adjustments
|
2017-08-22 17:52:44 +09:00 |
|
Dean Herbert
|
a26885c1ab
|
Update framework
|
2017-08-22 17:25:45 +09:00 |
|
Dean Herbert
|
8f32fd28c9
|
Fix backwards conditional
|
2017-08-22 17:21:19 +09:00 |
|
Dean Herbert
|
8df72e0fec
|
Merge branch 'master' into fix-speed-adjustments
|
2017-08-22 17:07:31 +09:00 |
|
Dean Herbert
|
803cbddfe2
|
Ensure score's user is set directly from API
Previously would fail in visualtests due to `OsuGame` case.
|
2017-08-22 16:59:54 +09:00 |
|
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 |
|