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

3454 Commits

Author SHA1 Message Date
Dan Balasescu
326baae615 Merge branch 'master' into taiko-wtf 2017-04-06 12:30:44 +09:00
Dan Balasescu
7c57ae3ae1 Merge pull request #593 from peppy/general-fixes
Fix crash on changing play mode too early.
2017-04-06 12:30:31 +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
2a16eafe8f Fix assertions. 2017-04-06 11:54:05 +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
Dean Herbert
5f79df3697
Fix lifetimes being set too late. 2017-04-06 09:57:11 +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
8d16e1efa2
Update framework. 2017-04-05 17:42:56 +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
3b3455afb3
Fix incorrect ScrollTime calculation. 2017-04-05 16:51:21 +09:00
Dean Herbert
a4cc7fc6af
Remove unused velocity variables. 2017-04-05 16:44:45 +09:00
Dean Herbert
9ac18230cc
Only apply taiko LegacyTimingInfo to LegacyBeatmaps. 2017-04-05 16:31:15 +09:00
Dean Herbert
87b8f8ef6e
Fix incorrect relative mapping for CirclePiece's content. 2017-04-05 16:28:37 +09:00
Dean Herbert
57a068c5d1
Fix notes travelling backwards when hit.
Also improves the gravity curve.
2017-04-05 15:11:51 +09:00
Dean Herbert
28648bf97d
Change playfield padding to x-offset to correctly hide notes appearing. 2017-04-05 13:56:16 +09:00
Dean Herbert
eed78d4251
Improve TestCaseTaikoPlayfield. 2017-04-05 13:53:29 +09:00
Dean Herbert
fcea52dd3a
Fix strong drumrolls (again). 2017-04-05 13:53:07 +09:00
Dean Herbert
0e0ab6904d
Distance -> Duration. 2017-04-05 13:52:53 +09:00
Dean Herbert
3f20e2381f
Fix potential tick overflow. 2017-04-05 13:52:22 +09:00
Dean Herbert
6a922da87e
Move legacy_velocity_multiplier application to LegacyTimingInfo. 2017-04-05 12:05:48 +09:00
Dean Herbert
abf6dbc307
BarLine : TaikoHitObject. 2017-04-05 11:48:30 +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
Dean Herbert
75f85867dd
Adjust input drum animations slightly. 2017-04-05 09:21:29 +09: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
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
Dean Herbert
20a5648b05
Move CreateCirclePiece to DrawableTaikoHitObject and simplify strong creation. 2017-04-04 20:58:02 +09:00