Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add circle to DrawableTaikoHitObject. #549

Merged
merged 37 commits into from Mar 24, 2017
Merged

Add circle to DrawableTaikoHitObject. #549

merged 37 commits into from Mar 24, 2017

Conversation

smoogipoo
Copy link
Contributor

@smoogipoo smoogipoo commented Mar 24, 2017 •
edited by peppy

smoogipooo added 30 commits March 17, 2017 22:01
Add initial taiko note circles.
b629766
Fix colours.
caf3ec1
Add finisher notes.
29f303b
Make bashes not use textawesome.
051ef61
Move pieces out of the visual test, fix up comments, rewrite Finisher…
730824f 
…Piece.
Move drum rolls to a new column in TestCaseTaikoHitObjects.
be1f28a
Merge branch 'master' into taiko_note_circle
f87f334
License headers.
edd9a22
Merge branch 'taiko_note_circle' into taiko_drawable_drawing
8f90bcf
Add basic support for drawing circles.
a7eb219 
Conflicts:
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
Cleanups + CircularContainer fixes.
5e0d9c3
Merge branch 'master' into taiko_drawable_drawing
e3bc837
Merge branch 'master' into taiko_note_circle
a403386
Merge branch 'master' into taiko_note_circle
ac2d36d
Make readonly.
cce5b4f
Merge branch 'master' into taiko_drawable_drawing
20e80a7 
Conflicts:
	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
Fix post-merge errors.
bb4b6b7
Merge branch 'taiko_note_circle' into taiko_drawable_drawing
3cecffb 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
Fix something that was removed during merge conflicts.
99f1e86
Move load below CreateIcon().
aa9a65d
Make sure icon is only instantiated once.
eea24b2
Rename ScrollingCirclePiece -> ScrollingPiece.
9518327
Cleanup.
8f7ed81
Moar cleanup.
82752e0
Adjust comment.
d6d3eb9
Merge branch 'taiko_note_circle' into taiko_drawable_drawing
33c160e 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
Fix post-merge issues.
6753a22
Remove explicit alpha = 1.
47065d8
Rewrite CirclePiece to be referenced to 128x128px and handle accented…
5281842 
… hits more sanely.
Cleanup.
df46d0f
smoogipoo
smoogipoo commented Mar 24, 2017
View reviewed changes
osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs

Add(Piece);
}
}

This comment was marked as off-topic.

Sign in to view

smoogipooo added 3 commits March 24, 2017 20:08
Rewrite circle pieces to use custom graphics again.
fdd17c1 
Also using FontAwesome for now to enforce the same size, because otherwise you have to mess around with sprites + the custom graphics. This will all be changed when sprites are fixed to maintain aspect ratios and when glow/border use relative axes.
Make CirclePiece use relative width (leaving length control to Drawab…
2ee68ae 
…leDrumRoll).
Resources...
81c592c
@smoogipoo
Copy link
Contributor Author

As for namespacing, I'll be fixing this after this is merged. This branch especially wreaks havoc on the csproj.

@peppy peppy merged commit 796218c into ppy:master Mar 24, 2017
@smoogipoo smoogipoo deleted the taiko_drawable_drawing branch February 22, 2018 04:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@smoogipoo @peppy