RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
616 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

616 Commits

Author SHA1 Message Date
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
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
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 bc53642cab Fix some warnings. 2016-11-04 15:40:05 +09:00
Dean Herbert 71045169f6 Merge pull request #123 from SirCmpwn/options 
Options part one
 2016-11-04 12:42:36 +09:00
Dean Herbert 10e5472624 Block mouse events from hitting things behind options. 2016-11-04 12:29:05 +09:00
Dean Herbert 2135b93791 Make options semi-transparent. 2016-11-04 12:28:00 +09:00
Dean Herbert f3d461e318 Fix some events not firing correctly. 2016-11-04 12:27:43 +09:00
Drew DeVault a586e5a5ba Update submodules 2016-11-03 23:08:02 -04:00
Drew DeVault 408173319b Refactor options header and layout stuff 2016-11-03 23:01:11 -04:00
Drew DeVault cb40b7079f Rework how references are passed about 2016-11-03 22:43:00 -04:00
Drew DeVault 55821a1a2b Fix OpenTK reference in osu.Desktop.VisualTests 2016-11-03 19:06:22 -04:00
Drew DeVault af8e4415c3 Split out [Sub]sections into seperate files 2016-11-03 19:06:22 -04:00
Drew DeVault 1d8c6db0a7 Add remaining options 2016-11-03 19:06:22 -04:00
Drew DeVault c7fa0a5ab0 Add more options 2016-11-03 19:06:22 -04:00
Drew DeVault 7e77efcfdc Add Graphics options 2016-11-03 19:06:22 -04:00
Drew DeVault 6c0cef894e Add OsuButton with sane defaults 2016-11-03 19:06:22 -04:00
Drew DeVault 2aa85a4b18 Split up options into subclasses 2016-11-03 19:06:22 -04:00
Drew DeVault 2f990b884e Tweak style to more closely match osu!next 2016-11-03 19:06:22 -04:00
Drew DeVault 40e667b2d8 Add default values from old osu 2016-11-03 19:06:22 -04:00
Drew DeVault 89d3f4c2be Import enum from old osu 2016-11-03 19:06:22 -04:00
Drew DeVault dd0cb5da01 Add options from old osu 2016-11-03 19:06:22 -04:00
Drew DeVault 9f78f8607b Implement General options section 2016-11-03 19:06:22 -04:00
Drew DeVault 2aaff01675 Implement config persistence through BasicStorage 2016-11-03 19:06:22 -04:00
Dean Herbert 6f16a6a6d4 Merge pull request #119 from peppy/async-workflow 
Async Workflow
 2016-11-03 17:08:00 +09:00
Dean Herbert 7a54fdfffb Fix ImportBeatmapTest. 2016-11-03 16:59:16 +09:00
Dean Herbert 439204b4fa Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow 2016-11-03 16:44:49 +09:00
Dean Herbert 046d51e39e Update framework. 2016-11-03 16:41:54 +09:00
Dean Herbert 5c93ab3ecc Merge pull request #121 from Tom94/better-glow 
Use better glow in beatmap selection.
 2016-11-02 16:49:32 +09:00
Dean Herbert 14ff355b18 Update framework. 2016-11-02 16:47:24 +09:00
Dean Herbert 54dbb0a355 Merge remote-tracking branch 'refs/remotes/upstream/master' into better-glow 
# Conflicts:
#	osu.Game/Beatmaps/Drawable/Panel.cs
 2016-11-02 16:43:35 +09:00
Dean Herbert 617a3f5c4f Adjust glow colour slightly. 2016-11-02 10:22:46 +09:00
Dean Herbert 2811d55e13 Merge pull request #120 from Tom94/fix-beatmap-panel-border-alpha 
Fix beatmap panel border alpha being way too large.
 2016-11-02 09:57:32 +09:00
Thomas Müller 50de8528a5 Use better glow in beatmap selection. 2016-11-01 22:57:11 +01:00
Thomas Müller 128ec8f767 Fix beatmap panel border alpha being way too large. 2016-11-01 22:21:09 +01:00
Dean Herbert b38f994ff4 Merge pull request #118 from SirCmpwn/fade-song-select-bg 
Fade song select wedges in
 2016-11-02 01:10:28 +09:00
Dean Herbert 3d611dd57b Improve coodination of startup sequence. 2016-11-02 01:02:48 +09:00
Dean Herbert c78e3efc66 Schedule some illegal calls. 2016-11-02 01:02:34 +09:00
Dean Herbert 774b47c1fe Don't cache drawable for no reason. 2016-11-02 00:53:13 +09:00
Drew DeVault 0edfeaaff9 Move wedgeContainer transition to OnEntering 2016-11-01 09:22:49 -06:00
Dean Herbert b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
Drew DeVault e5f948dccc Fade song select wedges in 2016-10-31 16:16:11 -06:00