Commit Graph

83 Commits

Author SHA1 Message Date
e69dac7745 Fix lock object. 2016-11-05 20:21:08 +08:00
f2b37e1fe7 Add lock on each property of WorkingBeatmap. 2016-11-05 20:01:46 +08:00
a11d534067 Add beatmap backgrounds. 2016-11-05 20:00:14 +09:00
7cc19d74c6 Add full Exo font set and bring song select panels closer to final design. 2016-11-05 18:22:09 +09:00
8fe63689a4 Fix thread safety issue when accessing files in beatmap (zip) files. 2016-11-05 18:19:01 +09:00
2ee5e2efb7 Bring framework up-to-date.
# Conflicts:
#	osu-framework
2016-11-05 18:18:52 +09:00
bc53642cab Fix some warnings. 2016-11-04 15:40:05 +09:00
439204b4fa Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow 2016-11-03 16:44:49 +09:00
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
617a3f5c4f Adjust glow colour slightly. 2016-11-02 10:22:46 +09:00
50de8528a5 Use better glow in beatmap selection. 2016-11-01 22:57:11 +01:00
128ec8f767 Fix beatmap panel border alpha being way too large. 2016-11-01 22:21:09 +01:00
b86f308af6 Add async workflow. 2016-11-01 23:24:14 +09:00
d47924ff7b Fix selection not collapsing when clicking set headers exclusively. 2016-10-29 03:43:52 +09:00
eb30882b09 More comments. 2016-10-28 23:40:12 +09:00
42ad96778e Tidy shit up; reduce number of unnecssesary events being fired. 2016-10-28 23:29:21 +09:00
5dc495e41d Avoid accessing the beatmap too early. 2016-10-28 21:08:32 +09:00
10ef34b805 Lazy parse beatmap; Don't reload audio track if it hasn't changed. 2016-10-28 20:24:14 +09:00
74f1a9622f Add initial game-wide beatmap flow. 2016-10-28 19:55:48 +09:00
209f09df91 Don't exception on inability to read audio track. 2016-10-28 18:03:26 +09:00
13b5fb0578 Update transforms to not accept clock. 2016-10-28 17:42:00 +09:00
856e056515 Remove unnecessary finaliser. 2016-10-28 14:18:00 +09:00
feccb7286c Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect. 2016-10-28 14:14:45 +09:00
2cdda98b47 Add the ability to retrieve (fallback) metadata from a beatmap. 2016-10-28 14:13:52 +09:00
d9dfc324c1 Rewrite a lot of Song Select to share logic between panels and consolidate logic inside classes where possible. 2016-10-27 19:52:48 +09:00
456169f182 Move BeatmapGroupState to outside class definition. 2016-10-27 13:42:37 +09:00
abfad501b6 beatmapSet can be private. 2016-10-27 13:41:30 +09:00
ce73ae792f Change panel selection logic to avoid looping. 2016-10-27 13:36:04 +09:00
ba5b2f2d73 Remove difficulty width offsets and tidy up flow of information. 2016-10-27 12:31:45 +09:00
f846505a92 Tidy namespaces. 2016-10-27 12:01:13 +09:00
55e5ec6fae General cleanup per PR feedback 2016-10-26 10:52:40 -04:00
bc959f74a5 Add background textures to beatmap sets
Needs osu-framework#189
2016-10-24 11:39:18 -04:00
8d4a211419 Fix initialization of BeatmapInfo 2016-10-24 11:39:18 -04:00
641855c790 Fix issues with beatmap import file contention 2016-10-24 11:39:18 -04:00
d21b7f0050 Fix up song select based on upstream changes 2016-10-24 11:39:18 -04:00
674f624bfc Improve song selection layout, database loading
Also adds event that notifes the song select when a beatmap is added.
2016-10-24 11:39:11 -04:00
a14edc06c8 Pull beatmap list from db and render simple list 2016-10-24 11:39:11 -04:00
808d5c75fb Fix unused field warning. 2016-10-22 19:08:40 +09:00
43f0409893 Start to structure flow of information in Player.
- Allow basic clicking of hitobjects.
- Break non-osu! game modes temporarily.
- Fix some issues with RollingCounters.
- Add the ability to increment counters.
2016-10-19 19:44:03 +09:00
94968a8b7c Add initial implementation of osu! HitCircle. 2016-10-19 16:19:01 +09:00
7bdf1fe1bf Drop BeatmapSet, only BeatmapSetInfo is necessary 2016-10-18 15:48:24 -04:00
105bba6178 Rework duplicate detection in AddBeatmap 2016-10-18 15:41:46 -04:00
449f04c07b Refactor the database code 2016-10-18 13:38:27 -04:00
123d92f5b9 Merge pull request #71 from huoyaoyuan/tidy-up
Strongly type specifications
2016-10-14 18:57:42 +09:00
fedfb8a22a Converted all .cs files to use CRLF line endings. 2016-10-13 23:33:58 -04:00
25d08c8e2c Improve beatmap loading and hydration 2016-10-13 10:29:30 -04:00
fd10e6e582 Copy imported beatmaps into beatmap storage 2016-10-13 10:15:08 -04:00
80d5fa7243 Specify HitObjectConvertException. 2016-10-13 20:53:42 +08:00
fde3ab420a Merge branch 'master'
Conflicts:
	osu.Game/osu.Game.csproj
2016-10-13 12:23:36 +09:00
edd8f3871e Add TODO regarding parsing. 2016-10-13 12:19:20 +09:00