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 |
|
Dean Herbert
|
f2b0fd4de0
|
Throw exception on unknown hitobject.
|
2017-02-15 11:37:23 +09:00 |
|
Jorolf
|
a8271d02d8
|
Merge branch 'master' of https://github.com/ppy/osu
|
2017-02-14 20:17:44 +01:00 |
|
Dean Herbert
|
5873178df3
|
Merge branch 'master' into spinners
|
2017-02-15 01:32:54 +09:00 |
|
Dean Herbert
|
325054c7f7
|
Update framework.
|
2017-02-15 01:29:51 +09:00 |
|
Dean Herbert
|
ba7b61521f
|
Merge pull request #354 from peppy/builder
Deploy automation
|
2017-02-15 01:28:05 +09:00 |
|
Dean Herbert
|
10dfe47638
|
Add spinners and improve TestCaseHitObjects.
|
2017-02-15 01:23:20 +09:00 |
|
Dean Herbert
|
8e9a5e9faa
|
Add the ability to make DrawableHitObjects non-interactive (for use in other contexts).
|
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 |
|
Thomas Müller
|
9f96a511a7
|
Merge pull request #357 from peppy/general-fixes
General fixes.
|
2017-02-14 17:22:31 +01:00 |
|
Dean Herbert
|
13ed7db361
|
Merge branch 'master' into general-fixes
|
2017-02-15 01:14:25 +09:00 |
|
Thomas Müller
|
7fa9dde24f
|
Merge pull request #355 from peppy/disable-unimplemented-options
Visually disable options which aren't yet wired up.
|
2017-02-14 17:11:01 +01:00 |
|
Damnae
|
ace7a1d009
|
Fix slider ticks expiring before scoring happens.
|
2017-02-14 16:12:35 +01:00 |
|
Jorolf
|
e717daa504
|
Line length is calculated inline
|
2017-02-14 16:05:57 +01:00 |
|
Damnae
|
9f890139d4
|
Cache drawable ticks.
|
2017-02-14 15:16:18 +01:00 |
|
Jorolf
|
1b08f6aca4
|
Line length is absolute now
|
2017-02-14 14:24:54 +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
|
ce29f0b0be
|
Add background layer to VisualTestGame.
|
2017-02-14 18:09:46 +09:00 |
|
Dean Herbert
|
311563d336
|
Merge remote-tracking branch 'upstream/master' into general-fixes
|
2017-02-14 18:06:10 +09:00 |
|
Dean Herbert
|
6fa84f3a81
|
Merge branch 'master' into disable-unimplemented-options
|
2017-02-14 08:35:40 +09:00 |
|
Dean Herbert
|
bad501c018
|
Merge branch 'master' into builder
|
2017-02-14 08:35:38 +09:00 |
|
Dean Herbert
|
3caa6ee5d2
|
Update framework.
|
2017-02-14 08:33:42 +09:00 |
|
Jorolf
|
c1ba53fa09
|
calculation is now a 'one-liner'
|
2017-02-13 16:56:15 +01:00 |
|
Dean Herbert
|
4f9d1a6c39
|
Visually disable options which aren't yet wired up.
|
2017-02-14 00:36:50 +09:00 |
|
Dean Herbert
|
3136bbeabc
|
Merge pull request #342 from Damnae/followpoints
Add follow points.
|
2017-02-13 22:28:14 +09:00 |
|
Dean Herbert
|
343e48c195
|
Merge branch 'master' into followpoints
|
2017-02-13 22:23:57 +09:00 |
|
Dean Herbert
|
5c6e895644
|
Exclude vshost executables from packages.
|
2017-02-13 21:33:48 +09:00 |
|
Dean Herbert
|
d73c48c73d
|
Only show first three segments of version (ignore revision number).
|
2017-02-13 20:23:47 +09:00 |
|
Dean Herbert
|
85e85d32fc
|
Add dev build footer.
|
2017-02-13 20:06:51 +09:00 |
|
Dean Herbert
|
f52e9ddb05
|
Fix escape key being unnecessarily handled by VersionManager.
|
2017-02-13 19:08:59 +09:00 |
|
Dean Herbert
|
bc95666736
|
Merge pull request #339 from Damnae/osb_loading
Load beatmap data from an optional osb file.
|
2017-02-13 18:40:08 +09:00 |
|
Dean Herbert
|
11643d2e09
|
Remove unnecessary methods and local variables.
|
2017-02-13 18:30:51 +09:00 |
|
Dean Herbert
|
1aeb48b920
|
Merge remote-tracking branch 'upstream/master' into osb_loading
|
2017-02-13 18:22:29 +09:00 |
|
Dean Herbert
|
9d5a984e80
|
Don't build deploy project by default.
|
2017-02-13 18:00:15 +09:00 |
|
Dean Herbert
|
df03a6cac2
|
Move deploy to tools folder.
|
2017-02-13 17:59:35 +09:00 |
|
Dean Herbert
|
c86701f1cc
|
Merge pull request #353 from Tom94/horizontal-scroll
Update framework.
|
2017-02-13 17:54:04 +09:00 |
|
Thomas Müller
|
aaaf7163e0
|
Update framework.
|
2017-02-13 17:46:50 +09:00 |
|