1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 11:22:57 +08:00
Commit Graph

725 Commits

Author SHA1 Message Date
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
94585672b6 Merge remote-tracking branch 'origin/master' into mania-notes 2017-05-11 13:01:00 +09:00
smoogipooo
b10df74079 Full rewrite of timing section code, partially working for now. 2017-05-11 12:33:19 +09:00
Dean Herbert
70ef503403 Merge branch 'master' into metadata 2017-05-11 12:23:00 +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
Huo Yaoyuan
4f49151984 Make metadata a member of WorkingBeatmap. 2017-05-06 14:52:28 +08: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
Dean Herbert
efa60ee287 Merge branch 'master' into mania-stage 2017-05-04 16:58:16 +09: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
Dean Herbert
19f6d58723 Merge remote-tracking branch 'upstream/master' into options-implementation 2017-05-03 21:54:27 +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
Dean Herbert
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +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
Dean Herbert
ce12cc20bd
Merge remote-tracking branch 'upstream/master' into remove-playmode 2017-04-17 13:00:53 +09:00
Adrian Kaz Scherzinger
60f7879875 Explicitly set C# 6.0 for now. 2017-04-16 06:44:08 +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
smoogipooo
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +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