Huo Yaoyuan
|
f2a8cc0c29
|
Merge branch 'master'
|
2016-11-03 20:38:34 +08: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
|
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
|
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 |
|
Adonais Romero González
|
fd0900eb3c
|
I knew I forgot something >:(
|
2016-10-29 18:42:40 -05:00 |
|
Adonais Romero González
|
ef9d2b5b3c
|
Minor improvements to combo counters
|
2016-10-29 18:26:12 -05:00 |
|
Dean Herbert
|
d8ca11bf0d
|
Use Any instead of First to avoid potential throw.
|
2016-10-29 04:29:43 +09:00 |
|
Dean Herbert
|
a2f995ebe0
|
Remove forgotten parens.
|
2016-10-29 03:44:27 +09:00 |
|
Dean Herbert
|
d47924ff7b
|
Fix selection not collapsing when clicking set headers exclusively.
|
2016-10-29 03:43:52 +09:00 |
|
Dean Herbert
|
c969e0b4f0
|
Remove forced disposal of WorkingBeatmap.
|
2016-10-29 03:31:40 +09:00 |
|
Dean Herbert
|
eb30882b09
|
More comments.
|
2016-10-28 23:40:12 +09:00 |
|
Dean Herbert
|
f0e4a252a5
|
Add some warning comments.
|
2016-10-28 23:35:49 +09:00 |
|
Dean Herbert
|
42ad96778e
|
Tidy shit up; reduce number of unnecssesary events being fired.
|
2016-10-28 23:29:21 +09:00 |
|
Huo Yaoyuan
|
f1837b4822
|
Fix changed event and no longer auto play on load.
|
2016-10-28 21:57:23 +08:00 |
|
Huo Yaoyuan
|
7543d491ae
|
Add music controller into game.
|
2016-10-28 21:21:47 +08:00 |
|
Huo Yaoyuan
|
6aba03e1ca
|
OsuGameMode<-WorkingBeatMap->OsuGameBase.
|
2016-10-28 21:03:59 +08:00 |
|
Huo Yaoyuan
|
3858c77817
|
No longer holds OsuGame reference.
|
2016-10-28 20:47:27 +08:00 |
|
Huo Yaoyuan
|
9b76110605
|
Interaction with external changes.
|
2016-10-28 20:44:59 +08:00 |
|
Huo Yaoyuan
|
36cefcb956
|
Fix to work individually.
|
2016-10-28 20:34:22 +08:00 |
|
Huo Yaoyuan
|
aa107de162
|
Store a local copy of WorkingBeatmap.
|
2016-10-28 20:27:44 +08:00 |
|
Dean Herbert
|
5dc495e41d
|
Avoid accessing the beatmap too early.
|
2016-10-28 21:08:32 +09:00 |
|
Huo Yaoyuan
|
7d14e6e6cf
|
Make prev and next work again.
|
2016-10-28 20:08:27 +08:00 |
|
Huo Yaoyuan
|
b7ada4866e
|
Merge remote-tracking branch 'peppy/lets-play' into music-controller
|
2016-10-28 19:47:35 +08:00 |
|
Huo Yaoyuan
|
7d6e4a8ad2
|
Make music controller uses WorkingBeatmap.
|
2016-10-28 19:39:02 +08:00 |
|
Dean Herbert
|
10ef34b805
|
Lazy parse beatmap; Don't reload audio track if it hasn't changed.
|
2016-10-28 20:24:14 +09:00 |
|
Huo Yaoyuan
|
7e2350cb13
|
Merge remote-tracking branch 'refs/remotes/peppy/lets-play'
|
2016-10-28 19:07:29 +08:00 |
|
Dean Herbert
|
74f1a9622f
|
Add initial game-wide beatmap flow.
|
2016-10-28 19:55:48 +09:00 |
|
Dean Herbert
|
0f5614ffa2
|
Only allow osu! mode maps to be played for now.
|
2016-10-28 18:07:42 +09:00 |
|
Dean Herbert
|
209f09df91
|
Don't exception on inability to read audio track.
|
2016-10-28 18:03:26 +09:00 |
|
Dean Herbert
|
13b5fb0578
|
Update transforms to not accept clock.
|
2016-10-28 17:42:00 +09:00 |
|
Dean Herbert
|
0e39c5cc9c
|
Move Results to own namespace.
|
2016-10-28 16:10:10 +09:00 |
|
Dean Herbert
|
856e056515
|
Remove unnecessary finaliser.
|
2016-10-28 14:18:00 +09:00 |
|
Dean Herbert
|
feccb7286c
|
Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect.
|
2016-10-28 14:14:45 +09:00 |
|
Dean Herbert
|
2cdda98b47
|
Add the ability to retrieve (fallback) metadata from a beatmap.
|
2016-10-28 14:13:52 +09:00 |
|
Dean Herbert
|
012c29addb
|
Minor fixes to player flow.
|
2016-10-27 22:27:45 +09:00 |
|
Huo Yaoyuan
|
eab8caaa0c
|
Ensure track is playing after seek.
|
2016-10-27 19:51:38 +08:00 |
|
Dean Herbert
|
d6ed055682
|
Don't hard-crash on failing to load a beatmap.
|
2016-10-27 20:37:01 +09:00 |
|
Dean Herbert
|
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 |
|
Huo Yaoyuan
|
73d1eeb272
|
Update MusicController using DragBar.
|
2016-10-27 18:15:43 +08:00 |
|
Huo Yaoyuan
|
35b1d0ae50
|
Seperated DragBar class.
|
2016-10-27 18:14:50 +08:00 |
|
Huo Yaoyuan
|
9c2d3990ce
|
Add spacing in code.
|
2016-10-27 17:04:41 +08:00 |
|