Maciej
110ea32b2a
Restore play button's visibility after a check
2016-11-07 18:20:46 +01:00
Maciej
39c0d89cdf
Cleanup
2016-11-07 04:20:17 +01:00
Maciej
384bb32a81
Add a check for beatmap background file existence
2016-11-07 03:54:39 +01:00
Maciej
0d3c032d21
Code fixes and Background Implementation
2016-11-07 03:11:47 +01:00
Maciej
e33ca05b6c
Merge remote-tracking branch 'refs/remotes/ppy/master' into playsongselect-design
2016-11-06 20:33:11 +01:00
Dean Herbert
6ce9491f00
Merge pull request #142 from Tom94/smooth-wedged-buttons
...
Smoothen wedged buttons in main menu and the wedges on song select ba…
2016-11-07 04:03:18 +09:00
Thomas Müller
fa8d668cb6
Update framework.
2016-11-06 19:59:30 +01:00
Thomas Müller
90c889a7ce
Smoothen wedged buttons in main menu and the wedges on song select background.
2016-11-06 19:34:44 +01:00
Dean Herbert
7989090f51
Merge pull request #140 from Tom94/better-clocks
...
Better clocks
2016-11-07 02:57:12 +09:00
Thomas Müller
108d32b6d8
Update framework.
2016-11-06 18:50:21 +01:00
Maciej
e2999a0a53
PlaySongSelect tweaks
...
Add a back button, dispose the play button when no beatmaps present,
display track as background, change wedge padding so it wont overlap
with toolbars
2016-11-06 11:20:08 +01:00
Thomas Müller
103176826f
Ensure transformations are never used prior to being added to the Drawable tree.
2016-11-06 11:13:52 +01:00
Thomas Müller
32ee20b843
Merge branch 'master' of github.com:ppy/osu into better-clocks
...
# Conflicts:
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
2016-11-06 10:08:24 +01:00
Thomas Müller
5f2bf165a2
Remove now obsolete clock usages.
2016-11-06 10:06:09 +01:00
Thomas Müller
8894e5f73a
Fade the options overlay to prevent unnecessary updates to its content.
2016-11-06 08:54:36 +01:00
Maciej
b0279c05e6
Merge remote-tracking branch 'refs/remotes/ppy/master'
2016-11-06 08:42:37 +01:00
Thomas Müller
a6c0fd29f2
Make use of new timing system in Drawables and Transforms.
2016-11-06 08:25:21 +01:00
Dean Herbert
49d170339b
Merge pull request #138 from grafitter/general-fixes
...
Working beatmap background scaling fix
2016-11-06 14:41:28 +09:00
Maciej
bcc1d7c669
Background scaling different approach
2016-11-06 04:37:41 +01:00
Maciej
c4132339a6
Working beatmap background scaling fix
...
Add a check for the working beatmap background width and assign a proper
scaling value to cover the whole box
2016-11-06 04:12:35 +01:00
Dean Herbert
3c8f94dd0f
Merge pull request #136 from Tom94/general-fixes
...
Fix wrong initial state of beatmap panels.
2016-11-05 23:04:37 +09:00
Thomas Müller
945856b559
Merge pull request #133 from peppy/hitcircle-revision-2
...
Hitcircles v2
2016-11-05 14:50:35 +01:00
Dean Herbert
cc140c9634
Fix broken tests.
2016-11-05 22:48:32 +09:00
Thomas Müller
7c7e2160ec
Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
2016-11-05 14:05:42 +01:00
Thomas Müller
619d97c642
Fix indentation and typo.
2016-11-05 13:51:52 +01:00
Dean Herbert
a859a90b56
Merge pull request #135 from huoyaoyuan/thread-safety
...
Add lock on each property of WorkingBeatmap.
2016-11-05 21:35:30 +09:00
Thomas Müller
07e74068e7
Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
2016-11-05 13:35:15 +01:00
Huo Yaoyuan
e69dac7745
Fix lock object.
2016-11-05 20:21:08 +08:00
Huo Yaoyuan
f2b37e1fe7
Add lock on each property of WorkingBeatmap.
2016-11-05 20:01:46 +08:00
Thomas Müller
ba39a9df8e
Fix wrong initial state of beatmap panels.
2016-11-05 12:24:15 +01:00
Dean Herbert
223a9c6282
Merge pull request #134 from peppy/beatmap-backgrounds
...
Add beatmap backgrounds to song select.
2016-11-05 20:12:39 +09:00
Dean Herbert
76e6931a59
Update framework.
2016-11-05 20:06:04 +09:00
Dean Herbert
a11d534067
Add beatmap backgrounds.
2016-11-05 20:00:14 +09:00
Dean Herbert
060081fecc
Merge pull request #128 from peppy/more-fonts
...
Add full Exo font set.
2016-11-05 18:34:05 +09:00
Dean Herbert
7cc19d74c6
Add full Exo font set and bring song select panels closer to final design.
2016-11-05 18:22:09 +09:00
Dean Herbert
627cd12a9e
Merge pull request #132 from peppy/general-fixes
...
General fixes & framework update.
2016-11-05 18:20:45 +09:00
Dean Herbert
8fe63689a4
Fix thread safety issue when accessing files in beatmap (zip) files.
2016-11-05 18:19:01 +09:00
Dean Herbert
2ee5e2efb7
Bring framework up-to-date.
...
# Conflicts:
# osu-framework
2016-11-05 18:18:52 +09:00
Dean Herbert
10f2ed4387
Add explicit privates.
2016-11-04 16:12:35 +09:00
Dean Herbert
b17d219ace
Share Triangles logic.
2016-11-04 16:11:22 +09:00
Dean Herbert
108b7092c9
Fix regression in hitcircle appearance.
2016-11-04 16:08:04 +09:00
Dean Herbert
9df43c6d33
Fix draw order of hitobjects.
2016-11-04 15:43:53 +09:00
Dean Herbert
da18e2d4f6
Fix off-by-one colour retrieval.
2016-11-04 15:43:53 +09:00
Dean Herbert
b72e9221fd
Only add valid hitobjects.
2016-11-04 15:43:53 +09:00
Dean Herbert
74c655ebfc
Fix input not working.
2016-11-04 15:43:53 +09:00
Dean Herbert
b40ccccbe4
Add HitObject colours back in the mix.
2016-11-04 15:43:53 +09:00
Dean Herbert
92b85b251e
Fix scale more.
2016-11-04 15:43:53 +09:00
Dean Herbert
e939746159
Fix scale ratio of gamefield.
2016-11-04 15:43:53 +09:00
Dean Herbert
788cba6f4d
Add autoplay toggle (const).
2016-11-04 15:43:53 +09:00
Dean Herbert
f5f5aa9eac
Fix some incorrect default values.
2016-11-04 15:43:53 +09:00