Dean Herbert
|
d192c2d83b
|
Merge remote-tracking branch 'upstream/master' into ctb-improvements
|
2017-09-19 20:54:39 +09:00 |
|
Dean Herbert
|
99b512cce5
|
Output ruleset assemblies to the game folder rather than adding special logic
|
2017-09-19 19:27:14 +09:00 |
|
Dean Herbert
|
1f20c5eb69
|
Optimise project references
|
2017-09-19 16:07:00 +09:00 |
|
Dean Herbert
|
8fa76557db
|
Avoid unnecessary dll copies
|
2017-09-19 16:06:59 +09:00 |
|
Dean Herbert
|
6db705a3a8
|
Update relative paths
|
2017-09-19 16:06:58 +09:00 |
|
Dean Herbert
|
6d3d485565
|
And then everything became one
|
2017-09-19 16:06:58 +09:00 |
|
Dean Herbert
|
8ccbc07dec
|
Remove unnecessary constructor
|
2017-09-15 20:54:46 +09:00 |
|
Dean Herbert
|
b78c516b74
|
Merge branch 'master' into scoring-revamp
|
2017-09-13 20:47:14 +09:00 |
|
Dean Herbert
|
25f2a102f4
|
Fix CI issue
|
2017-09-13 20:35:44 +09:00 |
|
Dean Herbert
|
fb7740a3ab
|
Update all dependencies in line with framework
|
2017-09-13 20:25:40 +09:00 |
|
smoogipooo
|
5e32d95ad2
|
Remove Ruleset's CreateScoreProcessor method
|
2017-09-13 16:37:05 +09:00 |
|
smoogipooo
|
093d82ac45
|
Set depths from playfield add methods instead of DrawableHitObject
|
2017-09-13 16:17:01 +09:00 |
|
smoogipooo
|
e146bcacf1
|
Make BasePortion and ComboPortion constants
|
2017-09-13 16:13:27 +09:00 |
|
smoogipooo
|
ba3e44cd71
|
Simplify standardized scoring to BasePortion (raw scoring) + ComboPortion (highest combo)
|
2017-09-13 15:17:32 +09:00 |
|
smoogipooo
|
7b30fc8a09
|
Fix osu! slider initial circles being placed at the wrong depth.
|
2017-09-13 00:43:30 +09:00 |
|
smoogipooo
|
3386dbb243
|
Fix incorrect HitResult for slider ticks.
|
2017-09-13 00:37:18 +09:00 |
|
smoogipooo
|
7b44ad300f
|
Remove accurateHits, make Accuracy once again tied to comboScore
|
2017-09-13 00:33:01 +09:00 |
|
smoogipooo
|
b5f48c2368
|
Add storeResults as a parameter to Reset
Whether to store the current state of the ScoreProcessor for future use.
|
2017-09-12 22:27:27 +09:00 |
|
smoogipooo
|
2e0218f388
|
Move AllObjectsJudged into ScoreProcessor as AllJudged
Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.
|
2017-09-12 22:01:08 +09:00 |
|
smoogipooo
|
cc6bb81a73
|
Reimplement Exponential scoring with a simpler and more intuitive calculation
Default for all rulesets for now.
|
2017-09-12 21:47:09 +09:00 |
|
smoogipooo
|
d0774c7bc6
|
ComputeTargets -> SimulateAutoplay + improve xmldoc
|
2017-09-12 21:16:47 +09:00 |
|
smoogipooo
|
abab2a4878
|
Revamp score processing to once more unify scoring methods
|
2017-09-12 21:05:50 +09:00 |
|
smoogipooo
|
0b94939474
|
Make Accuracy = 1, Health = 1 the default for ScoreProcessor
|
2017-09-12 20:53:26 +09:00 |
|
smoogipooo
|
d070fb8063
|
Actually make DrawableSliderTick return an OsuJudgement now
|
2017-09-12 19:48:35 +09:00 |
|
smoogipooo
|
c7677d896a
|
Remove SliderTickJudgement
|
2017-09-12 19:47:44 +09:00 |
|
Dean Herbert
|
86de4fa2e2
|
Apply CI fixes
|
2017-09-12 18:36:19 +09:00 |
|
Dean Herbert
|
f32d444d68
|
Remove generics from Playfield (fixes catch)
|
2017-09-12 18:19:28 +09:00 |
|
Dean Herbert
|
d7ac02d090
|
Ensure judgements aren't updated when ArmedState is not idle
|
2017-09-12 18:00:41 +09:00 |
|
Dean Herbert
|
1194e46ef1
|
Merge remote-tracking branch 'upstream/master' into judgement-revamp
|
2017-09-12 17:46:21 +09:00 |
|
smoogipooo
|
58c875bdca
|
Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
# osu-framework
|
2017-09-11 15:02:12 +09:00 |
|
Dean Herbert
|
5ce76d8023
|
Merge remote-tracking branch 'upstream/master' into judgement-revamp
|
2017-09-11 14:36:51 +09:00 |
|
Dean Herbert
|
7170fbd087
|
Target .NET 4.6.1
|
2017-09-11 12:39:00 +09:00 |
|
Dean Herbert
|
3cacee300a
|
Fix a false resharper positive
|
2017-09-11 11:41:29 +09:00 |
|
smoogipooo
|
cde22865b9
|
Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
# osu-framework
|
2017-09-11 02:42:23 +09:00 |
|
MrTheMake
|
a7f874e5b6
|
Merge branch 'master' into leaderboard-scores
|
2017-09-07 18:25:33 +02:00 |
|
smoogipooo
|
19db7a8f72
|
Update in line with framework changes.
|
2017-09-07 22:46:21 +09:00 |
|
smoogipooo
|
0cc443e618
|
Remove all generic judgements.
|
2017-09-06 18:05:51 +09:00 |
|
smoogipooo
|
29941019a5
|
Hacky way to make osu! and taiko work again.
|
2017-09-06 17:44:51 +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
|
081b98ef39
|
"Use" the hitobject
Obviously temporary.
|
2017-09-05 21:41:20 +09:00 |
|
Dean Herbert
|
0fc2e49ce6
|
Remove second calculateScore call
|
2017-09-05 19:33:20 +09:00 |
|
Dean Herbert
|
d69b8d7784
|
Add basic combo score factor to osu! ruleset
|
2017-09-05 17:09:58 +09:00 |
|
Dean Herbert
|
ed0f2a654b
|
Rename variable
|
2017-09-04 18:51:50 +09:00 |
|
Akash Mozumdar
|
c6b226b017
|
refactor
|
2017-09-01 15:32:03 -04:00 |
|
Akash Mozumdar
|
080bdf808c
|
Merge branch 'master' of https://github.com/Artikash/osu
|
2017-08-31 21:35:59 -04:00 |
|
Akash Mozumdar
|
472710e5db
|
trim whitespace
|
2017-08-31 21:35:30 -04:00 |
|
Akash Mozumdar
|
04596fee61
|
Update OsuScoreProcessor.cs
|
2017-08-31 08:26:06 -04:00 |
|
Akash Mozumdar
|
af2f45a980
|
slight edits
|
2017-08-31 04:44:00 -04:00 |
|
Akash Mozumdar
|
cbc35e0cf3
|
implemented hp
|
2017-08-31 04:31:48 -04:00 |
|
Akash Mozumdar
|
d252af8ab4
|
basic implementation of hp
|
2017-08-31 02:36:25 -04:00 |
|
Dean Herbert
|
1b0a1dd410
|
Add missing licence header
|
2017-08-24 20:37:03 +09:00 |
|
Dean Herbert
|
a7a7e0323f
|
Update autoplay and replay handling to result in actions, not keys
|
2017-08-24 15:36:42 +09:00 |
|
smoogipooo
|
56292bd7f0
|
Use constant definition.
|
2017-08-23 16:54:06 +09:00 |
|
smoogipooo
|
42e6865493
|
Flip hit objects.
|
2017-08-23 16:35:30 +09:00 |
|
Dean Herbert
|
ea450fecf5
|
Merge branch 'master' into action-key-counter
|
2017-08-21 16:25:44 +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 |
|
Dean Herbert
|
09b5eef26e
|
Fix incorrect osu! defaults
|
2017-08-20 21:56:28 +09:00 |
|
Dean Herbert
|
aebda8b032
|
Merge branch 'master' into fix-slider-tracking-outside-follow-circle
|
2017-08-20 18:27:38 +09:00 |
|
Shane Woolcock
|
71ddbd22a1
|
Convert ReceiveMouseInputAt override to lambda syntax, and make Tracking property private set
|
2017-08-20 14:00:53 +09:30 |
|
Shane Woolcock
|
51af233d66
|
Fix sliders not checking the correct cursor position once it moves out of the follow circle
|
2017-08-19 12:19:37 +09:30 |
|
Dean Herbert
|
f829caf197
|
Fix custom logic still existing in OsuInputManager
|
2017-08-19 07:24:29 +09:00 |
|
MrTheMake
|
6d401b5f21
|
Merge branch 'master' into leaderboard-scores
|
2017-08-19 00:00:40 +02:00 |
|
Dean Herbert
|
a8996b8b5f
|
Merge branch 'master' into fix-sliders-ignoring-actions
|
2017-08-19 00:30:40 +09:00 |
|
Dean Herbert
|
d6249e7a63
|
Add support for binding mouse buttons to actions
|
2017-08-18 20:01:41 +09:00 |
|
Shane Woolcock
|
7e0fe6cbcb
|
Fix slider tracking to use pressed actions rather than directly querying the mouse buttons
|
2017-08-18 20:19:23 +09:30 |
|
Shane Woolcock
|
9558d2a161
|
Remove unnecessary using
|
2017-08-18 19:39:28 +09:30 |
|
Shane Woolcock
|
44feef78f1
|
Simplify OsuActionInputManager property
|
2017-08-18 19:32:08 +09:30 |
|
Shane Woolcock
|
529732ea47
|
More CI fixes
|
2017-08-18 16:58:01 +09:30 |
|
Shane Woolcock
|
90dacd9861
|
Trim whitespace
|
2017-08-18 16:49:10 +09:30 |
|
Shane Woolcock
|
9628c0b6d6
|
Change spinner to check currently pressed actions rather than implementing IKeyBindingHandler
|
2017-08-18 16:46:00 +09:30 |
|
Shane Woolcock
|
9c6ca2d159
|
Add lazy weak property to DrawableOsuHitObject to find and cache the containing OsuInputManager, if it exists
|
2017-08-18 16:34:01 +09:30 |
|
Shane Woolcock
|
f951120775
|
Merge branch 'master' into fix-spinner-ignoring-actions
|
2017-08-18 16:25:26 +09:30 |
|
Dean Herbert
|
a44ff5a2c2
|
Fix regression causing global hotkeys to no longer work
|
2017-08-17 17:47:44 +09:00 |
|
Dan Balasescu
|
f7ccc81875
|
Merge branch 'master' into fix-spinner-ignoring-actions
|
2017-08-17 12:33:18 +09:00 |
|
Shane Woolcock
|
b1abf83fee
|
Change spinner action checks to switches
|
2017-08-16 17:51:57 +09:30 |
|
Shane Woolcock
|
9448e2f192
|
Remove unnecessary OnMouseDown/Up from SpinnerDisc
|
2017-08-16 17:25:48 +09:30 |
|
Dean Herbert
|
89987229de
|
Merge remote-tracking branch 'origin/is-alive' into key-config-settings
|
2017-08-16 15:49:43 +09:00 |
|
Shane Woolcock
|
9e5deb63d1
|
Fix spinner not handling left/right action bindings
|
2017-08-15 16:42:26 +09:30 |
|
Dean Herbert
|
97ac8e1a64
|
Update usages of IsAlive/IsLoaded in line with framework changes
|
2017-08-15 13:57:48 +09:00 |
|
Dean Herbert
|
7c9d6c9c83
|
Initial refactoring of key binding logic
|
2017-08-14 20:19:25 +09: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
|
4c2d7bf343
|
Parse the mods of a leaderboard's score
|
2017-08-13 17:41:13 +02:00 |
|
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 |
|