|
|
ecb840e26f
|
Merge pull request #364 from peppy/general-fixes
Design improvements
|
2017-02-16 22:49:57 +09:00 |
|
|
|
aaed714160
|
Adjust Explode alpha slightly.
|
2017-02-16 22:48:47 +09:00 |
|
|
|
53e40804ab
|
Move other score components to centre alignment (and switch font).
|
2017-02-16 22:44:41 +09:00 |
|
|
|
ca6946c7a2
|
Update Health display design.
|
2017-02-16 22:44:21 +09:00 |
|
|
|
9a2beb5979
|
Update Key Counter font.
|
2017-02-16 22:43:49 +09:00 |
|
|
|
04346dbb92
|
Make osu! logo at song select correctly handle mouse focus.
|
2017-02-16 22:24:25 +09:00 |
|
|
|
a3cdbe234e
|
Merge pull request #362 from Nabile-Rahmani/apply-suggestions
Fixed "Namespace does not correspond to file location".
|
2017-02-16 21:39:42 +09:00 |
|
|
|
9c4bb82dd6
|
Merged upstream/master.
|
2017-02-16 13:23:11 +01:00 |
|
|
|
1cdd2a6072
|
Updated submodule.
|
2017-02-16 13:09:42 +01:00 |
|
|
|
3068fa1a62
|
Namespace does not correspond to file location.
|
2017-02-16 11:30:31 +01:00 |
|
|
|
e10c5644fe
|
Merge pull request #359 from Damnae/slider_ticks
Add slider ticks.
|
2017-02-16 10:31:05 +01:00 |
|
|
|
b55d85a5c5
|
Add MaxScore to correctly account for the maximum attainable score of DrawableHitObjects.
|
2017-02-16 17:33:13 +09:00 |
|
|
|
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 |
|
|
|
2640c2ac43
|
Add tick sample.
|
2017-02-16 13:39:01 +09:00 |
|
|
|
19eb58e724
|
Fix namespace.
|
2017-02-16 13:37:08 +09:00 |
|
|
|
97b782128e
|
Adjust tick appear/disappear animations.
|
2017-02-16 13:33:59 +09:00 |
|
|
|
c90f5e247d
|
Add a TickDistance to TestCaseHitObjects.
|
2017-02-16 13:20:40 +09:00 |
|
|
|
6c9fe544b2
|
Handle case where TickDistance is zero (don't draw ticks).
|
2017-02-16 13:20:30 +09:00 |
|
|
|
23677a309f
|
Merge branch 'master' into slider_ticks
|
2017-02-16 11:06:23 +09:00 |
|
|
|
d3335f778b
|
Merge pull request #361 from peppy/general-hitobject-improvements
General HitObject improvements.
|
2017-02-15 19:49:46 +01:00 |
|
|
|
f1535363f4
|
Rename SliderTicksRenderer to SliderTicksLayer.
|
2017-02-15 19:06:54 +01:00 |
|
|
|
b7fca88b4f
|
Clearer slider Velocity and TickDistance calculations.
|
2017-02-15 18:55:49 +01:00 |
|
|
|
25f65a978b
|
Framework bump.
|
2017-02-16 02:41:30 +09:00 |
|
|
|
31a617363a
|
Improve the feel of spinners.
|
2017-02-15 23:24:08 +09:00 |
|
|
|
7fbc5990d1
|
Add combo numbers.
|
2017-02-15 23:23:55 +09:00 |
|
|
|
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 |
|
|
|
67105e6dfd
|
Replace all usage of SpriteText with OsuSpriteText.
|
2017-02-15 21:37:43 +09:00 |
|
|
|
ce859196d5
|
Avoid glow fading out early on spinners.
|
2017-02-15 21:05:46 +09:00 |
|
|
|
12e265a3e2
|
Combine triangle system implementations.
|
2017-02-15 20:39:10 +09:00 |
|
|
|
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 |
|
|
|
7fc035835b
|
Merge pull request #360 from peppy/general-fixes
Change inspection settings.
|
2017-02-15 16:33:27 +09:00 |
|
|
|
f8e1006fcd
|
Change inspection settings.
UnusedMember_002ELocal: Warning -> Hint
VirtualMemberCallInConstructor: Warning -> Hint
|
2017-02-15 16:24:39 +09:00 |
|
|
|
d42c5481b0
|
Make mode selector selected line non-relative. (#352)
* mode selector line has the correct length now
* calculation is now a 'one-liner'
* Line length is absolute now
* Line length is calculated inline
|
2017-02-15 13:48:49 +09:00 |
|
|
|
25e7a08cca
|
Reset local version and explicitly show release/debug builds.
|
2017-02-15 13:41:12 +09:00 |
|
|
|
bd4902a532
|
Merge pull request #358 from peppy/spinners
Add spinners and improve TestCaseHitObjects.
|
2017-02-15 12:58:21 +09:00 |
|
|
|
d570a6d308
|
Handle cases where HitObjects were not parsed.
|
2017-02-15 12:38:10 +09:00 |
|
|
|
753232533a
|
Display Important/Error logging in notifications for now.
|
2017-02-15 12:37:57 +09:00 |
|
|
|
580584a015
|
Don't use osu! mode parser for other game modes for now (convert still works).
|
2017-02-15 12:36:47 +09:00 |
|
|
|
f2b0fd4de0
|
Throw exception on unknown hitobject.
|
2017-02-15 11:37:23 +09:00 |
|
|
|
a8271d02d8
|
Merge branch 'master' of https://github.com/ppy/osu
|
2017-02-14 20:17:44 +01:00 |
|
|
|
5873178df3
|
Merge branch 'master' into spinners
|
2017-02-15 01:32:54 +09:00 |
|
|
|
325054c7f7
|
Update framework.
|
2017-02-15 01:29:51 +09:00 |
|
|
|
ba7b61521f
|
Merge pull request #354 from peppy/builder
Deploy automation
|
2017-02-15 01:28:05 +09:00 |
|
|
|
10dfe47638
|
Add spinners and improve TestCaseHitObjects.
|
2017-02-15 01:23:20 +09:00 |
|
|
|
8e9a5e9faa
|
Add the ability to make DrawableHitObjects non-interactive (for use in other contexts).
|
2017-02-15 01:23:20 +09:00 |
|
|
|
396c8121d3
|
Better slider defaults.
|
2017-02-15 01:23:19 +09:00 |
|
|
|
e88d02d3c4
|
Ensure SliderCurve is assigned Calculated before used.
|
2017-02-15 01:23:19 +09:00 |
|
|
|
fc192906ea
|
Handle proxied approach layer better and add slider's approach circle (previously missing).
|
2017-02-15 01:23:19 +09:00 |
|
|
|
9a5ac64332
|
Make HitObjectType more accessible.
# Conflicts:
# osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
|
2017-02-15 01:23:19 +09:00 |
|
|
|
9f96a511a7
|
Merge pull request #357 from peppy/general-fixes
General fixes.
|
2017-02-14 17:22:31 +01:00 |
|
