smoogipooo
|
d080a7e970
|
Determine size of ScrollingContainer a bit better to avoid taiko weirdness
|
2017-08-22 20:53:19 +09:00 |
|
smoogipooo
|
db27551709
|
Make hit objects put in ScrollingContainers strictly ordered by start time
This won't change anything as is since all hit objects are given a depth at the moment.
|
2017-08-22 20:51:20 +09: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 |
|
Dan Balasescu
|
7689c06471
|
Merge branch 'master' into cursor-rotation-delay
|
2017-08-22 20:28:28 +09: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
|
f371ca73f1
|
Merge branch 'master' into cursor-rotation-delay
|
2017-08-22 19:54:10 +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
|
480d839d67
|
Allow the notification overlay to close when all notifications are dismissed
|
2017-08-22 19:51:42 +09:00 |
|
smoogipooo
|
4c66a20d4e
|
Merge remote-tracking branch 'origin/master' into fix-speed-adjustments
|
2017-08-22 19:50:48 +09:00 |
|
Dean Herbert
|
9f69aa9082
|
Show a notification after a successful update
Allows access to the github changelog
|
2017-08-22 19:41:39 +09:00 |
|
Dean Herbert
|
0ea6c65be6
|
Fix potentially racey behaviour of versionManager initialisation
Changing the state while the container wasn't necessarily completed loading caused inconsistent behaviour.
|
2017-08-22 19:34:06 +09:00 |
|
Dean Herbert
|
ab0e3ccc55
|
Make SimpleNotifications support word wrap
|
2017-08-22 19:33:18 +09:00 |
|
smoogipooo
|
322dfe0250
|
Fix ScrollingContainer possibly not getting the correct size to cover hit objects.
|
2017-08-22 19:17:26 +09:00 |
|
Dean Herbert
|
9e96ee989d
|
Merge branch 'master' into volume-control-fixes
|
2017-08-22 18:59:02 +09:00 |
|
Dean Herbert
|
2f915fce40
|
Merge branch 'master' into cursor-rotation-delay
|
2017-08-22 18:58:57 +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 |
|
smoogipooo
|
d64071f3de
|
Fix up + make test case more sane.
|
2017-08-22 18:55:27 +09:00 |
|
smoogipooo
|
ad63cbf455
|
Fix default comparator being inverted.
|
2017-08-22 18:54:41 +09:00 |
|
smoogipooo
|
1964bc72e5
|
Should be FirstOrDefault for hit objects occuriung before the first control point.
|
2017-08-22 18:39:09 +09:00 |
|
smoogipooo
|
e5d985838f
|
Set ScrollingAxes and RelativeChildOffset a bit more safely.
|
2017-08-22 18:37:49 +09:00 |
|
smoogipooo
|
137964b792
|
Fix hit objects not getting added to the correct speed adjustment container.
|
2017-08-22 18:37:10 +09:00 |
|
smoogipooo
|
b46a51fd8b
|
Make the speed adjustment containers ordered decreasingly by their control point start time.
|
2017-08-22 18:36:32 +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
|
d8de6e289c
|
Don't start rotating the cursor until it has travelled a minimum disatnce
Some people, myself included, were annoyed by the rotation starting too soon (especially when dragging up and left one pixel).
|
2017-08-22 17:38:51 +09:00 |
|
Dean Herbert
|
a26885c1ab
|
Update framework
|
2017-08-22 17:25:45 +09:00 |
|
smoogipooo
|
790e0561df
|
Merge remote-tracking branch 'peppy/move-screen-restrictions' into fix-speed-adjustments
|
2017-08-22 17:25:24 +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 |
|