Commit Graph

6702 Commits

Author SHA1 Message Date
480d839d67 Allow the notification overlay to close when all notifications are dismissed 2017-08-22 19:51:42 +09:00
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
c5a20e3372 Remove permitNulls 2017-08-22 18:28:32 +09:00
acf5442ca3 Merge branch 'master' into nullref-fix 2017-08-22 18:19:15 +09:00
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
fc076eaff3 Merge branch 'master' into move-screen-restrictions 2017-08-22 17:52:59 +09:00
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
8f32fd28c9 Fix backwards conditional 2017-08-22 17:21:19 +09:00
8df72e0fec Merge branch 'master' into fix-speed-adjustments 2017-08-22 17:07:31 +09:00
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
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
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
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
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
7c0c0775ee Merge pull request #1140 from jorolf/mask-settings-overlay
mask the settings overlay
2017-08-22 00:30:11 +09:00
7693fc1382 Merge branch 'master' into mask-settings-overlay 2017-08-22 00:22:39 +09:00
24eeaea5db Merge pull request #1154 from peppy/chat-local-echo-v2
Add local chat echo support
2017-08-22 00:04:44 +09:00
5c489eb3f0 Update framework 2017-08-21 23:46:37 +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
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
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
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
4ea82694bd Merge branch 'master' into fix-taiko-barlines 2017-08-21 16:53:47 +09:00
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
52dadad1e1 Merge branch 'master' into fix-taiko-barlines 2017-08-21 16:46:25 +09:00
8c84732a40 Merge branch 'master' into fix-taiko-drumroll-conversion 2017-08-21 16:35:31 +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
9369c18d77 Update framework. 2017-08-21 16:18:04 +09:00
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
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
6a7e868a2e Make taiko major bar line triangles show up again. Fixes #1081 2017-08-21 15:36:01 +09:00
7a5708ce92 Further support for null judgements. 2017-08-21 15:35:16 +09:00