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
Huo Yaoyuan
9e0fbed748
Use PreLoad on music controller.
2016-11-03 22:38:10 +08:00
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
Huo Yaoyuan
3e30935d10
Allow to set database of music controller.
2016-10-27 16:58:40 +08:00
Dean Herbert
c828b1bc7b
Add comment about optional database parameter.
2016-10-27 17:53:47 +09:00
Dean Herbert
9074bc3396
Allow Player to load from BeatmapInfo.
2016-10-27 17:53:37 +09:00
Dean Herbert
a764a97602
Use memory database again, local to TestCasePlaySongSelect.
2016-10-27 17:35:00 +09:00
Dean Herbert
33ef55df88
Allow BeatmapDatabase to be constructed without a host.
2016-10-27 17:34:50 +09:00
Dean Herbert
f16cc430f8
Stop using memory database. Load sample data local to TestCase.
...
Also makes the connection private.
2016-10-27 17:08:53 +09:00
Huo Yaoyuan
6482184a09
Dispose ArchiveReader.
2016-10-27 13:34:54 +08:00
Huo Yaoyuan
fead1d4c6f
Seek by clicking and dragging on progress bar.
2016-10-27 13:34:53 +08:00
Huo Yaoyuan
d9fc04748e
Remove redundant class.
2016-10-27 13:34:52 +08:00
Huo Yaoyuan
0da78c19a2
TestCase reset.
2016-10-27 13:34:51 +08:00
Huo Yaoyuan
b671a33911
Transition fixes and clock for VisualTest.
2016-10-27 13:34:51 +08:00
Huo Yaoyuan
8e766a1f47
Show playing progress.
2016-10-27 13:34:50 +08:00
Huo Yaoyuan
1a3a5c544d
Button behavior fixes.
2016-10-27 13:34:49 +08:00
Huo Yaoyuan
a32f9eed51
Play control.
2016-10-27 13:34:48 +08:00
Huo Yaoyuan
d2495e34fb
Query from beatmap database.
2016-10-27 13:34:47 +08:00
Huo Yaoyuan
303bd41765
Background scale.
2016-10-27 13:34:46 +08:00
Huo Yaoyuan
b0d72c5f84
Button and text.
2016-10-27 13:34:45 +08:00
Huo Yaoyuan
0f2b5e8370
Layers.
2016-10-27 13:34:44 +08:00
Huo Yaoyuan
e1f6ab1a42
Create MusicController UI class and visual test.
2016-10-27 13:34:43 +08:00
Dean Herbert
debea59bab
Merge pull request #61 from SirCmpwn/song-select
...
Song select
2016-10-27 13:54:34 +09:00
Dean Herbert
456169f182
Move BeatmapGroupState to outside class definition.
2016-10-27 13:42:37 +09:00
Dean Herbert
abfad501b6
beatmapSet can be private.
2016-10-27 13:41:30 +09:00
Dean Herbert
ce73ae792f
Change panel selection logic to avoid looping.
2016-10-27 13:36:04 +09:00
Dean Herbert
ba5b2f2d73
Remove difficulty width offsets and tidy up flow of information.
2016-10-27 12:31:45 +09:00
Dean Herbert
f846505a92
Tidy namespaces.
2016-10-27 12:01:13 +09:00
Dean Herbert
104cedba19
Merge pull request #109 from peppy/volume-control-input-fix
...
Fix volume control input handling.
2016-10-27 11:45:09 +09:00
Drew DeVault
9c27c33e18
Use IStateful and improve collapse logic
2016-10-26 12:49:16 -04:00
Drew DeVault
55e5ec6fae
General cleanup per PR feedback
2016-10-26 10:52:40 -04:00
Drew DeVault
157512b45f
Merge branch 'master' into song-select
2016-10-26 10:37:18 -04:00
Dean Herbert
3f23900347
Framework & OpenTK updates.
2016-10-26 23:13:44 +09:00
Dean Herbert
ee8b678989
Fix volume controls handling mouse wheel at a higher level than anything else game-wide.
2016-10-26 18:45:48 +09:00
Drew DeVault
5e9495d21d
Fix performance issues with song select
2016-10-25 16:49:10 -04:00
Drew DeVault
063fdd9a2d
Add test data to db for VisualTests
...
Also fixes the broken IPC condition
2016-10-24 14:57:00 -04:00
Drew DeVault
a1019f91ba
Fix auto size on BeatmapSetBox difficulties
2016-10-24 11:39:53 -04:00
Drew DeVault
b0898a3ce0
Fix sizing of setList flow container
2016-10-24 11:39:53 -04:00
Drew DeVault
86bbe8688b
Fix issues with invisible beatmaps
2016-10-24 11:39:53 -04:00
Drew DeVault
ff1a5187cd
Implement fixes related to auto size changes
2016-10-24 11:39:53 -04:00
Drew DeVault
e5168f8da8
Implement handoff to Player
2016-10-24 11:39:53 -04:00
Drew DeVault
cfc920c9c1
Implement Play button, drop textures
2016-10-24 11:39:53 -04:00
Dean Herbert
d3a857edb9
Make importing work properly.
...
Moves import code to BeatmapDatabase.
2016-10-24 11:39:53 -04:00
Dean Herbert
0c9e26e546
Return the populated item when calling GetChildren to write more elegant code.
2016-10-24 11:39:18 -04:00
Dean Herbert
6f80efdb29
Add a database reset method.
2016-10-24 11:39:18 -04:00
Dean Herbert
7650bb1707
Don't insert to database until we're completely finished importing a beatmap.
2016-10-24 11:39:18 -04:00
Dean Herbert
ee6c810df5
Fix cascading inserts.
2016-10-24 11:39:18 -04:00
Drew DeVault
42f8d19c73
Sort by difficulty and fix relationship
2016-10-24 11:39:18 -04:00
Drew DeVault
8d6431b35e
Add star counter to difficulty select
2016-10-24 11:39:18 -04:00
Drew DeVault
910a079bda
Add animation, selection indicator to difficulties
2016-10-24 11:39:18 -04:00
Drew DeVault
4b6a1486a6
Increase spacing to match mockups
2016-10-24 11:39:18 -04:00
Drew DeVault
61a7ccaece
Remove dependency on DeferredSprite
2016-10-24 11:39:18 -04:00
Drew DeVault
33fc60716d
Fix assertion failures
2016-10-24 11:39:18 -04:00
Drew DeVault
cfa637b763
Select first difficulty by default
2016-10-24 11:39:18 -04:00
Drew DeVault
51791bba7f
Tweak play button
2016-10-24 11:39:18 -04:00
Drew DeVault
4dcdc8638e
Add beatmap difficulty selection logic
2016-10-24 11:39:18 -04:00
Drew DeVault
941687e091
Add glow to beatmap groups
2016-10-24 11:39:18 -04:00
Drew DeVault
bc959f74a5
Add background textures to beatmap sets
...
Needs osu-framework#189
2016-10-24 11:39:18 -04:00
Drew DeVault
6da092ab30
Fix additional bugs, tweak L+F
2016-10-24 11:39:18 -04:00
Drew DeVault
8d4a211419
Fix initialization of BeatmapInfo
2016-10-24 11:39:18 -04:00
Drew DeVault
3ee0bf2b80
Fix cascade insert
2016-10-24 11:39:18 -04:00
Drew DeVault
641855c790
Fix issues with beatmap import file contention
2016-10-24 11:39:18 -04:00
Drew DeVault
c41b3d92c6
Fix up wrt upstream development
2016-10-24 11:39:18 -04:00
Drew DeVault
8e31965fb4
Refactor beatmap import secondary process
...
Doesn't launch a new game window and now supports several files at once.
2016-10-24 11:39:18 -04:00
Drew DeVault
9426629853
Don't crash if you leave and return to song select
...
During visual tests
2016-10-24 11:39:18 -04:00
Dean Herbert
9a66d766e9
Don't bail on no beatmaps in database.
2016-10-24 11:39:18 -04:00
Drew DeVault
9b88798274
Fix up padding on song select
...
@peppy btw scrolling beyond the ends of the ScrollContainer behaves
weirdly for this container
2016-10-24 11:39:18 -04:00
Drew DeVault
05d803483f
Fix width of beatmaps
2016-10-24 11:39:18 -04:00
Drew DeVault
07e44560be
Use beatmap author in listing
2016-10-24 11:39:18 -04:00
Drew DeVault
7a22c60c7c
Get some more of the design's layout in place
2016-10-24 11:39:18 -04:00
Drew DeVault
e13374ed23
Tweak layout of beatmap groups
2016-10-24 11:39:18 -04:00
Drew DeVault
3d53af155f
Add background to song select
2016-10-24 11:39:18 -04:00
Drew DeVault
71f58285fc
Add selection interactions
2016-10-24 11:39:18 -04:00
Drew DeVault
bc6e705e2b
Add test case for song selection
2016-10-24 11:39:18 -04:00
Drew DeVault
d21b7f0050
Fix up song select based on upstream changes
2016-10-24 11:39:18 -04:00
Drew DeVault
22fdb3e49a
Adjust PlaySongSelect to match UI standards
2016-10-24 11:39:11 -04:00
Drew DeVault
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
Drew DeVault
a14edc06c8
Pull beatmap list from db and render simple list
2016-10-24 11:39:11 -04:00
Dean Herbert
1ce16afa23
Update nuget package versions.
2016-10-24 22:46:44 +09:00
Dean Herbert
bd1a1644fd
Fix window size saving to config incorrectly.
2016-10-23 01:35:11 +09:00
Dean Herbert
e4c74f9c77
Merge remote-tracking branch 'upstream/master' into general-fixes
2016-10-22 23:54:12 +09:00
Dean Herbert
baf68ba593
Merge pull request #99 from Tom94/general-improvements
...
Fix secondary volume meters showing an incorrect volume until changed.
2016-10-22 23:51:14 +09:00
Thomas Müller
7ced6046d7
Fix secondary volume meters showing an incorrect volume until changed.
2016-10-22 14:33:43 +02:00
Dean Herbert
3ce93608fb
Fix one remaining FlowContainer.
2016-10-22 19:37:27 +09:00
Dean Herbert
808d5c75fb
Fix unused field warning.
2016-10-22 19:08:40 +09:00
Dean Herbert
9021042d93
Fix CircularContainer usage.
2016-10-22 18:40:04 +09:00
Dean Herbert
28a41dcca6
Fix FlowContainers.
2016-10-22 18:05:46 +09:00
Dean Herbert
cdef75c98b
Fix AutoSize references.
2016-10-22 17:50:42 +09:00
Dean Herbert
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
Dean Herbert
e78e0d37b4
Make playfield dark, not light. No masking either.
2016-10-19 18:15:49 +09:00
Dean Herbert
a1d961dc87
Make the Player class more friendly and add a test case.
2016-10-19 18:00:35 +09:00
Dean Herbert
94968a8b7c
Add initial implementation of osu! HitCircle.
2016-10-19 16:19:01 +09:00
Dean Herbert
ee463dc65c
Merge pull request #77 from NeoAdonis/counters-a
...
Rolling counters
2016-10-19 15:06:00 +09:00