1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-29 23:17:29 +08:00
Commit Graph

44 Commits

Author SHA1 Message Date
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
39df8cce19 Fix incorrect usage of InternalChildren
Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)
2019-03-25 13:48:55 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dan Balasescu
b5fdbe8d87
Merge branch 'master' into master 2018-11-25 01:38:19 +09:00
123tris
b2d21e4ee0 * Corrected misspelling of function in DrawableFruit.cs and refactored all of its use cases 2018-11-24 16:50:23 +01:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
f5ab93a712 Make all drawable fruit absolute values easily scalable 2018-05-25 17:37:52 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
cb3d0db555 Move combo colours completely out of HitObjects 2018-03-20 15:50:12 +09:00
Dean Herbert
a42035f494 Make DrawableHitObject a CompositeDrawable
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Dean Herbert
1c3c90bac6 Add banana design
(cherry picked from commit 6961ca2)
2018-01-12 18:33:41 +09:00
Dean Herbert
e5f17e3ddb Remove scale from all but palpable fruit 2018-01-11 22:36:21 +09:00
Dan Balasescu
9c602f8770
Merge branch 'master' into drawable-fruit-improvements 2018-01-09 22:06:16 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
5bd489863c Rename enum 2018-01-04 18:20:23 +09:00
Dean Herbert
3c06318521 Improve the look of hyperdash fruit 2018-01-03 20:55:52 +09:00
Dean Herbert
b03cbaca77 Add back random rotation 2018-01-03 20:55:44 +09:00
Dean Herbert
4ee845fea8 Adjust border thickness and fade out rate of border 2018-01-03 19:15:25 +09:00
Dean Herbert
921ca6956d Improve fruit visuals 2018-01-03 18:26:54 +09:00
Dean Herbert
cf1f84cc32 Give fruit a border 2018-01-03 16:32:58 +09:00
Dean Herbert
881745d756 Initial implementation of hyperdash calculation 2017-12-01 17:59:36 +09:00
Dean Herbert
bb6b656ec6 Fix code review issues 2017-10-12 22:27:22 +09:00
Dean Herbert
1f1bdc6162 Make juice streams interactive (and correctly positioned) 2017-10-11 18:18:06 +09:00
Dean Herbert
03fbf47bc2 Add juicy streams 2017-10-10 20:22:42 +09:00
Dean Herbert
26215b4488 Create an abstract base class for drawable catch objects 2017-10-09 19:42:55 +09:00
Dean Herbert
0aa152974a Add interfaces to CatchBaseHit 2017-09-19 21:40:38 +09:00
Dean Herbert
fe221905fa Make fruits look a bit closer to the final design 2017-09-15 20:55:04 +09:00
smoogipooo
0cc443e618 Remove all generic judgements. 2017-09-06 18:05: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
Dean Herbert
06e5f7de09 Make pulp size private 2017-08-09 10:16:31 +09:00
Dean Herbert
ff490cf44c Add catching support 2017-08-08 12:58:43 +09:00
Dean Herbert
99a00ed319 Make fruit look a bit better (and buffer them to a texture) 2017-08-08 12:58:43 +09:00
Dean Herbert
4bdaa8ae68 Add basic miss support 2017-08-08 10:36:05 +09:00
Dean Herbert
e67379b6de Use ScrollingHitRenderer 2017-08-08 10:35:56 +09:00
Dean Herbert
725a69d973 Begin conversion 2017-08-07 16:02:14 +09:00
Dean Herbert
c930085213 Add glow 2017-08-07 11:06:03 +09:00
Dean Herbert
51d2b9c35c Tidy up visually 2017-08-07 11:05:58 +09:00
Dean Herbert
554d0d6fb8 Update basic structure of Catch project 2017-08-07 11:05:48 +09:00
Thomas Müller
e8ce3e16b0 Address CI concern 2017-07-10 12:52:29 +03:00
Dean Herbert
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00