smoogipooo
|
f158ce814c
|
Fix state never getting set.
|
2017-09-06 17:20:41 +09:00 |
|
smoogipooo
|
ac8ec31b61
|
Make judgements able to be "added" plus make everything compile and run.
|
2017-09-06 17:02:13 +09:00 |
|
Dean Herbert
|
84c22df3f5
|
Combine Judgement.HitResults into one.
|
2017-09-06 17:01:48 +09:00 |
|
Dean Herbert
|
d7d0e96e6b
|
Merge branch 'master' into ranks-section
|
2017-09-01 18:46:53 +09:00 |
|
Dean Herbert
|
2b667cf789
|
Fix typos
|
2017-08-24 20:32:55 +09:00 |
|
Dean Herbert
|
c9f90efb8a
|
Add more checks and remove direct cast
|
2017-08-24 20:31:57 +09:00 |
|
Dean Herbert
|
f0635af40d
|
Add documentation and regions to RulesetInputManager
|
2017-08-24 15:51:31 +09:00 |
|
Dean Herbert
|
a7a7e0323f
|
Update autoplay and replay handling to result in actions, not keys
|
2017-08-24 15:36:42 +09:00 |
|
Dean Herbert
|
189988236b
|
Move PlayerInputManager logic inside RulesetInputManager
|
2017-08-24 15:23:17 +09:00 |
|
smoogipooo
|
115e5c95af
|
Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'.
|
2017-08-23 20:50:03 +09:00 |
|
Dean Herbert
|
1f04995a73
|
Merge branch 'master' into hardrock-flipping
|
2017-08-23 17:00:41 +09:00 |
|
smoogipooo
|
8ddc13e394
|
Fix replays not loading.
|
2017-08-23 16:48:13 +09:00 |
|
smoogipooo
|
7639e096d8
|
No longer flip legacy replay mouse positions.
|
2017-08-23 15:30:17 +09:00 |
|
smoogipooo
|
68e7cf854f
|
Add variant names.
|
2017-08-23 14:19:14 +09:00 |
|
smoogipooo
|
84dd1283de
|
Fix nullref.
|
2017-08-23 13:39:51 +09:00 |
|
smoogipooo
|
be96fb32b3
|
Make RulesetContainer load KeyBindingInputManager in load()
|
2017-08-23 12:47:47 +09:00 |
|
Dean Herbert
|
ef2d9ffede
|
Fix redundant initialiser
|
2017-08-22 23:43:10 +09:00 |
|
Dean Herbert
|
6f8e85c2e1
|
Merge branch 'master' into fix_taiko_sizing
|
2017-08-22 23:19:41 +09:00 |
|
Dean Herbert
|
83bd430f89
|
Merge branch 'master' into fix-speed-adjustments
|
2017-08-22 23:07:42 +09:00 |
|
smoogipooo
|
f8576d44b1
|
Add some more xmldoc.
|
2017-08-22 21:08:27 +09:00 |
|
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
|
3025fcdb25
|
Merge branch 'master' into ranks-section
|
2017-08-22 13:19:03 +02:00 |
|
Dean Herbert
|
9f52ecbb8a
|
Merge branch 'master' into mania-key-conversion
|
2017-08-22 20:08:39 +09:00 |
|
smoogipooo
|
322dfe0250
|
Fix ScrollingContainer possibly not getting the correct size to cover hit objects.
|
2017-08-22 19:17:26 +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 |
|
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 |
|
smoogipooo
|
68c7226d12
|
Fix cherry pick issues.
|
2017-08-22 14:18:17 +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
|
250fb33fbc
|
Merge branch 'master' into ranks-section
|
2017-08-22 12:46:28 +09:00 |
|
Dean Herbert
|
881eecb528
|
Merge branch 'master' into master
|
2017-08-22 12:35:36 +09:00 |
|
Dean Herbert
|
7903f49d27
|
Merge branch 'master' into action-key-counter
|
2017-08-21 17:47:19 +09:00 |
|
Dean Herbert
|
52dadad1e1
|
Merge branch 'master' into fix-taiko-barlines
|
2017-08-21 16:46:25 +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
|
5d13efa76d
|
Remove the concept of "queued hit objects", add a default speed adjustment.
|
2017-08-21 16:17:00 +09:00 |
|
smoogipooo
|
7a5708ce92
|
Further support for null judgements.
|
2017-08-21 15:35:16 +09:00 |
|
Dean Herbert
|
a63923a497
|
Remove type check for now
|
2017-08-21 12:50:48 +09:00 |
|
Dean Herbert
|
16e96888ab
|
Update KeyCounterCollection to support action-based buttons
|
2017-08-21 12:39:22 +09:00 |
|
smoogipooo
|
6a7b410bc3
|
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
|
2017-08-21 11:58:54 +09:00 |
|
MrTheMake
|
f831832c59
|
CI fix
|
2017-08-19 00:13:06 +02:00 |
|
MrTheMake
|
6d401b5f21
|
Merge branch 'master' into leaderboard-scores
|
2017-08-19 00:00:40 +02:00 |
|
Dean Herbert
|
bc7621607a
|
Merge upstream/master in.
|
2017-08-18 22:20:45 +09:00 |
|
smoogipooo
|
90885a31ae
|
Round 2 of CI fixes.
|
2017-08-18 15:09:54 +09:00 |
|
smoogipooo
|
a47b6526a2
|
Fix CI issues.
|
2017-08-18 14:40:36 +09:00 |
|
Dan Balasescu
|
68303accef
|
Merge branch 'master' into make-rulesetinfo-iequatable
|
2017-08-18 14:28:42 +09:00 |
|
tgi74000
|
dc31a0f0ac
|
Merged ppy/master
|
2017-08-17 13:01:42 +02:00 |
|
MrTheMake
|
586a652b08
|
Changed Mods to be a property
|
2017-08-17 12:24:22 +02:00 |
|
MrTheMake
|
105048500a
|
Made modString private and moved the beatmap assignment inside GetScoresRequest
|
2017-08-15 15:30:53 +02:00 |
|
MrTheMake
|
2c287e1348
|
CI and comment fix
|
2017-08-15 12:27:51 +02:00 |
|
MrTheMake
|
21ced32297
|
Formatted and commented the GetAllMods() function
|
2017-08-15 12:03:43 +02:00 |
|
MrTheMake
|
e908a3675e
|
Formatted the GetAllMods() function
|
2017-08-14 18:24:54 +02:00 |
|
MrTheMake
|
5ed717ef86
|
Shortened GetAllMods() using LINQ
|
2017-08-14 15:16:22 +02:00 |
|
MrTheMake
|
920710e7d0
|
Assign a score's beatmap and cleanup to the Score class
|
2017-08-14 13:30:54 +02:00 |
|
Dean Herbert
|
7c9d6c9c83
|
Initial refactoring of key binding logic
|
2017-08-14 20:19:25 +09:00 |
|
MrTheMake
|
e54f659916
|
Suggested changes
|
2017-08-13 22:37:39 +02:00 |
|
MrTheMake
|
2f89fc432b
|
Removed unused function
|
2017-08-13 20:28:30 +02:00 |
|
MrTheMake
|
81289db33b
|
CI fix, fixed nullref and removed abstraction of GetAutoplayMod
|
2017-08-13 20:12:01 +02:00 |
|
MrTheMake
|
d9c26f98c7
|
Suggested changes
|
2017-08-13 19:54:07 +02:00 |
|
MrTheMake
|
997d0c9053
|
CI fix
|
2017-08-13 17:45:46 +02:00 |
|
MrTheMake
|
4c2d7bf343
|
Parse the mods of a leaderboard's score
|
2017-08-13 17:41:13 +02:00 |
|
Shane Woolcock
|
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 |
|
MillhioreF
|
e42c279229
|
More generic catching for broken hitobject strings
|
2017-08-10 01:50:20 -05:00 |
|
MillhioreF
|
c16dbc05aa
|
Add new error for malformed (too many variables) hit objects during import
|
2017-08-09 23:41:22 -05:00 |
|
jorolf
|
934c2a1dc8
|
Merge branch 'master' into ranks-section
|
2017-08-09 18:47:25 +02:00 |
|
smoogipooo
|
d83c218e08
|
Remove various scrolling container optimisations (removing when not alive).
|
2017-08-09 16:19:09 +09:00 |
|
tgi74000
|
b00d1cd077
|
Merged ppy:master
|
2017-08-09 08:49:29 +02:00 |
|
Dean Herbert
|
976cff9af6
|
Merge remote-tracking branch 'upstream/master' into catch
# Conflicts:
# osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs
|
2017-08-09 15:08:43 +09:00 |
|
smoogipooo
|
2715324a76
|
Fix possible incorrect reversing behavior for horizontal playfields.
|
2017-08-09 14:50:52 +09:00 |
|
smoogipooo
|
f70c00423a
|
Missed one.
|
2017-08-09 14:25:49 +09:00 |
|
smoogipooo
|
346aebebc0
|
Fix origins not being set correctly when reverting from reversed playfield.
|
2017-08-09 14:24:48 +09:00 |
|
smoogipooo
|
a20753abc6
|
Applied suggested changes.
|
2017-08-09 14:24:47 +09:00 |
|
smoogipooo
|
431a9649a4
|
Remove unused using.
|
2017-08-09 13:38:12 +09:00 |
|
Dean Herbert
|
723e27353c
|
HitRenderer -> RulesetContainer
|
2017-08-09 13:28:29 +09:00 |
|
Dean Herbert
|
7c0e7ebcd0
|
Give HitRenderer a reference to Ruleset
Used to get correct bindings for a mode (ActionMappingInputManager).
|
2017-08-09 13:05:52 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
dfb47b571a
|
Make HitRenderer's Playfield public so it can be used in testing.
|
2017-08-09 12:24:38 +09:00 |
|
Dean Herbert
|
b88f37de45
|
Add custom actions for Catch
Reworks input management for rulesets
|
2017-08-09 11:50:34 +09:00 |
|
Jorolf
|
7d7cfe5d92
|
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
|
2017-08-08 23:13:25 +02:00 |
|
tgi74000
|
3d4db427ff
|
Pass RuleSet to ScoreStore, compute and store MD5 for legacy replays compatibility
|
2017-08-08 17:17:53 +02:00 |
|
smoogipooo
|
cae21869d0
|
Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍.
|
2017-08-08 17:37:11 +09:00 |
|
smoogipooo
|
25202b522d
|
Fix not setting Origin + Anchors properly when reversing.
|
2017-08-08 14:10:26 +09:00 |
|
smoogipooo
|
e54abe8d0a
|
Fix not removing queued hit objects.
|
2017-08-08 13:23:46 +09:00 |
|
Dean Herbert
|
a95aa90adc
|
Allow DrawableHitObjects to be removed from a Playfield
(cherry picked from commit 3926238be9)
|
2017-08-08 13:02:51 +09:00 |
|
Dean Herbert
|
ee7bb1b4f5
|
Don't set RelativePositionAxes when setting ScrollingAxes
(cherry picked from commit debe13629f)
|
2017-08-08 13:02:23 +09:00 |
|
smoogipooo
|
c5ce86b9f3
|
Add reversing capability to ScrollingPlayfield.
|
2017-08-08 12:59:50 +09:00 |
|
smoogipooo
|
bd2ef4dc6b
|
Line endings + license headers.
|
2017-08-07 18:03:44 +09:00 |
|
smoogipooo
|
62ee613da3
|
Merge remote-tracking branch 'origin/master' into timingchange-improvements
|
2017-08-07 17:35:53 +09:00 |
|
smoogipooo
|
f3c05fe232
|
CI fixes.
|
2017-08-07 17:34:57 +09:00 |
|
smoogipooo
|
9c0a0b1e2c
|
Rewrite/add comments.
|
2017-08-07 17:27:50 +09:00 |
|
smoogipooo
|
933740664c
|
SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming.
|
2017-08-07 16:43:54 +09:00 |
|
smoogipooo
|
fc252f8888
|
Remove exception (this is set in SpeedAdjustmentContainer).
|
2017-08-07 16:24:51 +09:00 |
|
smoogipooo
|
a3efca9c35
|
Reduce implementation overhead in actually positioning hitobjects and making them scroll.
|
2017-08-07 16:02:38 +09:00 |
|
smoogipooo
|
068dfcb19a
|
Default CreateSpeedAdjustmentContainer implementation.
|
2017-08-07 15:22:31 +09:00 |
|
smoogipooo
|
c6447e40f9
|
Reduce implementation overhead for nested playfields (e.g. playfield + columns).
|
2017-08-07 14:56:26 +09:00 |
|
smoogipooo
|
376f99c1e3
|
Make VisibleTimeRange transform work again.
|
2017-08-07 14:32:55 +09:00 |
|
smoogipooo
|
e1dfe364b2
|
Fix lifetime performance regression.
|
2017-08-07 14:07:49 +09:00 |
|
Dean Herbert
|
eb190d83bd
|
Adjust CS multiplier to match stable
|
2017-08-07 10:43:33 +09:00 |
|
Dean Herbert
|
6f93aa6131
|
Fix incomplete comment
|
2017-08-07 09:01:47 +09:00 |
|
Dean Herbert
|
e75f438c29
|
Add difficulty application mods
Also fixes circular references when using IJsonSerializable.
|
2017-08-07 08:54:54 +09:00 |
|
Dean Herbert
|
224de9cc1e
|
Implement NoFail mod
|
2017-08-07 08:54:54 +09:00 |
|
Dean Herbert
|
3416925233
|
Fix alignment of icons on mod buttons
|
2017-08-07 08:54:53 +09:00 |
|
smoogipooo
|
b1d25ed388
|
Implement ScrollingPlayfield, now containing ScrollingHitObjectContainer (prev. SpeedAdjustmentCollection).
Also removing a lot of mania code relating to gravity mod for now.
|
2017-08-04 23:07:08 +09:00 |
|
smoogipooo
|
54503eef71
|
Rename *ScrollingDrawableTimingSection -> *ScrollingContainer, move LinearScrollingContainer to osu.Game, make SpeedAdjustmentContainer non-abstract.
|
2017-08-04 22:50:29 +09:30 |
|
smoogipooo
|
4a9f3aa70d
|
Merge remote-tracking branch 'origin/master' into timingchange-improvements
|
2017-08-04 20:11:24 +09:30 |
|
smoogipooo
|
0f901c99a0
|
Implement SpeedAdjustedPlayfield and a new HitRenderer derivation.
|
2017-08-04 20:11:18 +09:30 |
|
Huo Yaoyuan
|
62b3540fd6
|
Merge branch 'master' into fixes
|
2017-08-04 13:49:03 +08:00 |
|
Huo Yaoyuan
|
eb9972581e
|
Provide Autoplay mod in Ruleset.
|
2017-08-04 00:25:24 +08:00 |
|
Dean Herbert
|
0d9ea97828
|
Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
|
2017-08-03 14:36:21 +09:00 |
|
Dean Herbert
|
3b1166d1e6
|
Optimise file lookups and other database operations
FirstOrDefault when called on a TableQuery with a predicate doesn't use table indices
|
2017-08-01 17:37:21 +09:00 |
|
Jorolf
|
4720a47363
|
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
|
2017-07-29 00:45:14 +02:00 |
|
Jorolf
|
0fc36065f4
|
replace Play with Score
|
2017-07-29 00:31:52 +02:00 |
|
Dean Herbert
|
5f53426a9a
|
*Database -> *Store
Welcome back BeatmapManager
|
2017-07-27 16:56:41 +09:00 |
|
Dean Herbert
|
cbe7b08642
|
Make BeatmapStore's BeatmapDatabase private
|
2017-07-27 15:34:13 +09:00 |
|
Dean Herbert
|
9e20a02c0a
|
Split out BeatmapDatabase into BeatmapStore
Hide database functionality at a lower level in preparation from eventually making it private.
|
2017-07-26 16:31:34 +09:00 |
|
Dean Herbert
|
fce580d717
|
Reshuffle namespaces
|
2017-07-26 13:22:46 +09:00 |
|
Thomas Müller
|
e68675f970
|
Rename EasingTypes to Easing
|
2017-07-22 20:53:53 +02:00 |
|
Thomas Müller
|
87bcd526f3
|
Get rid of raw AddDelay calls within osu.Game
|
2017-07-17 16:51:21 +03:00 |
|
Thomas Müller
|
032e9df67b
|
ApplyDelay -> AddDelay
|
2017-07-16 17:47:29 +03:00 |
|
Thomas Müller
|
71105bb9ee
|
Delay -> ApplyDelay; DelayReset -> ResetDelay
|
2017-07-16 14:06:46 +03:00 |
|
Thomas Müller
|
a5e610a7ba
|
Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
|
2017-07-14 19:18:12 +03:00 |
|
Dean Herbert
|
fc28617099
|
Merge remote-tracking branch 'upstream/master' into ruleset-settings
|
2017-07-13 15:35:53 +09:00 |
|
Dean Herbert
|
e1e7cb7178
|
Remove unnecessary using statements
|
2017-07-12 12:55:52 +09:00 |
|
Jorolf
|
f7c9e449d4
|
add ruleset settings
|
2017-07-11 20:25:24 +02:00 |
|
Thomas Müller
|
4045083dcd
|
Update sorting comparers in line with framework changes
|
2017-07-11 21:21:58 +03:00 |
|
Thomas Müller
|
22a987f6cc
|
Update test cases to new framework and fix old crashes
|
2017-07-07 15:05:55 +03:00 |
|
Dean Herbert
|
2f8e6f20a6
|
Fix CI issues
|
2017-07-05 13:46:53 -07:00 |
|
Thomas Müller
|
2d7eefa6fe
|
Update Cached usage according to framework
|
2017-07-02 13:00:02 +03:00 |
|
Thomas Müller
|
f5829860a2
|
Get rid of AlwaysReceiveInput
|
2017-06-23 18:02:24 +02:00 |
|
smoogipooo
|
3389c8a4dc
|
CI fixes.
|
2017-06-21 20:17:15 +09:00 |
|
smoogipooo
|
34ac932fe2
|
Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject.
|
2017-06-19 10:54:23 +09:00 |
|
smoogipooo
|
38f2bd47c5
|
Even saner default.
|
2017-06-16 20:00:16 +09:00 |
|
smoogipooo
|
9fea187788
|
A bit more commenting.
|
2017-06-16 19:58:43 +09:00 |
|
smoogipooo
|
28e48eab2b
|
CI fixes.
|
2017-06-16 19:30:30 +09:00 |
|
smoogipooo
|
4afe83e74e
|
Rework DrawableHitObject to provide default life times and proper DrawableTimingSection autosizing.
This exposes LifetimeOffset from DrawableHitObject which is used by the XSRG rulesets to adjust the life time range by the VisibleTimeRange.
|
2017-06-16 19:21:54 +09:00 |
|
smoogipooo
|
ea87aca032
|
We no longer need to pass in the control point.
|
2017-06-16 13:12:36 +09:00 |
|