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

3130 Commits

Author SHA1 Message Date
smoogipooo 3c21e6538b Merge branch 'taiko_drumroll_drawing' into taiko-drawable-generation 
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-29 11:15:10 +09:00
smoogipooo 24c6ee620f Merge branch 'taiko_hit_drawing' into taiko-drawable-generation 
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
 2017-03-29 11:12:39 +09:00
smoogipooo 9da28d372a Merge branch 'taiko_swell_drawing' into taiko-drawable-generation 2017-03-29 11:09:51 +09:00
Dean Herbert 42f4d67de2
Update framework. 2017-03-29 10:43:29 +09:00
Dan Balasescu 604d487366 Merge pull request #565 from peppy/dynamic-recompile 
Dynamically recompile VisualTests
 2017-03-29 10:20:33 +09:00
smoogipooo 8f01bd75a1 Update framework. 2017-03-29 10:16:35 +09:00
Dan Balasescu d7674e2367 Merge branch 'master' into dynamic-recompile 2017-03-29 10:12:48 +09:00
smoogipooo 762cbfc997 Merge remote-tracking branch 'peppy/dynamic-recompile' into taiko_drumroll_drawing 2017-03-29 09:57:25 +09:00
Dean Herbert ab97967237
Update references and framework. 2017-03-29 09:54:00 +09:00
smoogipooo 1b291ec1a1 Make drumroll body colour depending on completion. 2017-03-29 09:38:24 +09:00
smoogipooo 2a018e708d Better life time end. 2017-03-29 09:36:07 +09:00
smoogipooo 7b479ac737 Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawing 2017-03-29 09:12:48 +09:00
smoogipooo d74454141b Remove explicit life time end. 2017-03-29 09:12:21 +09:00
smoogipooo e518508f2d Better life time ends. 2017-03-29 09:11:07 +09:00
smoogipooo bbc6a4234a Fix post-merge errors. 2017-03-29 09:08:26 +09:00
smoogipooo c478c74227 Merge remote-tracking branch 'origin/master' into taiko_hit_drawing 2017-03-29 09:03:19 +09:00
smoogipooo 6d5b0a13e4 Fix resharper warning. 2017-03-29 09:02:49 +09:00
smoogipooo 7fc68864be Move swells on top of the playfield when they reach the hit target. 2017-03-29 09:01:40 +09:00
smoogipooo 6bee57c94f Better life time ends. 2017-03-29 08:41:50 +09:00
smoogipooo 45653d7b43 Fix post-merge errors. 2017-03-29 08:32:34 +09:00
smoogipooo eabcae82c6 Merge remote-tracking branch 'origin/master' into taiko_swell_drawing 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-29 08:30:30 +09:00
Dan Balasescu 5e734a9271 Merge pull request #566 from peppy/move-easingtypes 
Move EasingTypes up one namespace level.
 2017-03-29 08:24:38 +09:00
smoogipooo 6856e17364 Update framework. 2017-03-29 08:17:54 +09:00
Dan Balasescu bca18ce209 Merge branch 'master' into move-easingtypes 2017-03-29 08:14:13 +09:00
Dan Balasescu 2bb8e3bae8 Merge pull request #558 from peppy/avatars-and-login 
Avatar refactoring & better focus handling in login form.
 2017-03-29 08:12:05 +09:00
Dan Balasescu e53a5a3521 Merge branch 'master' into avatars-and-login 2017-03-29 07:52:43 +09:00
Dean Herbert f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert 24a105704a
Update framework. 2017-03-28 20:39:08 +09:00
smoogipooo 714c280531 One more xmldoc. 2017-03-28 17:26:39 +09:00
Dan Balasescu 0a1b9fe398 Merge branch 'master' into taiko_hit_drawing 2017-03-28 17:25:07 +09:00
smoogipooo c14759ebad Use new circle piece in test case. 2017-03-28 17:24:14 +09:00
smoogipooo 2ff213d2c8 Fix resharper warning. 2017-03-28 17:19:27 +09:00
smoogipooo 79764603d7 Adjust comment. 2017-03-28 17:19:05 +09:00
smoogipooo 6f66558e29 Use relative size for ticks. 2017-03-28 17:10:01 +09:00
smoogipooo 6b1dab5b83 Implement drawable drumroll. 2017-03-28 17:08:34 +09:00
smoogipooo 2e8607687c Implement DrumRollTick drawing. 2017-03-28 16:49:39 +09:00
smoogipooo 1220972170 Fix ticks not being passed IsStrong. 2017-03-28 16:47:25 +09:00
smoogipooo 1615db386a Give DrumRoll some sane velocity/tickdistance defaults. 2017-03-28 16:47:13 +09:00
smoogipooo d1f686b1a8 Fix DrawableTaikoHitObject origins. 2017-03-28 16:38:58 +09:00
Dean Herbert 4bdf9e09ca Merge pull request #560 from smoogipooo/general_taiko_fixes 
General taiko fixes
 2017-03-28 16:12:19 +09:00
smoogipooo ae4cabccef Adjust comment. 2017-03-28 16:00:39 +09:00
Dean Herbert ffbf6888c4 Merge branch 'master' into general_taiko_fixes 2017-03-28 15:40:55 +09:00
Dean Herbert 28bde5eecd Merge pull request #559 from smoogipooo/rename_accented 
Rename Accented to Strong.
 2017-03-28 15:40:35 +09:00
Dean Herbert 4042b94e01
Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
smoogipooo 3f6b17c0bf Add drawable Swell. 2017-03-28 15:05:45 +09:00
Dean Herbert f690e1d0c4
Move async logic to framework. 2017-03-28 14:24:34 +09:00
Dean Herbert 076dd73e84 Merge branch 'master' into rename_accented 2017-03-28 14:22:33 +09:00
Dean Herbert 8ad4c5f312 Merge pull request #513 from smoogipooo/taiko_drumroll_drawable 
Drawable DrumRoll Implementation (Input only)
 2017-03-28 14:21:44 +09:00
smoogipooo ec9a027b59 ZZZZZZZzzzzzzzz. 2017-03-28 11:21:01 +09:00
smoogipooo b7d9de57a2 Add rim hits. 2017-03-28 11:18:12 +09:00