1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 17:33:03 +08:00
Commit Graph

3106 Commits

Author SHA1 Message Date
smoogipooo
00054f1573 Comment out unused container for now. 2017-03-23 12:56:32 +09:00
smoogipooo
7f33e10db0 Renaming + don't use List. 2017-03-23 12:53:38 +09:00
smoogipooo
39ff026b27 Reimplement JudgementText with the new DrawableJudgementInfo. 2017-03-23 12:49:58 +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
smoogipooo
b77b039d73 Don't instantiate TaikoHitObject. 2017-03-23 11:25:38 +09:00
smoogipooo
f3907ba831 Merge branch 'taiko_base_hit' into taiko_conversion 2017-03-23 11:24:59 +09:00
Dan Balasescu
9a7504a622 Merge branch 'master' into taiko_conversion 2017-03-23 11:24:30 +09:00
smoogipooo
db8bf8a78f Add Hit class, make TaikoHitObject abstract. 2017-03-23 11:21:45 +09:00
Dan Balasescu
2c580f43e9 Merge branch 'master' into taiko_playfield_2 2017-03-23 11:10:23 +09:00
Dean Herbert
5138890530 Merge pull request #502 from smoogipooo/taiko_bash_base
Taiko bash base
2017-03-23 11:06:16 +09:00
smoogipooo
5daa574551 Don't set lifetime until LoadComplete (fixes possible clock nullref if added without a clock). 2017-03-23 11:05:58 +09:00
Dan Balasescu
39134d79a8 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 11:03:42 +09:00
Dean Herbert
53c6665e07 Merge branch 'master' into taiko_bash_base 2017-03-23 10:57:15 +09:00
Dean Herbert
ae207253e6 Merge pull request #501 from smoogipooo/taiko_drumroll_base
Taiko drumroll base
2017-03-23 10:56:40 +09:00
Dean Herbert
bf94587ca7 Add TODO. 2017-03-23 10:56:30 +09:00
Dan Balasescu
e3bc837b61 Merge branch 'master' into taiko_drawable_drawing 2017-03-23 10:44:00 +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
7357a7b7cd Merge branch 'master' into taiko_bash_base 2017-03-23 10:26:57 +09:00
Dean Herbert
877ae52cff Merge branch 'master' into taiko_drumroll_base 2017-03-23 10:26:55 +09:00
Dean Herbert
3544d9844d Merge branch 'master' into taiko_bash_drawable 2017-03-23 10:25:46 +09:00
Dean Herbert
f103fa3352 Merge pull request #527 from SirCmpwn/working-beatmap
Refactor WorkingBeatmap
2017-03-23 10:13:13 +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
smoogipooo
5e0d9c3820 Cleanups + CircularContainer fixes. 2017-03-23 09:18:50 +09:00
smoogipooo
9c325ddd33 Cleanups + fix CircularContainer usages. 2017-03-23 09:12:51 +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
smoogipooo
790997db90 Merge remote-tracking branch 'origin/master' into taiko_playfield_2 2017-03-23 08:49:20 +09:00
Dan Balasescu
972c56c73b Merge pull request #532 from peppy/general-fixes
Fix menu cursor size not sticking on startup.
2017-03-23 08:48:22 +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
5043032b48 Update framework. 2017-03-22 22:56:45 +08:00
Dean Herbert
7b06f31ddf Merge pull request #530 from EVAST9919/checkboxes_fix
Fix checkbox dependency in LoginOptions
2017-03-22 23:54:37 +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
Dean Herbert
09b59b5003 Merge pull request #529 from EVAST9919/spinner_fix
Spinner fix
2017-03-22 22:18:42 +09:00
Andrey Zavadskiy
086191a12a Spinner fix 2017-03-22 16:13:39 +03:00
Dan Balasescu
e5602c0938 Merge pull request #526 from peppy/general-fixes
Fix usages of CircularContainer in line with framework changes.
2017-03-22 21:48:16 +09:00
Dean Herbert
1c83442b0b Update framework. 2017-03-22 21:36:03 +09: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