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

78 Commits

Author SHA1 Message Date
Thomas Müller
7a0cea332f Add support for varying circle size 2017-02-19 18:21:45 +01:00
Thomas Müller
502ad4aa53 Fix incorrect naming scheme 2017-02-19 18:21:15 +01:00
Thomas Müller
417f146386 Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
Dean Herbert
1a31589abd
Add padding zeroes to score display (and fix not being applied initially). 2017-02-18 17:35:37 +09:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
Dean Herbert
94dd268fd2
Move constant for default ControlPoint out of Slider. 2017-02-18 15:54:16 +09:00
Dean Herbert
0b922365bb
Fix nullref due to missing controlPoints. 2017-02-17 15:27:48 +09:00
Dean Herbert
aaed714160
Adjust Explode alpha slightly. 2017-02-16 22:48:47 +09:00
Dean Herbert
53e40804ab
Move other score components to centre alignment (and switch font). 2017-02-16 22:44:41 +09:00
Nabile Rahmani
9c4bb82dd6 Merged upstream/master. 2017-02-16 13:23:11 +01:00
Nabile Rahmani
3068fa1a62 Namespace does not correspond to file location. 2017-02-16 11:30:31 +01:00
Dean Herbert
b55d85a5c5
Add MaxScore to correctly account for the maximum attainable score of DrawableHitObjects. 2017-02-16 17:33:13 +09:00
Dean Herbert
8bf3902cbd
Add the concept of nested DrawableHitObjects.
- Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
- Removed SliderTicksLayer abstraction for now.
2017-02-16 17:02:36 +09:00
Dean Herbert
2640c2ac43
Add tick sample. 2017-02-16 13:39:01 +09:00
Dean Herbert
19eb58e724
Fix namespace. 2017-02-16 13:37:08 +09:00
Dean Herbert
97b782128e
Adjust tick appear/disappear animations. 2017-02-16 13:33:59 +09:00
Dean Herbert
6c9fe544b2
Handle case where TickDistance is zero (don't draw ticks). 2017-02-16 13:20:30 +09:00
Dean Herbert
23677a309f
Merge branch 'master' into slider_ticks 2017-02-16 11:06:23 +09:00
Damnae
f1535363f4 Rename SliderTicksRenderer to SliderTicksLayer. 2017-02-15 19:06:54 +01:00
Damnae
b7fca88b4f Clearer slider Velocity and TickDistance calculations. 2017-02-15 18:55:49 +01:00
Dean Herbert
31a617363a
Improve the feel of spinners. 2017-02-15 23:24:08 +09:00
Dean Herbert
7fbc5990d1
Add combo numbers. 2017-02-15 23:23:55 +09:00
Dean Herbert
bab219c428
Fix SliderBall weirdness (not correctly staying circular).
Also adjusts tracking to only change during sldier active time.
2017-02-15 21:51:16 +09:00
Dean Herbert
67105e6dfd
Replace all usage of SpriteText with OsuSpriteText. 2017-02-15 21:37:43 +09:00
Dean Herbert
ce859196d5
Avoid glow fading out early on spinners. 2017-02-15 21:05:46 +09:00
Dean Herbert
12e265a3e2
Combine triangle system implementations. 2017-02-15 20:39:10 +09:00
Damnae
e2fae24ad5 Merge branch 'master' into slider_ticks
Conflicts:
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Slider.cs
2017-02-15 10:53:42 +01:00
Dean Herbert
f2b0fd4de0
Throw exception on unknown hitobject. 2017-02-15 11:37:23 +09:00
Dean Herbert
10dfe47638 Add spinners and improve TestCaseHitObjects. 2017-02-15 01:23:20 +09:00
Dean Herbert
396c8121d3 Better slider defaults. 2017-02-15 01:23:19 +09:00
Dean Herbert
e88d02d3c4 Ensure SliderCurve is assigned Calculated before used. 2017-02-15 01:23:19 +09:00
Dean Herbert
fc192906ea Handle proxied approach layer better and add slider's approach circle (previously missing). 2017-02-15 01:23:19 +09:00
Dean Herbert
9a5ac64332 Make HitObjectType more accessible.
# Conflicts:
#	osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
2017-02-15 01:23:19 +09:00
Damnae
ace7a1d009 Fix slider ticks expiring before scoring happens. 2017-02-14 16:12:35 +01:00
Damnae
9f890139d4 Cache drawable ticks. 2017-02-14 15:16:18 +01:00
Damnae
3e7208c8a4 Add slider ticks. 2017-02-14 11:26:24 +01:00
Dean Herbert
f207da6041
Add/update license headers. 2017-02-14 18:17:35 +09:00
Dean Herbert
343e48c195 Merge branch 'master' into followpoints 2017-02-13 22:23:57 +09:00
Thomas Müller
aaaf7163e0
Update framework. 2017-02-13 17:46:50 +09:00
Damnae
daa14bfec8 Replace AddConnections by a HitObjects property. 2017-02-12 08:47:07 +01:00
John Leuenhagen
7ad9cd6b6e
add explicit false values to prevent warnings as errors 2017-02-12 02:32:11 -05:00
Damnae
de2791e179 Better looking follow points. 2017-02-12 08:22:13 +01:00
Damnae
d7be9539d1 Create connections from HitObjects instead of DrawableHitObjects. 2017-02-12 07:29:36 +01:00
Damnae
4162ef72d4 Remove start/end index. 2017-02-12 06:02:45 +01:00
Damnae
ec64455573 Add xml-doc. 2017-02-10 10:28:21 +01:00
Damnae
6f37c02868 Fix followpoints needing a DelayReset. 2017-02-10 10:07:52 +01:00
Damnae
4e6b6ab794 Abstract follow points into a separate class. 2017-02-10 08:10:24 +01:00
Damnae
77ee161be8 Add follow points. 2017-02-10 06:19:59 +01:00
Andrey Zavadskiy
e06aa44c4c Warning Fixes 2017-02-09 16:18:08 +03:00
Damnae
07c0057fab Update GetPathToProgress's xml-doc. 2017-02-09 08:57:28 +01:00