1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 20:38:33 +08:00
Commit Graph

824 Commits

Author SHA1 Message Date
EVAST9919
bbe0abbe04 removed forgotten file 2017-05-19 06:48:31 +03:00
DrabWeb
a5fa7e1a7d Result counts displaying 2017-05-18 17:43:39 -03:00
DrabWeb
c2880676db Added displaying sets 2017-05-18 16:15:49 -03:00
EVAST9919
f2af31aceb Naming fixes 2017-05-18 20:21:58 +03:00
EVAST9919
a1b90ee70e Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 18:26:38 +03:00
Dean Herbert
f112546085 Don't load a mode when opening TestCaseHitObjects 2017-05-18 19:42:20 +09:00
EVAST9919
83a89ce22d options -> settings 2017-05-18 11:39:22 +03:00
EVAST9919
35bc3a42aa Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 06:36:15 +03:00
smoogipooo
eebd5a910e Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion 2017-05-18 11:59:31 +09:00
EVAST9919
a21343da23 CI fixes 2017-05-17 17:14:09 +03:00
Dean Herbert
41c252760d Move all pause logic into PauseContainer 2017-05-17 21:57:01 +09:00
DrabWeb
9ba356f2c6 Added osu!direct header and filter control 2017-05-17 05:58:34 -03:00
EVAST9919
1a4025ab3c ingame options basic logic 2017-05-17 10:36:57 +03:00
smoogipooo
9565bb9572 Fix hold notes - remove glow for now.
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
2017-05-17 13:09:49 +09:00
Huo Yaoyuan
d213706d07 Use DateTimeOffset. 2017-05-16 21:14:50 +08:00
Dean Herbert
85daddcf6f Merge branch 'master' into mania-timing-sections 2017-05-16 20:12:26 +09:00
smoogipooo
6231a19b8c Merge remote-tracking branch 'origin/master' into mania-timing-sections 2017-05-16 18:35:32 +09:00
smoogipooo
235a5b1dff Add notes to test case. 2017-05-16 18:27:33 +09:00
smoogipooo
8ed97a8335 Let's invert the playfield by default for now. 2017-05-16 18:02:54 +09:00
smoogipooo
ac02d1ab10 TimeRelativeContainer -> ControlPointContainer, optimize AutoTimeRelativeContainer a little bit (only recompute on invalidation). 2017-05-16 17:50:09 +09:00
Dean Herbert
0feaa407f2 Merge branch 'margin-padding-namespace' into on-screen-display 2017-05-16 16:40:06 +09:00
Dean Herbert
5e5ad9a899 Add basic on-screen display 2017-05-16 15:03:03 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert
eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00
EVAST9919
1f34cec5ce Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-11 22:22:57 +03:00
smoogipooo
0739a76497 Make the playfield work in TestCaseGamefield. 2017-05-11 20:04:45 +09:00
smoogipooo
f6677125af Merge branch 'mania-notes' into mania-timing-sections 2017-05-11 14:11:58 +09:00
smoogipooo
a6b71f8ccb Resharper fixes. 2017-05-11 14:11:52 +09:00
smoogipooo
cdf827df8e CI fixes. 2017-05-11 13:55:52 +09:00
smoogipooo
b10df74079 Full rewrite of timing section code, partially working for now. 2017-05-11 12:33:19 +09:00
EVAST9919
c0acc1799b Now progress testcase has it's own clock 2017-05-11 01:49:57 +03:00
Dan Balasescu
cdd71b496d Fix unnecessary newline. 2017-05-09 21:08:53 +09:00
smoogipooo
5b323ad483 Cleanups. 2017-05-09 20:55:20 +09:00
smoogipooo
d852567d1d Rewrite notes to have time-relative position and length. 2017-05-09 20:33:59 +09:00
smoogipooo
e3b01e7b8c Merge branch 'master' into mania-notes
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
2017-05-08 12:12:40 +09:00
Dean Herbert
c9ba1ac4f6 Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
2017-05-05 13:00:05 +09:00
EVAST9919
95f6c999bd Adjust scale and CI fixes 2017-05-04 17:59:01 +03:00
EVAST9919
66c858030a Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-04 17:35:41 +03:00
EVAST9919
475eb6fe5f Cleanup 2017-05-04 17:29:52 +03:00
smoogipooo
4ad3e3d64e Basic implementation of hold notes (not finalized yet). 2017-05-04 18:02:43 +09:00
EVAST9919
57c4232416 Added testcase 2017-05-04 11:58:37 +03:00
smoogipooo
f945c636c2 Make note accent colour work again. 2017-05-04 15:36:37 +09:00
smoogipooo
e307b6d563 Make SpecialColumnPosition only have an effect during load(). 2017-05-04 15:12:32 +09:00
smoogipooo
a2bdd020e5 ColumnStyle -> ColumnPosition. 2017-05-04 14:54:31 +09:00
smoogipooo
956a7288fb Add basic DrawableNote. 2017-05-03 20:12:27 +09:00
smoogipooo
8d82a52942 Add revert to normal special style after all steps. 2017-05-03 19:38:27 +09:00
smoogipooo
14e4714f08 Rewrite a lot of ManiaPlayfield/Column to support left/right special styles and arbitrary number of columns. 2017-05-03 19:38:15 +09:00
smoogipooo
7de36b7aa2 CI cleanups. 2017-05-03 12:58:46 +09:00
smoogipooo
71acf1c57d Move classes out of test case. 2017-05-03 12:37:47 +09:00
smoogipooo
b4052a099f Create ManiaPlayfield, support up to 9 columns, improve testcase automation. 2017-05-03 12:30:03 +09:00
smoogipooo
27e16b8cfd Merge remote-tracking branch 'origin/master' into mania-stage 2017-05-03 10:50:10 +09:00
Dean Herbert
5a8a8acbc8 Merge branch 'master' into roompanel 2017-05-02 18:04:48 +09:00
smoogipooo
8e88d86639 Fix naming confusion. 2017-05-02 18:00:37 +09:00
smoogipooo
e856abe59a Let's not use Country for drawings-specific stuff... 2017-05-02 13:02:14 +09:00
smoogipooo
80ebd04e85 Add keys to columns and add key down transformations. 2017-05-01 20:48:43 +09:00
smoogipooo
82cbb63af5 Add column generation + put spacing one level up. 2017-05-01 17:24:35 +09:00
smoogipooo
4aea18b673 Add initial column design. 2017-05-01 17:00:41 +09:00
Naeferith
bf6c170541 IStateful implementation 2017-04-28 10:59:34 +02:00
Dean Herbert
eb5d334838 Add non-toggle support for showing seek bar in SongProgress. 2017-04-25 22:59:46 +09:00
Dean Herbert
a850f4bda3 Merge branch 'master' into roompanel 2017-04-25 12:53:49 +09: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
Dean Herbert
86c60ade85
Add a percentage-based slider testcase. 2017-04-20 19:16:47 +09:00
Dean Herbert
0de71ab24d
Add basic tooltip support to OsuSliderBar. 2017-04-20 17:57:58 +09:00
Dean Herbert
c87657707f
Add tooltip to sliderbars. Move interface. 2017-04-20 17:33:07 +09:00
Dean Herbert
ce5763ed97
Remove using. 2017-04-20 16:37:29 +09:00
Dean Herbert
30c3c932b1
Remove redundancies. 2017-04-20 15:29:34 +09:00
Dean Herbert
4ca27a5395
Merge branch 'master' into tooltips 2017-04-20 15:08:26 +09:00
Dean Herbert
b11315ca46
Remove unnecessary interfaces and simplify tooltip logic. 2017-04-20 14:34:29 +09:00
Dean Herbert
6cf026e5c1
Remove OsuScore and change the way statistics are stored (dynamic dictionary). 2017-04-20 11:03:11 +09:00
Jorolf
ea67b41683 move tooltip outside of the cursor 2017-04-20 00:42:40 +02:00
Jorolf
d04893a43a ---changing--- 2017-04-19 15:33:24 +02:00
Jorolf
af9a45fd6c Merge branch 'master' into tooltips 2017-04-19 13:51:39 +02:00
Jorolf
8e4288168a renaming and some changes in TestCaseTooltip 2017-04-19 13:47:00 +02:00
Dean Herbert
3b95fbab7d
Add score statistic tracking (osu!). 2017-04-19 16:29:27 +09:00
Dean Herbert
2f53f2e248
Add license headers. 2017-04-18 22:35:21 +09:00
Dean Herbert
dc13d4d4ab
Display an actual date/time. 2017-04-18 22:22:14 +09:00
Dean Herbert
4a3fc710c4
Add temporary combo/accuracy display. 2017-04-18 22:22:14 +09:00
Dean Herbert
886ac1fb40
Add progress graph background and update ruleset references. 2017-04-18 22:22:14 +09:00
Dean Herbert
72fcc09a98
Add beatmap info and score date.
Also adjusts design metrics.
2017-04-18 22:22:14 +09:00
Dean Herbert
d51b37cb44
Add a basic implementation of the new design results screen. 2017-04-18 22:22:14 +09:00
Dean Herbert
3b21340e1b
Split SquareGraph out and make SongProgressGraph also able to take a list of Objects. 2017-04-18 18:40:02 +09:00
Dean Herbert
66865c50ad
Remove explicit RelativeSize setting. 2017-04-18 18:10:13 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Dean Herbert
2df21066e7
Add constant for osu! playfield size. 2017-04-18 12:19:39 +09:00
smoogipooo
8844ff7ab7 CI fixes. 2017-04-18 11:20:39 +09:00
Dean Herbert
5939ba9143
Fix ruleset not always being initialised correctly. 2017-04-18 10:55:33 +09:00
Jorolf
5d828a20e0 some formatting 2017-04-17 17:09:17 +02:00
Jorolf
dd26f9fcac Merge branch 'master' of git://github.com/ppy/osu into tooltips 2017-04-17 14:45:46 +02:00
Dean Herbert
fe0d18777e
Fix appveyor issues. 2017-04-17 19:52:07 +09:00
Dean Herbert
af13f97435
Fix regressions and test cases. 2017-04-17 19:44:03 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
Dean Herbert
83b083ce64
Move SQLite connections out of database classes; make abstract Database. 2017-04-17 14:37:52 +09:00
smoogipooo
4a149c4ab8 Better default values + don't set Mode from outside. 2017-04-15 06:14:31 +09:00
smoogipooo
0a1376c2db Remove PlayMode game-wide. 2017-04-15 05:22:41 +09:00
smoogipooo
a89af273be Make BeatmapInfo expose Ruleset instead of PlayMode. 2017-04-15 05:01:36 +09:00
Dean Herbert
627114abec
Improve test case. 2017-04-14 19:23:33 +09:00
Dean Herbert
ea0631ede8
Encapsulate progress update logic better. 2017-04-14 18:23:34 +09:00
Dean Herbert
acd7a5b254
Hook up beatmap object density to progress display. 2017-04-14 17:58:37 +09:00
Dean Herbert
8c41707ac7
Fix incorrect default state. Handle input better. 2017-04-14 14:40:52 +09:00
Dean Herbert
09195a03a2
Merge remote-tracking branch 'upstream/master' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-14 11:25:00 +09:00
Jorolf
7f08c3c417 add IHasOverhangingTooltip 2017-04-14 00:18:17 +02:00
Jorolf
f6f75fac74 Merge branch 'master' of git://github.com/ppy/osu into tooltips
# Conflicts:
#	osu.Game/Graphics/Cursor/MenuCursor.cs
2017-04-13 23:12:07 +02:00
Jorolf
c2b2e5ec19 changed way the tool tip is found and displayed 2017-04-13 23:00:49 +02:00
Dean Herbert
2c3fa30386
Metric -> Metrics. 2017-04-12 21:09:39 +09:00
Dean Herbert
157ad17606 Merge branch 'master' into details 2017-04-12 20:25:51 +09:00
smoogipooo
50a598dd05 Revert another masking container. 2017-04-12 15:01:54 +09:00
smoogipooo
32c3e34eb7 Revert "Better masking."
This reverts commit 5d5040ee73.
2017-04-12 15:00:26 +09:00
smoogipooo
5d5040ee73 Better masking. 2017-04-12 14:34:49 +09:00
smoogipooo
04baa9eb72 Reset stage to normal height after tests. 2017-04-12 12:45:07 +09:00
smoogipooo
0c90ef79fa Make TestCaseTaikoPlayfield work again. 2017-04-12 12:37:02 +09:00
Jorolf
50b6bcd574 Merge branch 'master' into details 2017-04-11 19:06:58 +02:00
Jorolf
d4e5f55091 the power of linq 2017-04-11 18:43:48 +02:00
Jorolf
fb5952186c changes and fixes 2017-04-11 14:02:56 +02:00
Dean Herbert
9e6fa965b2
TestCasePlayer doesn't need a PlayerLoader. 2017-04-11 19:38:03 +09:00
Jorolf
ad41fd5c1a more unnecessary stuff 2017-04-10 16:49:48 +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
cd016c57c8 Merge branch 'master' into more-taiko-relative-sizings 2017-04-10 17:34:18 +09:00
Dean Herbert
5af4259ab4
Add back explicit binds. 2017-04-10 17:10:15 +09:00
Dean Herbert
b7cfdff8d1
Update SliderBar to use IHasCurrentValue. 2017-04-10 15:30:17 +09:00
Dean Herbert
bb4a909de5
Update UI control access in line with framework changes. 2017-04-10 14:54:23 +09:00
smoogipooo
f4094fbde2 Extend TestCaseTaikoPlayfield a bit. 2017-04-10 14:28:28 +09:00
smoogipooo
c882b9bafd Make taiko playfield scale by height. 2017-04-10 05:08:05 +09:00
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
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
0745098783 Cleanup. 2017-04-03 10:04:13 +09:00
Jorolf
e835b19d4a add Tooltips 2017-04-02 18:19:59 +02: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
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
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