Commit Graph

740 Commits

Author SHA1 Message Date
250fb33fbc Merge branch 'master' into ranks-section 2017-08-22 12:46:28 +09:00
881eecb528 Merge branch 'master' into master 2017-08-22 12:35:36 +09:00
7903f49d27 Merge branch 'master' into action-key-counter 2017-08-21 17:47:19 +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
7a5708ce92 Further support for null judgements. 2017-08-21 15:35:16 +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
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
bc7621607a Merge upstream/master in. 2017-08-18 22:20:45 +09:00
90885a31ae Round 2 of CI fixes. 2017-08-18 15:09:54 +09:00
a47b6526a2 Fix CI issues. 2017-08-18 14:40:36 +09:00
68303accef Merge branch 'master' into make-rulesetinfo-iequatable 2017-08-18 14:28:42 +09:00
dc31a0f0ac Merged ppy/master 2017-08-17 13:01:42 +02:00
586a652b08 Changed Mods to be a property 2017-08-17 12:24:22 +02:00
105048500a Made modString private and moved the beatmap assignment inside GetScoresRequest 2017-08-15 15:30:53 +02:00
2c287e1348 CI and comment fix 2017-08-15 12:27:51 +02:00
21ced32297 Formatted and commented the GetAllMods() function 2017-08-15 12:03:43 +02:00
e908a3675e Formatted the GetAllMods() function 2017-08-14 18:24:54 +02:00
5ed717ef86 Shortened GetAllMods() using LINQ 2017-08-14 15:16:22 +02:00
920710e7d0 Assign a score's beatmap and cleanup to the Score class 2017-08-14 13:30:54 +02:00
7c9d6c9c83 Initial refactoring of key binding logic 2017-08-14 20:19:25 +09:00
e54f659916 Suggested changes 2017-08-13 22:37:39 +02:00
2f89fc432b Removed unused function 2017-08-13 20:28:30 +02:00
81289db33b CI fix, fixed nullref and removed abstraction of GetAutoplayMod 2017-08-13 20:12:01 +02:00
d9c26f98c7 Suggested changes 2017-08-13 19:54:07 +02:00
997d0c9053 CI fix 2017-08-13 17:45:46 +02:00
4c2d7bf343 Parse the mods of a leaderboard's score 2017-08-13 17:41:13 +02:00
d19c8f56be Make RulesetInfo implement IEquatable since EqualityComparer was sometimes giving false negatives and causing Bindable observers to fire 2017-08-13 15:03:01 +09:30
e42c279229 More generic catching for broken hitobject strings 2017-08-10 01:50:20 -05:00
c16dbc05aa Add new error for malformed (too many variables) hit objects during import 2017-08-09 23:41:22 -05:00
934c2a1dc8 Merge branch 'master' into ranks-section 2017-08-09 18:47:25 +02:00
d83c218e08 Remove various scrolling container optimisations (removing when not alive). 2017-08-09 16:19:09 +09:00
b00d1cd077 Merged ppy:master 2017-08-09 08:49:29 +02:00
976cff9af6 Merge remote-tracking branch 'upstream/master' into catch
# Conflicts:
#	osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs
2017-08-09 15:08:43 +09:00
2715324a76 Fix possible incorrect reversing behavior for horizontal playfields. 2017-08-09 14:50:52 +09:00
f70c00423a Missed one. 2017-08-09 14:25:49 +09:00
346aebebc0 Fix origins not being set correctly when reverting from reversed playfield. 2017-08-09 14:24:48 +09:00
a20753abc6 Applied suggested changes. 2017-08-09 14:24:47 +09:00
431a9649a4 Remove unused using. 2017-08-09 13:38:12 +09:00
723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00
7c0e7ebcd0 Give HitRenderer a reference to Ruleset
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
1c5584f068 Make ScrollingPlayfield store a list of SpeedAdjustments instead of a Container.
Because they're removed from the container when they're not alive, and any further adding methods fail.
2017-08-09 12:45:50 +09:00
dfb47b571a Make HitRenderer's Playfield public so it can be used in testing. 2017-08-09 12:24:38 +09:00
b88f37de45 Add custom actions for Catch
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
7d7cfe5d92 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-08-08 23:13:25 +02:00