Dean Herbert
|
f1a35f77d2
|
Make bananas explode even on miss
|
2018-06-29 16:49:01 +09:00 |
|
Dean Herbert
|
f7fbf61306
|
Centralise judgement logic
|
2018-06-29 15:27:02 +09:00 |
|
Dean Herbert
|
0940715631
|
Merge branch 'master' into catch-scoring
|
2018-06-29 14:59:15 +09:00 |
|
smoogipoo
|
80501de4b9
|
Add legacy slider offsets
|
2018-06-27 12:09:21 +09:00 |
|
Dean Herbert
|
1a8aa6eab1
|
Fix regression causing new combos to once again not be respected
|
2018-06-26 20:13:55 +09:00 |
|
Dean Herbert
|
f7f17bab78
|
Merge branch 'master' into catch-droplet-fix
|
2018-06-26 19:29:15 +09:00 |
|
smoogipoo
|
c9581a2d56
|
Merge remote-tracking branch 'origin/master' into catch_star_rating
# Conflicts:
# osu-framework
# osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
# osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
|
2018-06-21 12:15:25 +09:00 |
|
ekrctb
|
516b1c5495
|
Fix droplet position clamping
|
2018-06-20 18:29:23 +09:00 |
|
ekrctb
|
9d7e5b4920
|
Clamp juice stream position
|
2018-06-20 17:23:55 +09:00 |
|
Dan Balasescu
|
0ba80fad60
|
Merge branch 'master' into droplets-should-bounce
|
2018-06-15 17:34:54 +09:00 |
|
Dean Herbert
|
149d94116b
|
Fix droplets not bouncing off catcher's plate immediately
|
2018-06-15 15:44:47 +09:00 |
|
Dean Herbert
|
2ff7b4cdcf
|
Merge branch 'master' into catch-droplet-fix
|
2018-06-15 14:34:01 +09:00 |
|
smoogipoo
|
31bd59442f
|
Remove banana positioning comment
|
2018-06-14 21:38:08 +09:00 |
|
Dean Herbert
|
c41a50bf24
|
Fix combos ending with JuiceStreams never leaving the catcher's plate
Closes #2634.
|
2018-06-14 16:39:31 +09:00 |
|
Dan Balasescu
|
cbb883614a
|
Merge branch 'master' into catch-droplet-fix
|
2018-06-13 15:18:52 +09:00 |
|
clayton
|
e44e08201b
|
Remove unnecessary usings and move Banana out of BananaShower
|
2018-06-11 12:43:01 -07:00 |
|
clayton
|
f486bcfee1
|
Add judgements to catch
|
2018-06-09 17:38:17 -07:00 |
|
ekrctb
|
456dc81f2f
|
Fix InspectCode issues
|
2018-05-25 19:18:11 +09:00 |
|
ekrctb
|
26c6313dec
|
catch: the fruit positions are finalized on the post process
|
2018-05-25 19:11:29 +09:00 |
|
Dean Herbert
|
f5ab93a712
|
Make all drawable fruit absolute values easily scalable
|
2018-05-25 17:37:52 +09:00 |
|
frankhjwx
|
44fd4b95bd
|
We need DistanceToHyperDash for star rating calculation
|
2018-05-21 09:58:46 +08:00 |
|
smoogipoo
|
97a523584d
|
Make HitWindows not return null by default
|
2018-05-11 15:52:51 +09:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
Dean Herbert
|
af65f2dd48
|
Move AccentColour changes local to rulesets which rely on it
|
2018-03-22 18:53:16 +09:00 |
|
Dean Herbert
|
7bdca0ff39
|
Merge remote-tracking branch 'upstream/master' into accent-colour-properties
|
2018-03-22 15:07:28 +09:00 |
|
Dean Herbert
|
78a8f60b39
|
IHasComboIndex -> IHasComboInformation
|
2018-03-22 12:35:17 +09:00 |
|
Dean Herbert
|
cb3d0db555
|
Move combo colours completely out of HitObjects
|
2018-03-20 15:50:12 +09:00 |
|
Dean Herbert
|
8d790e180d
|
Fix juice stream droplets spawning in incorrect locations
Closes #2149.
|
2018-03-16 17:03:38 +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 |
|
smoogipoo
|
f5fc9cdfba
|
Fix catch now having incorrect offsets
|
2018-02-24 02:59:55 +09:00 |
|
Dean Herbert
|
3bd42e3c85
|
Fix catch never hitting result screen
|
2018-02-01 18:08:15 +09:00 |
|
Dean Herbert
|
daac7494dd
|
Fix incorrect offset check for DrawableCatchHitObjects
|
2018-02-01 18:08:15 +09:00 |
|
smoogipoo
|
d37844c068
|
Clean up off-by-one offsets from repeat-related properties
|
2018-01-23 13:37:25 +09:00 |
|
Aergwyn
|
ae1adfd2f2
|
remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
|
2018-01-12 19:30:34 +01:00 |
|
Dean Herbert
|
b4b15b7dd0
|
Apply review fixes
|
2018-01-13 00:51:20 +09:00 |
|
Dean Herbert
|
9e10854840
|
Fix banannanananana showers not exploding enough
|
2018-01-12 22:30:35 +09:00 |
|
Dean Herbert
|
7b19353ed8
|
Fix weird fruit not fading out
|
2018-01-12 22:30:35 +09:00 |
|
Dean Herbert
|
f03b8206da
|
Make banana showers always last in combo (explodey)
|
2018-01-12 22:30:35 +09:00 |
|
Dean Herbert
|
93c4d58b69
|
Make catch plate fruit again
|
2018-01-12 22:30:35 +09:00 |
|
Dan Balasescu
|
d9c47f98a8
|
Merge branch 'master' into catch-banana-shower
|
2018-01-12 20:00:00 +09:00 |
|
Dean Herbert
|
7bdedf802c
|
Fix juice streams not propagating accent colours to nested objects
|
2018-01-12 19:39:56 +09:00 |
|
Dean Herbert
|
9e3091bfe9
|
Change anchors in line with new ScrollingPlayfield implementation
(cherry picked from commit 079827d)
|
2018-01-12 18:33:41 +09:00 |
|
Dean Herbert
|
26fedd7e61
|
Update in line with upstream changes
(cherry picked from commit 2b6d991)
|
2018-01-12 18:33:41 +09:00 |
|
Dean Herbert
|
5b15073010
|
Add actual banana conversion/reading
(cherry picked from commit d353158)
|
2018-01-12 18:33:41 +09:00 |
|
Dean Herbert
|
5c79bdc41c
|
Use switch pattern matching in more places
Also switch access to many classes to public.
(cherry picked from commit 86cc3b7)
|
2018-01-12 18:33:41 +09:00 |
|
Dean Herbert
|
a36cfd4265
|
Add BananaShower models and representations
(cherry picked from commit e12e095)
|
2018-01-12 18:33:41 +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 |
|
Dean Herbert
|
0609fc40de
|
Fix up DrawableJuiceStream/BananaShower
(cherry picked from commit 0bfb3b6)
|
2018-01-11 20:56:09 +09:00 |
|
Dean Herbert
|
66ebe2ee66
|
Change anchors in line with new ScrollingPlayfield implementation
(cherry picked from commit 079827d)
|
2018-01-11 20:55:43 +09:00 |
|