Jorolf
841d101be7
renaming
2017-04-07 20:41:03 +02:00
Jorolf
c60a55285c
updated TestCase and some null checks
2017-04-07 20:32:09 +02:00
Dean Herbert
7e99fc47e2
wip
2017-04-07 16:54:54 +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
fa28e7bdc3
Improve clickability and visuals of MusicController buttons.
2017-04-07 14:09:26 +09:00
Dean Herbert
1842d80e28
Update test case.
2017-04-07 09:43:08 +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
Andrey Zavadskiy
b380cbfd7a
Merge remote-tracking branch 'refs/remotes/ppy/master' into testcase_fix
2017-04-06 12:28:44 +03:00
Andrey Zavadskiy
c6f4cff2e7
Fix Pause/Fail testcase
2017-04-06 12:27:45 +03:00
Huo Yaoyuan
411988f038
Remove all trailing whitespaces in this repo.
2017-04-06 16:21:18 +08:00
Dean Herbert
942699218a
Merge branch 'master' into details
2017-04-06 15:44:43 +09:00
Dean Herbert
6285f3eea8
Merge branch 'master' into pause_buttons_refactor
2017-04-06 15:00:48 +09:00
smoogipooo
e299d7286e
Update framework + fix TestCaseTaikoHitObjects.
2017-04-06 12:52:56 +09:00
Dean Herbert
eed78d4251
Improve TestCaseTaikoPlayfield.
2017-04-05 13:53:29 +09:00
Dean Herbert
1b2713239a
Rename PreEmpt to ScrollTime and remove VelocityMultiplier for now.
2017-04-05 11:48:19 +09:00
Dean Herbert
a5cb233975
Use more suffixes.
2017-04-05 10:37:49 +09:00
Dean Herbert
028e941ab2
Major rsefinements to taiko drawable classes.
2017-04-05 10:01:40 +09:00
Dean Herbert
6dc03c1cc4
Add adjustable clock to testcase.
2017-04-05 09:58:47 +09:00
Dean Herbert
7040cee99b
Remove unnecessary width specifcations from TestCaseTaikoHitObjects.
2017-04-05 09:31:41 +09:00
Jorolf
f9bf1c69bf
add Flags to BarDirection and remove unused "using"
2017-04-04 18:23:29 +02:00
Jorolf
cd2fc3148e
added TestCaseGraphAndBar
2017-04-04 18:10:57 +02: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
078d44aec3
some changes to the testcase
2017-04-04 17:17:37 +02:00
Dan Balasescu
eef49c8195
Merge branch 'master' into general-fixes
2017-04-04 20:27:26 +09:00
Dean Herbert
2df360a5e9
Fix clashing namespace.
2017-04-04 12:38:55 +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
b0ebacb06d
Fix some unused variables in test cases.
2017-04-04 11:13:07 +09:00
Dean Herbert
353cf2a026
Adjust timings to make TestCase more usable.
2017-04-04 10:34:05 +09: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
Dan Balasescu
9ba230aa58
Merge branch 'master' into taiko_barlines
2017-04-03 15:15:29 +09:00
smoogipooo
759869f551
Merge branch 'fix_slider_velocities' into taiko_barlines
2017-04-03 14:47:40 +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
Dean Herbert
8ae4d0f7a7
Merge branch 'master' into taiko_drumroll_drawing
2017-04-03 11:10:47 +09:00
smoogipooo
0745098783
Cleanup.
2017-04-03 10:04:13 +09:00
Jorolf
e835b19d4a
add Tooltips
2017-04-02 18:19:59 +02: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
ebc814f06a
Typos fix
2017-04-01 21:17:24 +03:00
Andrey Zavadskiy
14966d5b94
Updated TestCase
2017-04-01 21:14:30 +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
smoogipooo
2510a9fd32
Cleanups.
2017-04-02 02:06:58 +09:00
smoogipooo
38bbf2ac77
Fix post-merge errors.
2017-04-01 23:59:44 +09:00
smoogipooo
b4ed8aeb98
Merge remote-tracking branch 'origin/master' into taiko_barlines
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-04-01 23:57:02 +09: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
Dean Herbert
d1e3bbb5f4
Don't call Reset() from within TestCaseTaikoHitObjects.
2017-04-01 16:16:34 +09:00
Dean Herbert
782c6bf28e
Remove unnecessary usings.
2017-04-01 16:07:54 +09:00
Dean Herbert
d610b9e884
Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
2017-04-01 16:02:32 +09:00
Dean Herbert
041e4f921a
Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing
2017-04-01 14:53:25 +09:00
Jorolf
1f19d72474
removed wrong using >.>
2017-03-31 21:24:05 +02:00
Jorolf
47698be1f5
Merge branch 'master' into details
2017-03-31 21:10:45 +02:00
Dean Herbert
01538ed7d7
Fix nullref.
2017-03-31 18:05:24 +09:00
Dean Herbert
2b847aa2f4
Bring VisualTests up-to-date.
2017-03-31 18:00:14 +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
Dan Balasescu
dbcd2d134b
Merge branch 'master' into taiko_drumroll_drawing
2017-03-31 11:43:58 +09:00
smoogipooo
0e2f725425
Fade the accent colour instead of stepping.
2017-03-31 11:41:06 +09:00
smoogipooo
41aaf42183
Remove DrumRollCirclePiece, cleanup CirclePiece a bit.
2017-03-31 09:57:24 +09:00
Jorolf
0d4f2c59a5
there's probably something in here I overlooked
2017-03-30 17:32:18 +02:00
smoogipooo
f3599b080c
Fix using.
2017-03-30 16:12:21 +09:00
Dan Balasescu
aa1a333a4b
Merge branch 'master' into taiko_swell_drawing
2017-03-30 14:16:58 +09:00
smoogipooo
71baf916d1
Fix post-merge errors.
2017-03-30 14:15:42 +09:00
Dan Balasescu
5f0c681feb
Merge branch 'master' into taiko_drumroll_drawing
2017-03-30 14:10:57 +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
Jorolf
cdb3150c56
add readonlies and remove unused using directives
2017-03-29 16:00:29 +02:00
Jorolf
866f72e653
fix something the merge broke
2017-03-29 15:51:54 +02:00
Jorolf
6982529481
Merge branch 'master' of git://github.com/ppy/osu into details
2017-03-29 15:47:00 +02:00
Jorolf
2f15653d46
removed duplicate code
2017-03-29 15:37:51 +02:00
Jorolf
7bd13d76a8
fixes + updates to DetailsBar and a button for the TestCaseDetails
2017-03-29 14:48:43 +02:00
smoogipooo
7ba7bc18f8
Don't use a List for HitKeys.
2017-03-29 15:35:22 +09:00
Dan Balasescu
7ee7954f62
Merge branch 'master' into taiko_hit_drawing
2017-03-29 15:22:32 +09:00
smoogipooo
37dcc8b71d
Rewrite how swell circle piece is instantiated.
2017-03-29 14:52:14 +09:00
smoogipooo
74e12bd95e
Rewrite how drawable-specific circle pieces are instantiated.
2017-03-29 14:01:01 +09:00
smoogipooo
59648b99a6
Merge remote-tracking branch 'origin/master' into taiko_swell_drawing
2017-03-29 13:21:41 +09:00
Dean Herbert
d9a4a8d0d4
VisualTests should run at full speed.
2017-03-29 12:23:53 +09:00
smoogipooo
a3a0199817
Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawing
2017-03-29 11:38:27 +09:00
smoogipooo
df88121f34
Fix post-merge errors.
2017-03-29 11:16:14 +09:00
smoogipooo
3c21e6538b
Merge branch 'taiko_drumroll_drawing' into taiko-drawable-generation
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-29 11:15:10 +09:00
smoogipooo
24c6ee620f
Merge branch 'taiko_hit_drawing' into taiko-drawable-generation
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
2017-03-29 11:12:39 +09:00
smoogipooo
9da28d372a
Merge branch 'taiko_swell_drawing' into taiko-drawable-generation
2017-03-29 11:09:51 +09:00
Dan Balasescu
d7674e2367
Merge branch 'master' into dynamic-recompile
2017-03-29 10:12:48 +09:00
smoogipooo
762cbfc997
Merge remote-tracking branch 'peppy/dynamic-recompile' into taiko_drumroll_drawing
2017-03-29 09:57:25 +09:00
Dean Herbert
ab97967237
Update references and framework.
2017-03-29 09:54:00 +09:00
smoogipooo
7b479ac737
Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawing
2017-03-29 09:12:48 +09:00
smoogipooo
c478c74227
Merge remote-tracking branch 'origin/master' into taiko_hit_drawing
2017-03-29 09:03:19 +09:00
smoogipooo
eabcae82c6
Merge remote-tracking branch 'origin/master' into taiko_swell_drawing
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-29 08:30:30 +09:00
Dan Balasescu
bca18ce209
Merge branch 'master' into move-easingtypes
2017-03-29 08:14:13 +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
1c166bdf32
Edited pause visual test
2017-03-28 15:03:12 +03:00
Andrey Zavadskiy
60be69d3b0
Fixes
2017-03-28 11:41:08 +03:00
smoogipooo
c14759ebad
Use new circle piece in test case.
2017-03-28 17:24:14 +09:00
smoogipooo
2ff213d2c8
Fix resharper warning.
2017-03-28 17:19:27 +09:00
smoogipooo
6b1dab5b83
Implement drawable drumroll.
2017-03-28 17:08:34 +09:00
Andrey Zavadskiy
62693a6a59
Again separate classes
2017-03-28 10:49:58 +03:00
Andrey Zavadskiy
c1009c2a3c
Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
2017-03-28 10:20:06 +03:00
smoogipooo
3f6b17c0bf
Add drawable Swell.
2017-03-28 15:05:45 +09:00
Andrey Zavadskiy
9774f826ab
Pause and fail overlays -> StopOverlay
2017-03-28 06:08:31 +03:00
smoogipooo
ec9a027b59
ZZZZZZZzzzzzzzz.
2017-03-28 11:21:01 +09:00
Andrey Zavadskiy
c4500fa270
fixes
2017-03-28 05:19:32 +03:00
smoogipooo
b7d9de57a2
Add rim hits.
2017-03-28 11:18:12 +09:00
smoogipooo
1faff828d1
Move piece to Pieces/.
2017-03-28 11:01:35 +09:00
Andrey Zavadskiy
5461c6516a
Refactor PauseOverlay, FailDialog -> FailOverlay
2017-03-28 04:53:57 +03:00
smoogipooo
3f1e8ddcd1
License headers + general fixes.
2017-03-28 10:51:22 +09:00
smoogipooo
621bcaed59
Add drawable Hits/StrongHits.
2017-03-28 10:33:23 +09:00
smoogipooo
4c7e523d18
Rename Accented to Strong.
2017-03-28 10:02:41 +09:00
Jorolf
775fd63d0f
Added difficulty container
2017-03-25 23:33:03 +01:00
Jorolf
d8724e5e3e
Add metadata details
2017-03-24 23:02:24 +01:00
smoogipooo
7a220e7348
Using.
2017-03-24 22:17:18 +09:00
smoogipooo
c03bf4a5c3
Use less scaling factors.
2017-03-24 22:11:11 +09:00
smoogipooo
e079263205
Remove unused texture.
2017-03-24 20:54:09 +09:00
smoogipooo
2ee68ae75a
Make CirclePiece use relative width (leaving length control to DrawableDrumRoll).
2017-03-24 20:10:17 +09:00
smoogipooo
fdd17c1575
Rewrite circle pieces to use custom graphics again.
...
Also using FontAwesome for now to enforce the same size, because otherwise you have to mess around with sprites + the custom graphics. This will all be changed when sprites are fixed to maintain aspect ratios and when glow/border use relative axes.
2017-03-24 20:08:40 +09:00
smoogipooo
df46d0f446
Cleanup.
2017-03-24 18:49:10 +09:00
smoogipooo
5281842965
Rewrite CirclePiece to be referenced to 128x128px and handle accented hits more sanely.
2017-03-24 18:37:56 +09:00
smoogipooo
20e80a758a
Merge branch 'master' into taiko_drawable_drawing
...
Conflicts:
osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:11:56 +09: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
2074812f46
Move ScoreProcessor and Score to Scoring/.
2017-03-24 09:51:52 +09:00
DrabWeb
0a11d035fe
Formatting
2017-03-23 09:07:13 -03: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
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
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
Dan Balasescu
e9a061c709
Merge branch 'master' into beatmap-detail-tabs
2017-03-23 17:13:02 +09:00
Dean Herbert
43032ef694
Fix missing class renames.
2017-03-23 16:56:42 +09: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
67421cdf1c
Even though it was 5 minutes ago what was I thinking
2017-03-23 01:34:06 -03:00
DrabWeb
8c99a8b103
Remove visual test(pretty useless)
2017-03-23 01:25:30 -03:00
DrabWeb
c173c4b7ee
Tab control
2017-03-23 00:22:31 -03:00
Dan Balasescu
2c580f43e9
Merge branch 'master' into taiko_playfield_2
2017-03-23 11:10:23 +09:00
Dan Balasescu
e3bc837b61
Merge branch 'master' into taiko_drawable_drawing
2017-03-23 10:44:00 +09:00
Dan Balasescu
41aaf5fee6
Merge branch 'master' into taiko_barlines
2017-03-23 10:40:27 +09:00
smoogipooo
75a51fbcc7
Merge branch 'taiko_playfield_2' into taiko_barlines
2017-03-23 09:13:24 +09:00
smoogipooo
2cb6757f14
Merge remote-tracking branch 'origin/master' into taiko_barlines
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-23 09:01:00 +09:00
smoogipooo
790997db90
Merge remote-tracking branch 'origin/master' into taiko_playfield_2
2017-03-23 08:49:20 +09: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
