1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 07:42:57 +08:00
Commit Graph

6114 Commits

Author SHA1 Message Date
Dean Herbert
99458aab48 Propagate framework updates 2017-08-12 19:54:07 +09:00
Dean Herbert
48d4ed55e9 Move a lot of code to framework 2017-08-11 16:11:46 +09:00
Dean Herbert
798fff00b2 Remove shortcomings, remove InputState.Data usage, make everything amazing
No more casting!
2017-08-10 19:28:24 +09:00
Dean Herbert
1fe273cbc0 Move GameplayCursor to osu! ruleset and make work with OsuActions 2017-08-10 18:37:41 +09:00
Dean Herbert
e9a11ebc9f Use new population methods and implement osu! ruleset actions 2017-08-10 18:31: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
Dean Herbert
b88f37de45 Add custom actions for Catch
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
smoogipooo
cae21869d0 Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍. 2017-08-08 17:37:11 +09:00
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
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
598b3f051e Address CI concerns and update framework 2017-07-22 11:15:45 +02:00
Thomas Müller
0f2bcb2904 Update framework 2017-07-21 18:23:01 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Thomas Müller
440878945e Remove remaining usages of AddDelay 2017-07-17 18:16:15 +03:00
Thomas Müller
546efc0181 Get rid of AddDelay & ResetDelay in osu.Game.Rulesets.Osu 2017-07-17 17:05:24 +03: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
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
6063219b72 Update framework 2017-07-16 13:59:26 +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
d3f5de9bf9 Move to UI namespace 2017-07-13 15:44:42 +09:00
Dean Herbert
25344d2345 Fix incorrect header 2017-07-13 15:43:18 +09:00
Dean Herbert
fc28617099 Merge remote-tracking branch 'upstream/master' into ruleset-settings 2017-07-13 15:35:53 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Jorolf
f7c9e449d4 add ruleset settings 2017-07-11 20:25:24 +02:00
Dean Herbert
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
Dean Herbert
7952e7caa9 Fix typos 2017-07-10 03:22:08 +09:00
Dean Herbert
2c8b8c3f9c Update loop logic in line with framework changes 2017-07-09 18:23:34 +09:00
Thomas Müller
bb15bc0467 Use ReceiveMouseInputAt whenever possible 2017-06-30 09:54:03 +03:00
Dean Herbert
7baa2b7421 Fix CI issues 2017-06-25 14:46:59 +09:00
Thomas Müller
e3489928b7 Remove now obsolete InternalContains 2017-06-24 09:21:08 +02:00
Thomas Müller
f5829860a2 Get rid of AlwaysReceiveInput 2017-06-23 18:02:24 +02:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
Dean Herbert
41d4aee4f5 Update nuget packages
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
Drezi126
9d915a691d Fix comment placement. 2017-06-08 00:17:58 +02:00
Péter Nemes
a0bdab9f0d Aaand docs again. 2017-06-07 20:29:03 +02:00
Péter Nemes
1f311cca06 Fix cref in comment. 2017-06-06 19:09:26 +02:00
Péter Nemes
93f654a539 More docs, better docs. 2017-06-06 18:59:46 +02:00
Péter Nemes
ce0d70d651 Whitespace fix. 2017-06-06 15:52:33 +02:00
Péter Nemes
01585027b1 OsuDifficultyBeatmap enumeration logic made clearer, more documentation added. 2017-06-06 15:39:37 +02:00
Péter Nemes
afb4443763 Capitalised protected members, added readonly modifiers. 2017-06-06 01:08:34 +02:00
Péter Nemes
f9441a7419 Fix typo and whitespace. 2017-06-06 00:07:00 +02:00
Péter Nemes
c624712f2f Refactor ppv2 to allow integration of pp+ features. 2017-06-05 23:45:22 +02:00
Shawdooow
ecc0d0b11c Daycore mod 2017-05-30 12:49:06 -04:00
Dean Herbert
5cb6963940 Make spinners easier for now
The underlying spin counting doesn't match stabnle, so they have been near impossible to complete until now.
2017-05-24 22:08:46 +09:00
smoogipooo
836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
smoogipooo
3cdfd2eef5 Split ControlPoint into different types.
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
Dean Herbert
82cf94bbff Move spinner colours to local definition for now
We don't want to start polluting the OsuColours namespace with non-UI colours.
2017-05-22 09:50:45 +09:00
Dean Herbert
8f3ab79918 Simplify SpinnerTicks & CI fixes 2017-05-21 17:31:35 +09:00
Dean Herbert
95498fe6df Adjust spinner colours making use of EdgeEffect.Hollow 2017-05-21 17:21:49 +09:00
Dean Herbert
da31d129ee Merge branch 'master' into mania-beatmap-conversion 2017-05-19 18:18:59 +09:00
smoogipooo
7b05930fc2 Revert "Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects."
This reverts commit 6821197a6a.
2017-05-19 17:38:06 +09:00
smoogipooo
6821197a6a Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects. 2017-05-19 16:40:01 +09:00
smoogipooo
67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
Dean Herbert
85339ace02 Merge branch 'master' into auto-fix 2017-05-19 13:54:32 +09:00
Dean Herbert
3004a44b98 Further colour adjustments 2017-05-18 22:21:41 +09:00
Dean Herbert
c78dfb4a13 Oops colours were wrong 2017-05-18 21:56:19 +09:00
Dean Herbert
e3ae2bca6d Design improvements
paired with smoogi
2017-05-18 21:38:19 +09:00
Dean Herbert
4100c4fe9f Fix order of methods 2017-05-18 21:04:09 +09:00
Dean Herbert
ae676b48b2 Fix whitespace 2017-05-18 19:51:45 +09:00
Dean Herbert
9cd41c0e87 Spinner design refresh 2017-05-18 19:42:20 +09:00
MrTheMake
58ebb24032 Use the end position of a previous note stack rather than the start position. 2017-05-18 02:17:49 +02:00
MrTheMake
91859042e8 Fix not all cases of the auto replay generator fix being covered. 2017-05-18 02:15:16 +02:00
MrTheMake
817bae3219 Fixes the auto mod not hitting stacks of notes on certain maps. 2017-05-18 01:54:17 +02:00
Dean Herbert
240d73bbf1 Merge branch 'master' into mod_fix 2017-05-15 11:59:19 +09:00
Dean Herbert
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
EVAST9919
7055c99df0 Added default value 2017-05-14 09:36:09 +03:00
EVAST9919
a4d5660e41 Cast SpinsRequired value to int 2017-05-14 09:22:49 +03:00
EVAST9919
ef23405733 Applied suggested changes 2017-05-14 06:45:35 +03:00
EVAST9919
6d9e11a74f CI fixes 2017-05-13 03:10:13 +03:00
EVAST9919
5532d3ec49 storing OD value only 2017-05-13 03:04:40 +03:00
EVAST9919
86ebd9d663 spinner's progress depends on current map OD now 2017-05-13 02:51:58 +03:00
EVAST9919
19728b3d98 Fixed IncompatibleMods for OsuModAutoplay 2017-05-12 15:13:02 +03:00
Huo Yaoyuan
4f8549f220 Standardise usages of exceptions. 2017-05-07 00:38:17 +08:00
Thomas Tan
6ea6130fee CodeFactor fixes 2017-04-29 02:41:20 +08:00
Thomas Tan
d742092d9d CI fixes 2017-04-29 02:30:34 +08:00
Thomas Tan
9b8b88601f Create "AutoGenerator" base class and interface. 2017-04-29 02:08:48 +08:00
Thomas Tan
2af6c7aa00 Fix build errors o.o 2017-04-29 00:21:33 +08:00
Thomas Tan
fede3de8a0 Merge branch 'master' into autoreplay-refactor-squashed 2017-04-29 00:17:18 +08:00
Thomas Tan
18897235fa Remove tab characters 2017-04-29 00:15:53 +08:00
Thomas Tan
e56bd3430a Move some common functionality to OsuAutoReplayBase.cs 2017-04-28 23:19:15 +08:00
Dean Herbert
220c602218 Fix incorrect modifier order. 2017-04-28 13:27:20 +09:00
Thomas Tan
6392fcbc5d Merge branch 'master' into autoreplay-refactor-squashed 2017-04-27 23:04:52 +08:00
Dean Herbert
12c0a17711 Make FollowPoints dumb; use absolute sequence at renderer level. 2017-04-27 18:07:10 +09:00
Dean Herbert
4ab636cbb8 Update osu! drawables to use TransformSequences. 2017-04-27 17:37:38 +09:00
Dan Balasescu
df5a95b675 Merge branch 'master' into fix-mouse-button-disable 2017-04-26 19:53:13 +09:00
Dean Herbert
f48d497737 Fix disabling mouse buttons causing auto to stop working. 2017-04-26 18:56:20 +09:00
smoogipooo
28f7e0cdba Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings. 2017-04-26 14:12:21 +09:00
Dan Balasescu
99db871e6c Update OsuDifficultyCalculator.cs 2017-04-22 20:59:35 +09:00
smoogipooo
1bb0b96ddc Make IHasCurve not depend on a SliderCurve object. 2017-04-22 20:43:20 +09:00
Thomas Tan
9432f9879d Refactor OsuAutoReplay.cs
- Some trivial refactors

