h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 06:02:55 +08:00
Code Issues Releases Wiki Activity
4,213 Commits 3 Branches 657 Tags 366 MiB
b547dd6893
Commit Graph

4213 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
b8dbc697f0 Merge pull request #564 from smoogipooo/taiko_drumroll_drawing 
Taiko drumroll drawing
 2017-04-03 11:18:04 +09:00
Dean Herbert
8ae4d0f7a7 Merge branch 'master' into taiko_drumroll_drawing 2017-04-03 11:10:47 +09:00
smoogipooo
8aa723b6a3 General fixes. 2017-04-03 11:05:15 +09:00
smoogipooo
cd6fdcf029 Rename spinnerRotationRatio -> baseHitMultiplier. 2017-04-03 11:00:59 +09:00
smoogipooo
3920758981 Rename all occurrences of finishers to strong. 2017-04-03 10:59:49 +09:00
smoogipooo
33e10adfa6 Rewrite beatmap conversion to allow converting sliders to normal hits. 2017-04-03 10:54:13 +09:00
smoogipooo
3b672fd842 Lengthen drum rolls as required by conversion. 2017-04-03 10:29:35 +09:00
smoogipooo
b027d0d3b4 Changing duration is wrong, add HitMultiplier. 
I don't know if this is the best way to handle this/if there's a better way, but this seems pretty sane?
This could be expanded on in the future to make swells harder/require more hits with a smaller duration.
 2017-04-03 10:28:52 +09:00
smoogipooo
1a66755694 Fix second hit displaying two judgements, move hitobjects above playfield when hit. 2017-04-03 10:20:20 +09:00
smoogipooo
0745098783 Cleanup. 2017-04-03 10:04:13 +09:00
Dan Balasescu
0e52bead75 Merge pull request #582 from peppy/general-fixes 
Update async load usage to new style.
 2017-04-03 09:41:29 +09:00
Jorolf
a9baeddaa5 remove unused code 2017-04-02 21:12:49 +02:00
Jorolf
9db3fee4b4 make Screens work 2017-04-02 21:03:33 +02:00
Jorolf
8bc241da3d make AppVeyor happy again 2017-04-02 18:31:19 +02:00
Jorolf
679829daae vs17 -> vs15 2017-04-02 18:25:44 +02:00
Jorolf
e835b19d4a add Tooltips 2017-04-02 18:19:59 +02:00
Andrey Zavadskiy
ed476a79f8 Move posting notification in HudOverlay 2017-04-02 16:18:01 +03:00
Dean Herbert
263374a357 Remove unnecessary using. 2017-04-02 17:11:31 +09:00
Dean Herbert
a7f48e0eda Update framework. 2017-04-02 17:07:25 +09:00
Dean Herbert
bfa2e68bfb Container->Wrapper. 2017-04-02 16:17:13 +09: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
bd123fa906 Better inheritance 2017-04-01 21:29:17 +03:00
Andrey Zavadskiy
e3a8a14281 Removed unnecessary using 2017-04-01 21:19:49 +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
Jorolf
017281246d changed SpriteText to OsuSpriteText 2017-04-01 18:12:44 +02: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
Andrey Zavadskiy
9d027a61cd Move input to HudOverlay 2017-04-01 14:46:45 +03:00
Andrey Zavadskiy
06850f7e1f Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility 2017-04-01 14:04:48 +03:00
smoogipooo
efb589cc08 (de)creases for misses. 2017-04-01 16:34:30 +09:00
smoogipooo
b5ef0ae0d8 consecutiveHits -> rollingHits. 2017-04-01 16:32:31 +09: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
Dan Balasescu
9bd19e99ee Merge pull request #579 from peppy/general-fixes 
Framework & VisualTests update
 2017-04-01 15:44:13 +09:00
Dean Herbert
062d99607b Merge branch 'master' into general-fixes 2017-04-01 15:40:20 +09:00
Dean Herbert
041e4f921a Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing 2017-04-01 14:53:25 +09:00
Jorolf
e380254386 remove unnecessary code 2017-03-31 22:32:09 +02:00
Jorolf
1f19d72474 removed wrong using >.> 2017-03-31 21:24:05 +02:00
Jorolf
d8bb72dd78 remove unused using-directive 2017-03-31 21:19:23 +02:00
Jorolf
50b8580141 add license header 2017-03-31 21:13:20 +02:00
Jorolf
47698be1f5 Merge branch 'master' into details 2017-03-31 21:10:45 +02:00
Andrey Zavadskiy
d7c39a00b4 Hud Visibility 2017-03-31 16:43:31 +03:00