Thomas Müller
|
1198705a6f
|
Merge branch 'master' of github.com:ppy/osu into general-fixes
# Conflicts:
# osu.Game/Beatmaps/Beatmap.cs
|
2017-02-17 21:22:34 +01:00 |
|
Thomas Müller
|
4b0d6cd26b
|
Don't rely on default relative size of ScrollContainer.
|
2017-02-17 20:08:28 +01:00 |
|
Andrey Zavadskiy
|
2f4855b00f
|
Added exception
|
2017-02-17 21:07:59 +03:00 |
|
Thomas Müller
|
6a58d7ab2a
|
Merge pull request #366 from OussamaDanba/slider_timingpoint_fix
Fix beatmap import crash when the first timingPoint starts later than…
|
2017-02-17 18:22:55 +01:00 |
|
Shadoxfix
|
7a45ea58b2
|
Add comment explaining why the branch is necessary
|
2017-02-17 18:17:18 +01:00 |
|
Shadoxfix
|
72306e8757
|
Fix beatmap import crash when the first timingPoint starts later than a slider
|
2017-02-17 17:36:00 +01:00 |
|
Jorolf
|
88c48bec46
|
Merge branch 'master' of https://github.com/ppy/osu
|
2017-02-17 12:54:11 +01:00 |
|
Dean Herbert
|
fe3a6248ec
|
Add better screen hierarchy and placeholder for dev build disclaimer.
|
2017-02-17 20:07:16 +09:00 |
|
Dean Herbert
|
e6ef9f67aa
|
GameMode -> Screen.
|
2017-02-17 19:23:58 +09:00 |
|
Dean Herbert
|
366e95dd4f
|
Remove outdated comment.
|
2017-02-17 17:33:41 +09:00 |
|
Dean Herbert
|
9e8b4d43dd
|
Improve exit procedure.
|
2017-02-17 17:25:28 +09:00 |
|
Dean Herbert
|
0b922365bb
|
Fix nullref due to missing controlPoints.
|
2017-02-17 15:27:48 +09:00 |
|
Dean Herbert
|
ecb840e26f
|
Merge pull request #364 from peppy/general-fixes
Design improvements
|
2017-02-16 22:49:57 +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 |
|
Dean Herbert
|
ca6946c7a2
|
Update Health display design.
|
2017-02-16 22:44:21 +09:00 |
|
Dean Herbert
|
9a2beb5979
|
Update Key Counter font.
|
2017-02-16 22:43:49 +09:00 |
|
Dean Herbert
|
04346dbb92
|
Make osu! logo at song select correctly handle mouse focus.
|
2017-02-16 22:24:25 +09:00 |
|
Dean Herbert
|
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 |
|
Nabile Rahmani
|
9c4bb82dd6
|
Merged upstream/master.
|
2017-02-16 13:23:11 +01:00 |
|
Nabile Rahmani
|
1cdd2a6072
|
Updated submodule.
|
2017-02-16 13:09:42 +01:00 |
|
Nabile Rahmani
|
3068fa1a62
|
Namespace does not correspond to file location.
|
2017-02-16 11:30:31 +01:00 |
|
Thomas Müller
|
e10c5644fe
|
Merge pull request #359 from Damnae/slider_ticks
Add slider ticks.
|
2017-02-16 10:31:05 +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
|
c90f5e247d
|
Add a TickDistance to TestCaseHitObjects.
|
2017-02-16 13:20:40 +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 |
|
Thomas Müller
|
d3335f778b
|
Merge pull request #361 from peppy/general-hitobject-improvements
General HitObject improvements.
|
2017-02-15 19:49:46 +01: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
|
25f65a978b
|
Framework bump.
|
2017-02-16 02:41:30 +09: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
|
7fc035835b
|
Merge pull request #360 from peppy/general-fixes
Change inspection settings.
|
2017-02-15 16:33:27 +09:00 |
|
Dean Herbert
|
f8e1006fcd
|
Change inspection settings.
UnusedMember_002ELocal: Warning -> Hint
VirtualMemberCallInConstructor: Warning -> Hint
|
2017-02-15 16:24:39 +09:00 |
|
Jorolf
|
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 |
|
Dean Herbert
|
25e7a08cca
|
Reset local version and explicitly show release/debug builds.
|
2017-02-15 13:41:12 +09:00 |
|
Dean Herbert
|
bd4902a532
|
Merge pull request #358 from peppy/spinners
Add spinners and improve TestCaseHitObjects.
|
2017-02-15 12:58:21 +09:00 |
|
Dean Herbert
|
d570a6d308
|
Handle cases where HitObjects were not parsed.
|
2017-02-15 12:38:10 +09:00 |
|
Dean Herbert
|
753232533a
|
Display Important/Error logging in notifications for now.
|
2017-02-15 12:37:57 +09:00 |
|
Dean Herbert
|
580584a015
|
Don't use osu! mode parser for other game modes for now (convert still works).
|
2017-02-15 12:36:47 +09:00 |
|