Rename targetPosition to startPosition, move frameDelay and
reactionTime to private readonly fields, and added 2 comments

- Split main loop into 2 functions.

One is the function to add a delay from the previous hit object if the
current one hasn't appeared yet for auto to "see and react to"

- The other function does everything else.

- Rename and comment stuff in spinner startPosition alg.

- Move movement to start of hitobject logic out

- Rename the functions I took out

- Move spinner start pos calc out.

- Move clicking object logic out

- Fix formatting

- Add private keyword

- Change ref to out

- Change some outdated comments
2017-04-22 10:38:20 +08:00
smoogipooo
d7477955ac CI fixes. 2017-04-21 20:42:13 +09:00
smoogipooo
5cdbb226f8 Remove CurvedHitObject to make RepeatSamples not tied to curve. 2017-04-21 20:40:11 +09:00
smoogipooo
748f13501a Remove HeadSamples and TailSamples, combine into RepeatSamples. 2017-04-21 20:04:40 +09:00
smoogipooo
a999c42d8a Split slider samples into head + tail + repeats + body (the original HitObject.Samples). 2017-04-21 18:49:49 +09:00
smoogipooo
ca824de91c Implement RepeatSamples in IHasRepeats. 2017-04-21 16:18:34 +09:00
smoogipooo
b65b2bdf4c Simplify assignment. 2017-04-20 18:29:55 +09:00
smoogipooo
61090d918c Temporary for taiko lagging on auto replays due to inImportantSection.
Note that this isn't a full "as intended" fix, because the full fix is quite big. I'll be saving it for a separate branch/pull-req.
2017-04-20 15:26:42 +09:00
Dean Herbert
2d5f0f6b76
Fix off-by-one counts. 2017-04-20 11:23:40 +09:00
Dean Herbert
a47870b376
Apply Ruleset to Scores. Reduce complexity of score creation. 2017-04-20 11:16:08 +09:00
Dean Herbert
6cf026e5c1
Remove OsuScore and change the way statistics are stored (dynamic dictionary). 2017-04-20 11:03:11 +09:00
Dean Herbert
3b95fbab7d
Add score statistic tracking (osu!). 2017-04-19 16:29:27 +09:00
Dean Herbert
662544e04f
Merge branch 'master' into results-screen
# Conflicts:
#	osu.Game/Rulesets/Replays/Replay.cs
2017-04-19 16:25:31 +09:00
Dean Herbert
cef6a014d5
Add a simulated key-up delay to auto replays.
Fixes key counter display looking odd.
2017-04-18 22:31:52 +09:00
Dean Herbert
705e66c7a1
Fix spinners becoming wonky. 2017-04-18 22:29:58 +09:00
Dean Herbert
a0d9c14526
Add temporary means of getting the user which is responsible for a resulting play. 2017-04-18 22:22:14 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00