1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 22:52:54 +08:00
Commit Graph

3331 Commits

Author SHA1 Message Date
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
Dan Balasescu
cbb669add3 Merge pull request #589 from peppy/general-fixes
Resources + framework update
2017-04-04 20:32:07 +09:00
Dan Balasescu
eef49c8195 Merge branch 'master' into general-fixes 2017-04-04 20:27:26 +09:00
Andrey Zavadskiy
3e508b8390 Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility 2017-04-04 11:37:19 +03:00
Dean Herbert
a09e908ec7 Merge pull request #584 from smoogipooo/taiko_barlines
Taiko barlines
2017-04-04 17:01:46 +09:00
Dean Herbert
1654e74235 Remove unnecessary CI override. 2017-04-04 16:37:10 +09:00
Dean Herbert
2df360a5e9
Fix clashing namespace. 2017-04-04 12:38:55 +09:00
Dean Herbert
1233fb5b82
Split noto out into individual ranges. 2017-04-04 11:34:55 +09:00
Dean Herbert
c6216dbde1
Remove outdated todo. 2017-04-04 11:34:45 +09:00
Dean Herbert
7c74951454
Update bindables.
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
Dean Herbert
f6303d55ec
Upodate some tab usages. 2017-04-04 11:13:09 +09:00
Dean Herbert
b0ebacb06d
Fix some unused variables in test cases. 2017-04-04 11:13:07 +09:00
Dean Herbert
353cf2a026
Adjust timings to make TestCase more usable. 2017-04-04 10:34:05 +09:00
Dean Herbert
8fcb1690cf
Update framework. 2017-04-04 10:33:48 +09:00
Dean Herbert
d0ebbad0fa
Fix avatar display. 2017-04-04 10:33:41 +09:00
smoogipooo
7edabe730a Cleanup. 2017-04-03 21:10:39 +09:00
Andrey Zavadskiy
5baa887f55 Fixes 2017-04-03 14:58:38 +03:00
Dean Herbert
aebd953980 Merge branch 'master' into taiko_barlines 2017-04-03 20:43:15 +09:00
Dean Herbert
aa43b138b0 Merge branch 'master' into hud_visibility 2017-04-03 20:42:27 +09:00
Dean Herbert
a742664675 Merge pull request #588 from smoogipooo/fix_slider_velocities
Fix slider velocities
2017-04-03 20:42:01 +09:00
smoogipooo
2e80ecfda8 Don't need explicit null value. 2017-04-03 20:33:10 +09:00
smoogipooo
5cb16f6e7c Renamings + comments. 2017-04-03 20:32:03 +09:00
smoogipooo
15db37d9e0 Cleanup. 2017-04-03 20:27:25 +09:00
smoogipooo
2be7458532 Commenting (+ version check for speed adjustment). 2017-04-03 20:27:11 +09:00
smoogipooo
19b5555ef2 Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo. 2017-04-03 20:26:46 +09:00
Andrey Zavadskiy
c1b48c6cbf FadeIn/Out 2017-04-03 12:17:53 +03:00
Andrey Zavadskiy
e1d3befaed Added bool to ensure the notification is only displayed once per game execution 2017-04-03 12:03:21 +03:00
Andrey Zavadskiy
63a1eef6e4 Removed unnecessary line 2017-04-03 11:54:50 +03:00
smoogipooo
91eec9e8fc Fix incorrect split hit circle start time. 2017-04-03 17:54:48 +09:00
Andrey Zavadskiy
e51fdd3c86 Added container whose visibility will be changable 2017-04-03 11:41:17 +03:00
smoogipooo
a32eb66538 Fix missing speed multiplier + split onto multiple lines. 2017-04-03 17:31:08 +09:00
smoogipooo
0c57299066 Rewrite drum roll -> hit conversion to match osu-stable. 2017-04-03 17:30:49 +09:00
smoogipooo
d7ed392f27 Add a velocity multiplier to taiko hit objects.
This will be usable from the editor moving forward also - where every hit object can have its own velocity multiplier on top of the control point one.
2017-04-03 17:19:46 +09:00
Andrey Zavadskiy
8d28c54ff3 Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility 2017-04-03 11:07:14 +03:00
smoogipooo
aad8851460 Define TickRate to adjust rate of ticks externally, removing todo. 2017-04-03 15:32:38 +09:00
smoogipooo
293ea6fbd7 Fix up beatmap converter error. 2017-04-03 15:24:30 +09:00
smoogipooo
63ca68793e Merge remote-tracking branch 'origin/master' into fix_slider_velocities 2017-04-03 15:23:02 +09:00
Dan Balasescu
9ba230aa58 Merge branch 'master' into taiko_barlines 2017-04-03 15:15:29 +09:00
Dean Herbert
c005cf82c1 Merge pull request #587 from smoogipooo/fix_slider_velocities
Fix slider velocities
2017-04-03 15:13:37 +09:00
Dean Herbert
8fb92e6754 Merge pull request #586 from smoogipooo/taiko-fixes
Taiko fixes
2017-04-03 15:09:51 +09:00
Dean Herbert
c539e514f5 Merge branch 'master' into fix_slider_velocities 2017-04-03 15:08:54 +09:00
smoogipooo
a03cffab58 No need to compute end time manually anymore. 2017-04-03 15:05:12 +09:00
smoogipooo
774e15b89d Set RequiredHits at conversion time to remove HitMultiplier. 2017-04-03 15:02:21 +09:00
smoogipooo
e7b55f9bea Fix bar line pre empt time calculation. 2017-04-03 14:49:26 +09:00
Dean Herbert
6043c4787b Merge branch 'master' into taiko-fixes 2017-04-03 14:47:43 +09:00
smoogipooo
759869f551 Merge branch 'fix_slider_velocities' into taiko_barlines 2017-04-03 14:47:40 +09:00
Dean Herbert
486e14e0f6 Merge pull request #570 from smoogipooo/taiko-drawable-generation
Taiko drawable generation
2017-04-03 14:45:51 +09:00
smoogipooo
ebbf381cd6 Fix kiai not working during gameplay. 2017-04-03 14:40:12 +09:00
smoogipooo
6e612bbefc Reduce complexity of instantiating circle pieces in hits. 2017-04-03 14:39:56 +09:00