Jorolf
412d6a14ca
removed something unnecessary
2017-04-10 16:45:34 +02:00
Jorolf
a597149b7f
Merge branch 'details' of github.com:Jorolf/osu into details
2017-04-10 16:42:42 +02:00
Jorolf
24b4b3ad7d
update to everything
2017-04-10 16:42:23 +02:00
Dean Herbert
c6a24bb549
Merge branch 'master' into details
2017-04-10 20:07:13 +09:00
Dan Balasescu
ba4d654a21
Merge branch 'master' into has-bindable-value
2017-04-10 19:40:37 +09:00
Dean Herbert
b9ce98efd6
Add AspectAdjust to HitRenderer to allow playfield to consume ful HitRenderer size when needed.
2017-04-10 19:22:27 +09:00
Dean Herbert
960ea27684
Make all Playfields completely relative.
2017-04-10 19:22:27 +09:00
Dean Herbert
43a4657540
Remove unnecessary AlwaysPresent.
2017-04-10 17:26:05 +09:00
Dean Herbert
3a01cfccee
Adjust fade length and easing.
2017-04-10 17:25:56 +09:00
Dean Herbert
15c1013f5b
Don't schedule event, it's unreliable and doesn't match the fade.
2017-04-10 17:25:46 +09:00
Dean Herbert
5af4259ab4
Add back explicit binds.
2017-04-10 17:10:15 +09:00
Dean Herbert
ba03a98992
Add missing config set.
2017-04-10 16:39:10 +09:00
Dean Herbert
f12b5a8954
Unify disable logic.
2017-04-10 16:22:36 +09:00
Dean Herbert
b7cfdff8d1
Update SliderBar to use IHasCurrentValue.
2017-04-10 15:30:17 +09:00
Andrey Zavadskiy
7366640b95
Merge remote-tracking branch 'refs/remotes/ppy/master' into key_retry
2017-04-10 09:10:20 +03:00
Dean Herbert
bb4a909de5
Update UI control access in line with framework changes.
2017-04-10 14:54:23 +09:00
Andrey Zavadskiy
1879a05c7b
Removed using
2017-04-10 06:10:12 +03:00
Andrey Zavadskiy
e73f543c4f
Applied suggestions
2017-04-10 06:06:10 +03:00
Andrey Zavadskiy
c793878ae2
Merge remote-tracking branch 'refs/remotes/ppy/master' into key_retry
2017-04-10 05:50:28 +03:00
Dean Herbert
1fe6b84dfc
Update with new input changes from framework.
2017-04-10 01:24:50 +09:00
Andrey Zavadskiy
a7264aa84c
Warning fix
2017-04-09 17:53:16 +03:00
Andrey Zavadskiy
425e96c45c
Moved logic to it's own class
2017-04-09 17:44:19 +03:00
Andrey Zavadskiy
4ab4f65c83
Retry on Tilde key
2017-04-09 16:26:31 +03:00
Jorolf
bcef1ce2b6
replace space in text with Spacing in FillFlowContainer
2017-04-08 13:59:22 +02:00
Jorolf
f7a9a11ae5
Bar uses AccentColour aswell
2017-04-08 13:53:11 +02:00
Dean Herbert
adc16b0727
Merge pull request #608 from Tom94/music-controller-button-animation
...
Music controller button animation
2017-04-08 20:48:39 +09:00
Jorolf
5e56e84c4a
change SRGBColour to Color4 and use IHasAccentColour in some places
2017-04-08 13:31:55 +02:00
Dean Herbert
b5431c496b
Fix osu! logo handling drags for no reason.
2017-04-08 19:34:04 +09:00
Dean Herbert
e1e9772d46
Flash buttons on click.
2017-04-08 19:28:29 +09:00
Dean Herbert
e40ad69a3b
Adjust icon scale of play button.
2017-04-08 19:25:40 +09:00
Thomas Müller
b99cbe6962
Add back nice scaling of music controller buttons
2017-04-08 19:17:20 +09:00
Thomas Müller
166a78a15a
Fix up comment in audio device options
2017-04-08 11:01:41 +02:00
Jorolf
c60a55285c
updated TestCase and some null checks
2017-04-07 20:32:09 +02:00
Jorolf
6a87fd6112
retries and fails hide if they're not present
2017-04-07 20:19:03 +02:00
Jorolf
899e559b5c
ratings hide now + remove unnessary stuff
2017-04-07 19:58:49 +02:00
Jorolf
65d9f4fc45
hide MetadataSegments without content and remove fail/retry initialisations
2017-04-07 19:27:14 +02:00
Dean Herbert
b6ece111a4
Merge pull request #606 from Tom94/fix-audio-crash
...
Fix crash caused by multiple identical audio device names
2017-04-08 01:31:54 +09:00
Jorolf
9881889f88
removed some unused stuff
2017-04-07 18:24:36 +02:00
Jorolf
187a0e3613
Merge branch 'details' of github.com:Jorolf/osu into details
2017-04-07 18:14:14 +02:00
Jorolf
eb4b3772e9
put Bar into its own file and let it only add a background if BackgroundColour is changed
2017-04-07 18:13:55 +02:00
Thomas Müller
ac073e22c9
Fix crash caused by multiple identical audio device names
...
The option dropdown for audio device selection lists all audio
device names. Dropdowns, however, may not have multiple identical
keys. This commit adds removal of duplicate audio device names from
the dropdown. BASS does not give us a simple mechanism to select
specific audio devices in such a case anyways. This functionality would
require OS-specific and involved code.
2017-04-07 17:00:34 +02:00
Dean Herbert
06a655af5d
Move initial position of KeyCounter upwards.
2017-04-07 20:51:37 +09:00
Dean Herbert
0d4f457265
Improve transitions when exiting play mode.
2017-04-07 20:46:35 +09:00
Dean Herbert
54d1afb655
Fade in HitRenderer post entering animation.
2017-04-07 20:38:57 +09:00
Dean Herbert
39175905e4
Fix crashes on completing a taiko map (where a strong his is the last hit in the map).
2017-04-07 16:56:09 +09:00
Dean Herbert
7e99fc47e2
wip
2017-04-07 16:54:54 +09:00
smoogipooo
a9d938e7ed
Fix brace style.
2017-04-07 15:57:00 +09:00
Dean Herbert
06776443eb
Merge branch 'music-controller-improvements' into song-progress-graph
...
# Conflicts:
# osu.Game/Overlays/DragBar.cs
2017-04-07 15:49:14 +09:00
Dean Herbert
2c2a4169c6
Better structure for button layout.
2017-04-07 15:28:18 +09:00
Dean Herbert
7d2af9310b
Expose DragBar's seeking property.
2017-04-07 15:23:03 +09:00
Dean Herbert
3dbf4879c7
Merge branch 'music-controller-improvements' into song-progress-graph
...
# Conflicts:
# osu.Game/Overlays/DragBar.cs
2017-04-07 15:18:58 +09:00
Dean Herbert
361e187949
Temporarily disable button scaling.
2017-04-07 14:33:58 +09:00
Dean Herbert
fa28e7bdc3
Improve clickability and visuals of MusicController buttons.
2017-04-07 14:09:26 +09:00
Dean Herbert
7c9f30c288
MusicController regression fixes.
2017-04-07 13:15:57 +09:00
Dean Herbert
bc4e0bfa8b
Make DragBar animate seeks.
2017-04-07 13:14:41 +09:00
Dan Balasescu
579c351cfd
Merge branch 'master' into details
2017-04-07 12:54:01 +09:00
Dean Herbert
1842d80e28
Update test case.
2017-04-07 09:43:08 +09:00
Dean Herbert
fba72b9a9e
Snaking out on by default.
2017-04-07 09:28:13 +09:00
Dean Herbert
12d2102a88
Merge remote-tracking branch 'upstream/master' into song-progress-graph
...
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Modes/UI/HudOverlay.cs
# osu.Game/Screens/Play/PauseOverlay.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
2017-04-07 09:22:18 +09:00
Jorolf
e59c0a770f
Merge branch 'master' into details
2017-04-06 15:42:00 +02:00
Jorolf
28193cbaaa
hide BeatmapDetails on entering the Select screen
2017-04-06 15:39:23 +02:00
Huo Yaoyuan
411988f038
Remove all trailing whitespaces in this repo.
2017-04-06 16:21:18 +08:00
Huo Yaoyuan
9b1e010dcc
Fix filename mismatch.
2017-04-06 16:05:41 +08:00
smoogipooo
0107772737
Fix using.
2017-04-06 16:25:46 +09:00
Dan Balasescu
6fc1384927
Merge branch 'master' into taiko-fixes
2017-04-06 16:23:22 +09:00
Dean Herbert
1942ef9e8f
Fix merge fail.
2017-04-06 16:06:02 +09:00
Dean Herbert
4783d17d94
Merge branch 'master' into better-hitsounds
2017-04-06 16:00:56 +09:00
smoogipooo
cec8bca78a
Implement IJsonSerializable, BeatmapInfo IJsonSerializable.
2017-04-06 15:54:50 +09:00
Dean Herbert
942699218a
Merge branch 'master' into details
2017-04-06 15:44:43 +09:00
Dean Herbert
7c63c8394b
Remove unnecessary depth setting.
2017-04-06 15:36:03 +09:00
Dean Herbert
a18367454d
InGameOverlay -> MenuOverlay.
2017-04-06 15:34:52 +09:00
Dean Herbert
856696b17e
Fix incorrect verbatim strings.
2017-04-06 15:31:21 +09:00
Dean Herbert
6285f3eea8
Merge branch 'master' into pause_buttons_refactor
2017-04-06 15:00:48 +09:00
smoogipooo
37129bf03d
Make combo be changed by the base ScoreProcessor.
2017-04-06 14:37:21 +09:00
Dean Herbert
2bb99eac72
fix typo
2017-04-06 14:27:23 +09:00
Dean Herbert
efe82ef88c
Merge branch 'master' into hud_visibility
2017-04-06 13:40:10 +09:00
Dean Herbert
18ff8efd46
Mark TODO for BeatmapVersion.
2017-04-06 13:15:33 +09:00
Dean Herbert
f193af2a2a
Add better defaults for BaseDifficulty.
2017-04-06 13:15:21 +09:00
Dean Herbert
c50960af63
Add better defaults for ControlPoint.
2017-04-06 13:15:12 +09:00
Dan Balasescu
326baae615
Merge branch 'master' into taiko-wtf
2017-04-06 12:30:44 +09:00
smoogipooo
982dbb5bba
Cleanup + bow down to resharper.
2017-04-06 12:27:35 +09:00
smoogipooo
73e2ddaf26
Revert DrawableHitObject changes, make them less conflicting.
2017-04-06 12:24:17 +09:00
smoogipooo
4cc309e5a7
Make hit sounds into consts.
2017-04-06 12:14:06 +09:00
smoogipooo
c65ab5b6f1
General cleanup.
2017-04-06 11:56:19 +09:00
smoogipooo
acfcd30cc6
Simplify lambda.
2017-04-06 11:51:04 +09:00
smoogipooo
5beab4c43d
Absolute default bank should be normal.
2017-04-06 11:48:48 +09:00
smoogipooo
c73d6a52ec
Add a few comments.
2017-04-06 11:47:54 +09:00
smoogipooo
eb82a4c090
Back to using SampleInfo + fix taiko beatmap conversion.
2017-04-06 11:41:16 +09:00
Dean Herbert
863dc44c4d
Some minor improvements.
2017-04-06 09:57:34 +09:00
Dean Herbert
8354fb5eb5
Fix judgements being constructed too late.
2017-04-06 09:57:12 +09:00
smoogipooo
e903241c7b
Implement sample + addition sample reading from hit objects.
2017-04-06 09:43:47 +09:00
Andrey Zavadskiy
0946e42363
removed useless stuff
2017-04-05 22:51:43 +03:00
Andrey Zavadskiy
6a510097df
InGameOverlay fixes
2017-04-05 22:36:03 +03:00
smoogipooo
1ef465716d
Proper legacy timing point parsing.
2017-04-05 21:59:40 +09:00
smoogipooo
d607207b69
Ability to contain multiple sample banks. Get default bank name from control point.
2017-04-05 21:59:07 +09:00
smoogipooo
8d720e39c6
Going forward, explicit ToLower should not be needed.
2017-04-05 21:39:09 +09:00
smoogipooo
2d8239a3f7
Re-implement the SampleBank/Sample structure. No parsing support yet.
2017-04-05 21:34:28 +09:00
Dean Herbert
4aafc172ca
Allow playfield to specify whether it has a cursor or not.
2017-04-05 17:38:57 +09:00
Dean Herbert
4b1588a21d
Fix correct mode filter not being applied when first entering song select.
2017-04-05 17:33:19 +09:00
Dean Herbert
8173d01d78
Fix crash on changing play mode too early.
2017-04-05 17:26:45 +09:00
Dean Herbert
6a922da87e
Move legacy_velocity_multiplier application to LegacyTimingInfo.
2017-04-05 12:05:48 +09:00
Jorolf
f9bf1c69bf
add Flags to BarDirection and remove unused "using"
2017-04-04 18:23:29 +02:00
Jorolf
502afc0a48
some fixes to BarGraph so Direction works properly
2017-04-04 18:09:16 +02:00
Andrey Zavadskiy
c4c8604afd
A little change to woke up AppVeyor
2017-04-04 19:06:53 +03:00
Andrey Zavadskiy
f2a9ec0f24
Converted constructor to protected
2017-04-04 19:02:36 +03:00
Andrey Zavadskiy
7b95f2d46a
InGameOverlay now is abstract
2017-04-04 18:53:13 +03:00
Andrey Zavadskiy
62655b70c9
Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
2017-04-04 18:41:37 +03:00
Jorolf
b2731bb0a1
some formatting
2017-04-04 17:27:08 +02:00
Jorolf
58f8dc8254
add direction to graphs
2017-04-04 17:17:22 +02:00
Andrey Zavadskiy
bec4bf36ac
hud->content and style fixes
2017-04-04 17:47:41 +03:00
Andrey Zavadskiy
009909dd4b
Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility
2017-04-04 17:39:53 +03:00
smoogipooo
1d4a371ded
A few general fixes.
2017-04-04 14:38:50 +09:00
smoogipooo
5e67bcb581
Remove a few unused classes.
2017-04-04 13:14:45 +09:00
smoogipooo
4b424263ce
Fully parse control points.
2017-04-04 13:13:27 +09:00
Dean Herbert
1233fb5b82
Split noto out into individual ranges.
2017-04-04 11:34:55 +09:00
Dean Herbert
c6216dbde1
Remove outdated todo.
2017-04-04 11:34:45 +09:00
Dean Herbert
7c74951454
Update bindables.
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCaseResults.cs
# osu.Game/Screens/Ranking/ResultModeButton.cs
# osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
Dean Herbert
f6303d55ec
Upodate some tab usages.
2017-04-04 11:13:09 +09:00
Dean Herbert
d0ebbad0fa
Fix avatar display.
2017-04-04 10:33:41 +09:00
Jorolf
8e689a06d8
change font
2017-04-03 23:03:49 +02:00
Jorolf
5a694e0c9d
changed location of BarGraph to be more generic
2017-04-03 19:29:13 +02:00
Jorolf
f3946bebb4
Merge branch 'master' of git://github.com/ppy/osu into details
2017-04-03 18:33:47 +02:00
Andrey Zavadskiy
5baa887f55
Fixes
2017-04-03 14:58:38 +03:00
Dean Herbert
aa43b138b0
Merge branch 'master' into hud_visibility
2017-04-03 20:42:27 +09:00
smoogipooo
2e80ecfda8
Don't need explicit null value.
2017-04-03 20:33:10 +09:00
smoogipooo
19b5555ef2
Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo.
2017-04-03 20:26:46 +09:00
Andrey Zavadskiy
c1b48c6cbf
FadeIn/Out
2017-04-03 12:17:53 +03:00
Andrey Zavadskiy
e1d3befaed
Added bool to ensure the notification is only displayed once per game execution
2017-04-03 12:03:21 +03:00
Andrey Zavadskiy
63a1eef6e4
Removed unnecessary line
2017-04-03 11:54:50 +03:00
Andrey Zavadskiy
e51fdd3c86
Added container whose visibility will be changable
2017-04-03 11:41:17 +03:00
Andrey Zavadskiy
8d28c54ff3
Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility
2017-04-03 11:07:14 +03:00
Dean Herbert
c539e514f5
Merge branch 'master' into fix_slider_velocities
2017-04-03 15:08:54 +09:00
smoogipooo
27132958c8
Merge remote-tracking branch 'origin/master' into taiko-drawable-generation
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-04-03 14:19:31 +09:00
smoogipooo
74bd427997
Remove SliderVelocityAt, compute it manually inside hit objects.
2017-04-03 14:12:15 +09:00
Dean Herbert
83322dc5cb
Merge branch 'master' into hud_visibility
2017-04-03 11:51:11 +09:00
smoogipooo
ffe4d0ae4a
Remove BeatDistanceAt (does not express distance) and BeatVelocityAt.
2017-04-03 11:48:42 +09:00
smoogipooo
f1b0a12ee3
Rename BPMMultiplierAt -> SpeedMultiplierAt.
2017-04-03 11:48:15 +09:00
Jorolf
a9baeddaa5
remove unused code
2017-04-02 21:12:49 +02:00
Jorolf
9db3fee4b4
make Screens work
2017-04-02 21:03:33 +02:00
Jorolf
8bc241da3d
make AppVeyor happy again
2017-04-02 18:31:19 +02:00
Jorolf
679829daae
vs17 -> vs15
2017-04-02 18:25:44 +02:00
Jorolf
e835b19d4a
add Tooltips
2017-04-02 18:19:59 +02:00
Andrey Zavadskiy
ed476a79f8
Move posting notification in HudOverlay
2017-04-02 16:18:01 +03:00
Dean Herbert
263374a357
Remove unnecessary using.
2017-04-02 17:11:31 +09:00
Dean Herbert
bfa2e68bfb
Container->Wrapper.
2017-04-02 16:17:13 +09:00
Dean Herbert
6f1fff4ee7
Update async load usage to new style.
2017-04-02 15:56:12 +09:00
Andrey Zavadskiy
1ecff1b32c
Fix naming and testcase
2017-04-01 21:50:25 +03:00
Andrey Zavadskiy
f70de7439b
Moved title and description to each class
2017-04-01 21:42:12 +03:00
Andrey Zavadskiy
bd123fa906
Better inheritance
2017-04-01 21:29:17 +03:00
Andrey Zavadskiy
e3a8a14281
Removed unnecessary using
2017-04-01 21:19:49 +03:00
Andrey Zavadskiy
ebc814f06a
Typos fix
2017-04-01 21:17:24 +03:00
Andrey Zavadskiy
3574dac780
Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
2017-04-01 21:03:19 +03:00
Jorolf
017281246d
changed SpriteText to OsuSpriteText
2017-04-01 18:12:44 +02:00
Jorolf
d0b4f86725
fix errors from merge
2017-04-01 14:16:18 +02:00
Jorolf
072a77b4d9
Merge branch 'master' of git://github.com/ppy/osu into details
2017-04-01 14:12:20 +02:00
Andrey Zavadskiy
9d027a61cd
Move input to HudOverlay
2017-04-01 14:46:45 +03:00
Andrey Zavadskiy
06850f7e1f
Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility
2017-04-01 14:04:48 +03:00
Jorolf
e380254386
remove unnecessary code
2017-03-31 22:32:09 +02:00
Jorolf
1f19d72474
removed wrong using >.>
2017-03-31 21:24:05 +02:00
Jorolf
d8bb72dd78
remove unused using-directive
2017-03-31 21:19:23 +02:00
Jorolf
50b8580141
add license header
2017-03-31 21:13:20 +02:00
Jorolf
47698be1f5
Merge branch 'master' into details
2017-03-31 21:10:45 +02:00
Andrey Zavadskiy
d7c39a00b4
Hud Visibility
2017-03-31 16:43:31 +03:00
Dean Herbert
24d06fa92d
CheckBox -> Checkbox.
2017-03-31 17:38:33 +09:00
Dean Herbert
14fcc197e9
Merge branch 'master' into partial-judgements
2017-03-31 16:53:49 +09:00
Dean Herbert
50c328f1b4
Merge remote-tracking branch 'upstream/master' into partial-judgements
...
# Conflicts:
# osu.Game/osu.Game.csproj
2017-03-31 16:46:40 +09:00
Dean Herbert
5d25fa3282
Merge remote-tracking branch 'upstream/master' into accented-interface
2017-03-31 16:38:19 +09:00
Dean Herbert
3f080ab424
Add some commenting.
2017-03-31 16:01:48 +09:00
Dean Herbert
cf87330f80
Allow SetReplay to receive null.
2017-03-31 16:00:40 +09:00
Dean Herbert
fa7c72a099
Refactor ReplayInputHandler creation for more flexibility.
2017-03-31 15:59:53 +09:00
Dean Herbert
0f4b98ce73
Move FramedReplayInputHandler to own file and un-nest.
2017-03-31 15:32:34 +09:00
Dean Herbert
c531d774b7
Fix file naming.
2017-03-31 15:21:30 +09:00
smoogipooo
a48224bd6d
Don't need Drawable type.
2017-03-31 15:06:33 +09:00
smoogipooo
43c306d658
IAccented -> IHasAccentColour.
2017-03-31 15:06:31 +09:00
smoogipooo
09b98d71a7
Add back Capacity.
2017-03-31 13:33:19 +09:00
Dean Herbert
79031b9e74
Update framework.
2017-03-31 12:58:54 +09:00
Dean Herbert
e7ecc479c9
Add FramedReplay and use where legacy is not needed.
2017-03-31 12:43:42 +09:00
smoogipooo
cd915a32be
Let's use a List for now.
2017-03-31 11:58:24 +09:00
smoogipooo
49575c3447
Special case not needed.
2017-03-31 11:54:12 +09:00
smoogipooo
d944b8c192
Implement IAccented interface + transform.
2017-03-31 11:01:42 +09:00
Dean Herbert
8e8d1bbd6d
Merge branch 'master' into partial-judgements
2017-03-31 09:08:22 +09:00
Jorolf
0d4f2c59a5
there's probably something in here I overlooked
2017-03-30 17:32:18 +02:00
Jorolf
15326204d5
Merge branch 'master' of git://github.com/ppy/osu into details
2017-03-30 16:38:25 +02:00
smoogipooo
76d0beb64f
Fix custom transform.
2017-03-30 22:28:51 +09:00
Dean Herbert
ddc6d45985
Merge pull request #572 from smoogipooo/general-fixes
...
Fix missing base call that may result in invalid ScoreProcessor state.
2017-03-30 14:07:50 +09:00
Dean Herbert
77ac205b62
Merge branch 'master' into partial-judgements
2017-03-30 14:07:43 +09:00
smoogipooo
6287ba321d
Rewrite ScoreProcessor to have a new method for when existing judgements are changed.
...
- OnNewJudgement: Keeps its previous functionality. It is now only invoked when a _new_ judgement has been added to the Judgements hashset.
- OnJudgementChanged: Has a similar funcitonality to OnNewJudgement, but is only invoked whenever a judgement that was _previously_ in the Judgements hashset is changed.
2017-03-30 10:51:14 +09:00
smoogipooo
c2d6faa7c2
Change Judgements into HashSet to prevent duplicates.
2017-03-30 10:39:38 +09:00
Jorolf
a3430dd072
add culture info
2017-03-29 16:10:07 +02:00
Jorolf
cdb3150c56
add readonlies and remove unused using directives
2017-03-29 16:00:29 +02:00
Jorolf
6982529481
Merge branch 'master' of git://github.com/ppy/osu into details
2017-03-29 15:47:00 +02:00
Jorolf
ab4d1c7725
better maxValue calculation for the retry and fail graph
2017-03-29 15:33:36 +02:00
Jorolf
7bd13d76a8
fixes + updates to DetailsBar and a button for the TestCaseDetails
2017-03-29 14:48:43 +02:00
Dean Herbert
6afa6f30cc
Keep selected beatmap in centre of screen post-filter.
2017-03-29 20:01:46 +09:00
Dean Herbert
a6c8be3637
Increase load delay on panel backgrounds; add back missing fade.
2017-03-29 19:52:16 +09:00
Dean Herbert
fa7fd6efe3
Fix mode selector not invoking a re-filter.
2017-03-29 19:48:13 +09:00
smoogipooo
3050039972
Implement partial judgements + make Result non-nullable.
2017-03-29 18:35:28 +09:00
smoogipooo
bae0ac4901
Fix missing base call that may result in invalid ScoreProcessor state.
2017-03-29 18:21:45 +09:00
Dean Herbert
b96a153e0e
Resize ranks better.
2017-03-29 12:24:04 +09:00
smoogipooo
eed50784ba
Make player work with TaikoHitRenderer.
2017-03-29 11:35:57 +09:00
Dan Balasescu
d7674e2367
Merge branch 'master' into dynamic-recompile
2017-03-29 10:12:48 +09:00
Dean Herbert
ab97967237
Update references and framework.
2017-03-29 09:54:00 +09:00
Dan Balasescu
bca18ce209
Merge branch 'master' into move-easingtypes
2017-03-29 08:14:13 +09:00
Dan Balasescu
e53a5a3521
Merge branch 'master' into avatars-and-login
2017-03-29 07:52:43 +09:00
Jorolf
199c70ff95
Added fails and retries
2017-03-28 20:18:56 +02:00
Jorolf
305bc9cff6
Merge branch 'master' of git://github.com/ppy/osu into details
2017-03-28 17:14:35 +02:00
Jorolf
909fdb647c
Added ratings and different bar rotations
2017-03-28 17:12:54 +02:00
Dean Herbert
f7dc7e9bb9
Update references.
2017-03-28 21:26:20 +09:00
Andrey Zavadskiy
91e18cc63e
Fix usings
2017-03-28 12:12:35 +03:00
Andrey Zavadskiy
cf3db49631
Inherit Pause/Fail overlay from InGameOverlay
2017-03-28 12:09:26 +03:00
Andrey Zavadskiy
687f71e410
Fixes
2017-03-28 11:45:48 +03:00
Andrey Zavadskiy
60be69d3b0
Fixes
2017-03-28 11:41:08 +03:00
Andrey Zavadskiy
85c2184170
Fixes
2017-03-28 11:33:56 +03:00
Andrey Zavadskiy
62693a6a59
Again separate classes
2017-03-28 10:49:58 +03:00
Dean Herbert
4042b94e01
Use DelayedLoadContainer in more places.
2017-03-28 15:28:58 +09:00
Dean Herbert
f690e1d0c4
Move async logic to framework.
2017-03-28 14:24:34 +09:00
Andrey Zavadskiy
9774f826ab
Pause and fail overlays -> StopOverlay
2017-03-28 06:08:31 +03:00
Andrey Zavadskiy
c4500fa270
fixes
2017-03-28 05:19:32 +03:00
Andrey Zavadskiy
110d43bc25
fixes
2017-03-28 05:12:04 +03:00
Andrey Zavadskiy
457f5c6a89
Removed unised using statement
2017-03-28 04:58:30 +03:00
Andrey Zavadskiy
2348b619a3
Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
2017-03-28 04:55:46 +03:00
Andrey Zavadskiy
5461c6516a
Refactor PauseOverlay, FailDialog -> FailOverlay
2017-03-28 04:53:57 +03:00
Andrey Zavadskiy
2f9a15092b
Refactor pause buttons
2017-03-28 04:52:11 +03:00
Dean Herbert
36af868f44
Add missing licence header.
2017-03-28 00:13:38 +09:00
Dean Herbert
768b3c4b4b
Add better focus handling in the login form.
2017-03-28 00:08:27 +09:00
Dean Herbert
13272e6995
Make Avatar accept a user.
...
Add UpdateableAvatar to handle the toolbar use-case.
2017-03-28 00:08:26 +09:00
Dean Herbert
039f4a65dc
Combine user models.
2017-03-28 00:08:24 +09:00
Dean Herbert
55df07a872
Fix username being cleared when it shouldn't be.
2017-03-28 00:08:22 +09:00
Dean Herbert
0ad070c2d8
Update grade textures.
2017-03-27 22:24:47 +09:00
Dean Herbert
cc5154dd12
Fix regression in mouse dragging behaviour.
2017-03-27 17:55:57 +09:00
Jorolf
775fd63d0f
Added difficulty container
2017-03-25 23:33:03 +01:00
Dean Herbert
64378f6445
Merge branch 'master' into replay_extensibility
2017-03-25 20:16:41 +09:00
ElegantMonkey
0678274118
Rename OptionDropdown and OptionEnumDropdown files
2017-03-25 07:45:04 -03:00
Jorolf
d8724e5e3e
Add metadata details
2017-03-24 23:02:24 +01:00
smoogipooo
136665e52e
Add virtual method to instantiate legacy replays.
2017-03-24 14:28:17 +09:00
smoogipooo
b225ae82be
GetInputHandler -> CreateInputHandler.
2017-03-24 13:59:05 +09:00
smoogipooo
93029aec3e
Change accessibilities to make replays more extensible.
2017-03-24 13:58:45 +09:00
DrabWeb
f0035659db
Unused using
2017-03-24 00:45:19 -03:00
DrabWeb
a6dfed9668
Formatting
2017-03-24 00:41:56 -03:00
DrabWeb
0edee04200
Use OsuColour instead of static colours
2017-03-24 00:41:14 -03:00
Dean Herbert
cb0c7dca71
Merge branch 'master' into taiko_scoreprocessing
2017-03-24 12:25:19 +09:00
DrabWeb
f1f6f2041f
Null track handling in player
2017-03-23 23:57:33 -03:00
DrabWeb
befbc63c35
Merge https://github.com/ppy/osu into song-progress-graph
2017-03-23 23:42:06 -03:00
DrabWeb
b56fb310bf
More cleanup
2017-03-23 23:38:23 -03:00
smoogipooo
2a6da0751d
Rename UpdateJudgement -> OnNewJugement + rename judgement parameter.
2017-03-24 11:32:48 +09:00
smoogipooo
4e31e3b443
Rename things around to make a bit more sense.
2017-03-24 09:51:58 +09:00
smoogipooo
2074812f46
Move ScoreProcessor and Score to Scoring/.
2017-03-24 09:51:52 +09:00
Dean Herbert
e3071894f4
Merge branch 'master' into song-select-improvements
2017-03-24 09:21:26 +09:00
Dean Herbert
f218066f83
Merge branch 'master' into parallax-requires-position
2017-03-23 22:52:06 +09:00
Dean Herbert
0bcb463acf
ParallaxContainer should always know the mouse position.
2017-03-23 22:42:40 +09:00
DrabWeb
0a11d035fe
Formatting
2017-03-23 09:07:13 -03:00
DrabWeb
b429d8f1b3
More proper fix
2017-03-23 09:05:53 -03:00
DrabWeb
3364801221
Fix for the fix
2017-03-23 08:32:24 -03:00
Dan Balasescu
8901d6137e
Merge branch 'master' into song-select-improvements
2017-03-23 20:25:38 +09:00
DrabWeb
bbca6cf602
Fix bottom square being clipped
2017-03-23 08:13:03 -03:00
DrabWeb
938f5eaf58
Dragging
2017-03-23 07:38:08 -03:00
smoogipooo
99cd215f56
Merge branch 'taiko_drumroll_tick_judgements' into taiko_scoreprocessing
...
Conflicts:
osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
2017-03-23 19:38:00 +09:00
Dean Herbert
63d7c5a5a3
Pressing back while mod select is visible should close mod select before exiting.
2017-03-23 19:35:46 +09:00
Dean Herbert
8c4fd44a85
Tidy up song select footer and fix depth of mod select vs osu! cookie.
2017-03-23 19:32:58 +09:00
DrabWeb
ca2816f9c8
Formatting
2017-03-23 07:24:43 -03:00
smoogipooo
322a78830e
Implement Taiko score processing.
2017-03-23 19:24:23 +09:00
DrabWeb
3923892863
Delete SongProgressGraphColumn.cs
2017-03-23 07:20:16 -03:00
DrabWeb
546a3d0914
Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph
2017-03-23 07:15:53 -03:00
Dean Herbert
2cb801317d
JudgementInfo -> Judgement.
...
There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.
2017-03-23 19:00:18 +09:00
Dean Herbert
93915ba527
Fix regression of osu! judgement animation.
2017-03-23 18:56:27 +09:00
DrabWeb
0337f18fb9
Cleaning
2017-03-23 06:37:12 -03:00
Dean Herbert
b5d661b53a
some fixing and restyling.
2017-03-23 18:20:00 +09:00
Dean Herbert
4d61424abd
Merge branch 'master' into song-progress-graph
2017-03-23 17:44:22 +09:00
Dean Herbert
96fc8eef30
Merge branch 'master' into taiko_hitobject_drawable
2017-03-23 17:23:22 +09:00
Dan Balasescu
e9a061c709
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 17:13:02 +09:00
Dean Herbert
644e9ae9d5
Increase padding to make flyte happy.
2017-03-23 16:36:52 +09:00
Dean Herbert
6bcbd116c8
Only get APIAccess from DI (it's all we need).
2017-03-23 16:32:35 +09:00
Dean Herbert
3ae7d0cb98
Better handle the passing of Beatmap and updating of scores.
...
PresentScores was dangerous as it could potentially bring up unsafe threading scenarios. This ensures everything will work well in all cases.
2017-03-23 16:31:08 +09:00
Dean Herbert
a561611125
Set default tab to global scores.
...
This will need to be saved to the config file eventually.
2017-03-23 16:29:10 +09:00
Dean Herbert
022fd625df
Remove transitions for now
...
If you want to add transitions, the containers should be IStateful so we can discern their state for later use (because I switched to Show/Hide I can use IsPresent for now). We should probably look at moving the VisibilityState portion of OverlayContainer into a new StatefulContainer class or similar, so it can be used in situations like this.
2017-03-23 16:28:45 +09:00
Dean Herbert
0863efb2c8
Remove unused variable.
2017-03-23 15:35:42 +09:00
Dean Herbert
02fba000bc
Tidy up and tweak transitions of DrawableJudgementInfo.
2017-03-23 15:07:45 +09:00
DrabWeb
88d878e1d5
Formatting
2017-03-23 02:47:27 -03:00
smoogipooo
3d1dad8185
Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable
...
Conflicts:
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-23 14:40:06 +09:00
DrabWeb
b8129526a4
Typo
2017-03-23 02:29:23 -03:00
Dean Herbert
d441114011
Merge branch 'master' into taiko_playfield_2
2017-03-23 14:28:42 +09:00
Dean Herbert
e77229b34b
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 14:26:00 +09:00
Dean Herbert
681ed38941
Use const whenever possible.
2017-03-23 13:52:38 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +09:00
DrabWeb
b8b45262c5
Formatting
2017-03-23 01:35:55 -03:00
DrabWeb
67421cdf1c
Even though it was 5 minutes ago what was I thinking
2017-03-23 01:34:06 -03:00
DrabWeb
677b8afc1f
Integration
2017-03-23 01:19:29 -03:00
smoogipooo
aa2b22ff12
Fix usings.
2017-03-23 13:02:34 +09:00
smoogipooo
c9fe9e681d
Make judgement text generic to be used between game modes.
2017-03-23 12:49:28 +09:00
DrabWeb
87b8015e8f
Cleanup
2017-03-23 00:29:28 -03:00
DrabWeb
c173c4b7ee
Tab control
2017-03-23 00:22:31 -03:00
smoogipooo
8b71d70633
Add a way to get the score string from JugementInfo.
2017-03-23 12:21:09 +09:00
Dan Balasescu
39134d79a8
Merge branch 'master' into taiko_hitobject_drawable
2017-03-23 11:03:42 +09:00
Dean Herbert
1d9da8facd
Merge pull request #520 from smoogipooo/use_equilateral_triangles
...
Update framework + use EquilateralTriangle in Triangles.
2017-03-23 10:27:21 +09:00
Dean Herbert
859ee5d316
Tidy up DatabaseWorkingBeatmap.
2017-03-23 10:07:26 +09:00
Dean Herbert
9601e143d4
Merge branch 'master' into working-beatmap
2017-03-23 09:37:21 +09:00
Dean Herbert
e7f32fcbce
Merge pull request #525 from huoyaoyuan/controls
...
DropDown update
2017-03-23 09:26:26 +09:00
Dean Herbert
b0340f77d8
Remove nested types completely.
2017-03-23 08:57:14 +09:00
Dean Herbert
ff57d3800f
Merge branch 'master' into use_equilateral_triangles
2017-03-23 08:51:43 +09:00
Dan Balasescu
02dc6fb213
Merge branch 'master' into taiko_hitobject_drawable
2017-03-23 08:50:57 +09:00
Dean Herbert
3dee39346f
U -> T1.
2017-03-23 08:49:29 +09:00
Dean Herbert
ba32d50456
Consolidate nested classes.
2017-03-23 08:44:52 +09:00
smoogipooo
9247017c9a
Use EquilateralTriangle in Triangles.
2017-03-23 08:34:39 +09:00
Dean Herbert
537f0b9340
Fix menu cursor size not sticking on startup.
...
Also tidied up bindables.
2017-03-23 08:07:59 +09:00
Huo Yaoyuan
0dbc232ebf
Rename all DropDown -> Dropdown.
2017-03-22 22:32:32 +08:00
Huo Yaoyuan
6a4ca08578
Merge branch 'master' into controls
2017-03-22 22:28:19 +08:00
Andrey Zavadskiy
2d75c60463
Fix checkbox dependency in LoginOptions
2017-03-22 17:21:24 +03:00
DrabWeb
e4af30bd15
Line endings
2017-03-22 09:38:40 -03:00
DrabWeb
8703e5a962
More formatting
2017-03-22 09:35:08 -03:00
DrabWeb
5ebbc2c0ba
Formatting
2017-03-22 09:33:01 -03:00
DrabWeb
818bdd8e88
SongProgress in HudOverlay
2017-03-22 09:27:04 -03:00
DrabWeb
333008e26d
Formatting
2017-03-22 08:59:44 -03:00
DrabWeb
340ddb59cd
License headers
2017-03-22 08:54:21 -03:00
DrabWeb
29c54d4d8b
Merge https://github.com/ppy/osu into song-progress-graph
2017-03-22 08:50:17 -03:00
Drew DeVault
2e1f596b2a
Move DatabaseWorkingBeatmap out of partial class
2017-03-22 06:50:48 -04:00
Dean Herbert
fbe08436d2
Fix usages of CircularContainer in line with framework changes.
2017-03-22 19:35:03 +09:00
Drew DeVault
2b1d31e69c
Address linting issues
2017-03-22 06:25:49 -04:00
Drew DeVault
267238dc27
Simplify derived classes of WorkingBeatmap
2017-03-22 06:15:32 -04:00
Drew DeVault
cc2b4c5c5b
Refactor WorkingBeatmap
...
Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
or so.
2017-03-22 05:57:08 -04:00
smoogipooo
aa8780797e
Abstract class + move AccentColour to base.
2017-03-22 15:22:02 +09:00
Huo Yaoyuan
e217c67bcf
Merge branch 'master' into controls
2017-03-22 08:54:03 +08:00
Dean Herbert
4f3ab879de
Make DrawableHitObject's UpdateState safer by blocking calls at a higher level with not yet loaded.
...
UpdateState is called in LoadComplete for cases where the state may have changed before a load operation.
2017-03-22 09:43:44 +09:00
Dean Herbert
bee7b43a37
Make avatar fallback work on failed load.
2017-03-22 09:20:37 +09:00
Huo Yaoyuan
b06eb0122c
Fix for colours and members rename.
2017-03-22 08:15:31 +08:00
Dean Herbert
f3486b7288
Add correct lifetime expiry for leaderboard content
2017-03-22 09:07:02 +09:00
Dean Herbert
7387dbd9fc
Tidy up LeaderboardScore
2017-03-22 09:04:33 +09:00
Huo Yaoyuan
b46ded7794
Use Bindable for DropDown.
2017-03-22 07:49:21 +08:00
Dean Herbert
1699daaf7f
Make DrawableRank safer.
2017-03-22 08:32:28 +09:00
Dean Herbert
8983bbcaad
Merge branch 'master' into leaderboards
2017-03-22 08:24:49 +09:00
Huo Yaoyuan
f0edf5d3d3
Update to DropDown and Menu.
2017-03-22 07:18:53 +08:00
Dean Herbert
b00f86d809
Merge branch 'master' into seperateCursorSize
2017-03-22 08:11:45 +09:00
Jorolf
82d6129063
renamed CursorSize to MenuCursorSize
2017-03-21 17:16:23 +01:00
Dean Herbert
7d8c2c9a15
Merge pull request #521 from EVAST9919/fixes
...
Fixes
2017-03-22 00:30:57 +09:00
Andrey Zavadskiy
943bd737c4
Hide letterbox position sliders
2017-03-21 18:24:19 +03:00
Andrey Zavadskiy
4fa6db6cfa
Hide options when entering the game
2017-03-21 18:20:15 +03:00
Dean Herbert
0b2bb2ea0e
Fix typo in font name declaration.
2017-03-21 22:51:49 +09:00
Dean Herbert
d5af15579c
Merge pull request #519 from smoogipooo/parse_timesignature
...
Parse time signature from legacy beatmap control points.
2017-03-21 22:24:29 +09:00
smoogipooo
a272675705
Parse time signature from legacy beatmap control points.
2017-03-21 21:18:08 +09:00
smoogipooo
66752af81f
Late-add the HitObjects container in the Playfield.
...
Allows derivers to define the Content container in the constructor, to redirect the positioning of the HitObjects container.
2017-03-21 16:46:43 +09:00
Huo Yaoyuan
1d13924e0a
Remove redundant type parameter.
...
Nested type has implicit type parameter from base type.
2017-03-21 01:05:48 +08:00
smoogipooo
d27f37beb5
Hard-code text size in cases it wasn't set.
2017-03-20 13:48:06 +09:00
Dan Balasescu
417045c37c
Merge branch 'master' into textawesome_shadow
2017-03-20 13:17:35 +09:00
Dean Herbert
09bf014ded
Simplify fade out gradient code.
2017-03-19 21:49:29 +09:00
Dean Herbert
5d0adc6454
Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
2017-03-19 18:51:53 +09:00
Dean Herbert
256a3268ac
Inline single usage of EdgeEffect.
2017-03-19 18:51:40 +09:00
Thomas Müller
44f71b3975
Merge branch 'master' into fix-beatmap-options
2017-03-19 09:34:53 +01:00
Thomas Müller
66cdc76621
Merge branch 'master' into hide-cursor
2017-03-19 09:23:30 +01:00
Dean Herbert
8cb334a118
Adjust sizing a touch.
2017-03-19 16:34:29 +09:00
Dean Herbert
af85bcaf1d
Merge pull request #500 from smoogipooo/explicit_expires
...
Make DrawableHitObject expires explicit.
2017-03-19 12:47:43 +09:00
Dean Herbert
6c12da54f1
Merge pull request #499 from smoogipooo/legacy_beatmap_flag
...
Add legacy beatmap flag.
2017-03-19 12:39:41 +09:00