RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,181 Commits 3 Branches 650 Tags 352 MiB
Commit Graph

136 Commits

Author SHA1 Message Date
smoogipooo 3ef65a1e5d Cleanup TaikoPlayfield a bit 2017-09-12 18:49:31 +09:00
smoogipooo fb05552ac4 Fix one more case of incorrect offset. 2017-09-12 18:36:31 +09:00
Dean Herbert f32d444d68 Remove generics from Playfield (fixes catch) 2017-09-12 18:19:28 +09:00
Dean Herbert 1194e46ef1 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-12 17:46:21 +09:00
smoogipooo 27e3c9e778 Remove usings. 2017-09-12 11:51:19 +09:00
smoogipooo d6bf5c38b7 Move Kiai bool to HitObject. 2017-09-12 10:01:07 +09:00
smoogipooo 58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations 
# Conflicts:
#	osu-framework
 2017-09-11 15:02:12 +09:00
Dean Herbert b01233eddc Fix CI issues 2017-09-11 14:48:01 +09:00
Dean Herbert 5ce76d8023 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-11 14:36:51 +09:00
Dean Herbert 7170fbd087 Target .NET 4.6.1 2017-09-11 12:39:00 +09:00
smoogipooo cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations 
# Conflicts:
#	osu-framework
 2017-09-11 02:42:23 +09:00
MrTheMake a7f874e5b6 Merge branch 'master' into leaderboard-scores 2017-09-07 18:25:33 +02:00
smoogipooo 19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
smoogipooo 0cc443e618 Remove all generic judgements. 2017-09-06 18:05:51 +09:00
smoogipooo 29941019a5 Hacky way to make osu! and taiko work again. 2017-09-06 17:44:51 +09:00
smoogipooo ac8ec31b61 Make judgements able to be "added" plus make everything compile and run. 2017-09-06 17:02:13 +09:00
Dean Herbert 84c22df3f5 Combine Judgement.HitResults into one. 2017-09-06 17:01:48 +09:00
Tom 1e10d977f9 Accuracy starts at 100% instead of 0% 2017-09-05 15:39:27 +02:00
Dean Herbert a7e6efd34f Rename keys -> actions 2017-08-24 20:30:18 +09:00
Dean Herbert a7a7e0323f Update autoplay and replay handling to result in actions, not keys 2017-08-24 15:36:42 +09:00
Dean Herbert 6f8e85c2e1 Merge branch 'master' into fix_taiko_sizing 2017-08-22 23:19:41 +09:00
smoogipooo d080a7e970 Determine size of ScrollingContainer a bit better to avoid taiko weirdness 2017-08-22 20:53:19 +09:00
smoogipooo 909cae5861 CI fixes. 2017-08-22 14:21:28 +09:00
smoogipooo 68c7226d12 Fix cherry pick issues. 2017-08-22 14:18:17 +09:00
smoogipooo 88151eff3f Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps. 2017-08-22 14:07:39 +09:00
Dean Herbert 7903f49d27 Merge branch 'master' into action-key-counter 2017-08-21 17:47:19 +09:00
Dean Herbert 4ea82694bd Merge branch 'master' into fix-taiko-barlines 2017-08-21 16:53:47 +09:00
Dean Herbert 52dadad1e1 Merge branch 'master' into fix-taiko-barlines 2017-08-21 16:46:25 +09:00
Dean Herbert 8c84732a40 Merge branch 'master' into fix-taiko-drumroll-conversion 2017-08-21 16:35:31 +09:00
Dean Herbert ea450fecf5 Merge branch 'master' into action-key-counter 2017-08-21 16:25:44 +09:00
smoogipooo 6a7e868a2e Make taiko major bar line triangles show up again. Fixes #1081 2017-08-21 15:36:01 +09:00
smoogipooo 7a5708ce92 Further support for null judgements. 2017-08-21 15:35:16 +09:00
Dean Herbert 16e96888ab Update KeyCounterCollection to support action-based buttons 2017-08-21 12:39:22 +09:00
smoogipooo 0970439e34 Fix TaikoBeatmapConverter attempting to convert taiko-specific drum rolls to hits. Fixes #1149 2017-08-21 12:05:56 +09:00
smoogipooo 6a7b410bc3 Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147 2017-08-21 11:58:54 +09:00
Dean Herbert 8364339617 Adjust with proposed formatting 2017-08-20 23:47:07 +09:00
Dean Herbert 325eaa8671 Add mouse buttons defaults for taiko 2017-08-20 22:26:33 +09:00
Dean Herbert a18b2bd5f0 Hook everything up 2017-08-20 22:21:16 +09:00
Dean Herbert ec08b2940d Add taiko default keys 2017-08-20 21:56:37 +09:00
Dean Herbert 59fc6cbed7 Add action support to InputDrum 2017-08-20 21:51:56 +09:00
Dean Herbert ff84eb219b Add action support to taiko 2017-08-20 21:38:09 +09:00
MrTheMake 6d401b5f21 Merge branch 'master' into leaderboard-scores 2017-08-19 00:00:40 +02:00
MrTheMake 81289db33b CI fix, fixed nullref and removed abstraction of GetAutoplayMod 2017-08-13 20:12:01 +02:00
MrTheMake d9c26f98c7 Suggested changes 2017-08-13 19:54:07 +02:00
MrTheMake 4c2d7bf343 Parse the mods of a leaderboard's score 2017-08-13 17:41:13 +02:00
smoogipooo bb8c533802 Fix CI issues. 2017-08-09 17:34:09 +09:00
smoogipooo e9a98358b3 Don't move completed drum rolls above the playfield. 2017-08-09 17:26:59 +09:00
smoogipooo 2334c109e5 Set better TaikoPlayfield default VisibleTimeRange. 2017-08-09 16:46:08 +09:00
smoogipooo 8b4f28318f Fix drum roll ticks. 2017-08-09 16:19:31 +09:00
smoogipooo ef29d9c093 Merge remote-tracking branch 'origin/master' into taiko-timingchanges-2 
# Conflicts:
#	osu.Game.Rulesets.Taiko/UI/TaikoRulesetContainer.cs
 2017-08-09 16:18:27 +09:00