22656233d3
Merge branch 'master' into fix-playlist-audio-issue
2017-12-04 19:24:03 +09:00
58777a9674
Merge pull request #1636 from smoogipoo/editor-composer
...
Implement structure for Editor HitObject composition
2017-12-04 13:05:27 +09:00
d75db5046b
Merge branch 'master' into editor-composer
2017-12-04 12:41:40 +09:00
23c0bec678
Merge pull request #1653 from smoogipoo/osuscreen-exit
...
Add OnKeyDown override to OsuScreen
2017-12-04 11:51:36 +09:00
7cfe694a3f
Update framework
2017-12-04 11:37:19 +09:00
5f9de399e4
Add keydown override
2017-12-04 11:30:25 +09:00
14096c90cc
removed looping if only one song is in the list (temporarily)
...
It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
2017-12-03 16:41:21 +01:00
9d13bf3602
remove redundant expression
2017-12-03 14:35:23 +01:00
dfa7448716
use ?: expression
2017-12-03 14:25:12 +01:00
0c9ebcd58c
fix possible NullRef
2017-12-03 14:15:08 +01:00
a1dbd7916b
fixes MusicController constantly trying to start a track
...
In Detail:
It tried to start a track if the current one ended even if no BeatmapSets were present.
Also if only one BeatmapSet is present if will loop by itself now.
2017-12-03 14:03:43 +01:00
7957e55710
Merge branch 'master' into editor-composer
2017-12-03 14:47:07 +09:00
5a6f59bed0
Merge pull request #1640 from peppy/catch-hyperdash
...
osu!catch hyperdash
2017-12-03 14:38:22 +09:00
ad8cd7eb5d
fix possible NullReference?
...
AppVeyor pls?
2017-12-02 17:04:42 +01:00
cc76c58f5f
fall back to .osu file for storyboard if no .osb file is present
...
+ CI fixes
2017-12-02 16:05:39 +01:00
2bbfe0dda1
expanded BeatmapDecoder tests, added StoryboardDecoder tests
2017-12-02 15:28:00 +01:00
2852337b04
Remove unused using
2017-12-02 20:35:47 +09:00
cd20d6df16
Apply suggested changes
2017-12-02 20:31:15 +09:00
c14d68e685
Use OsuColour for radio buttons
2017-12-02 20:30:18 +09:00
a80059032c
Remove PlayfieldOverlay
2017-12-02 20:24:10 +09:00
66f3cc747d
Merge branch 'master' into catch-hyperdash
2017-12-02 20:18:21 +09:00
5a7c4772bd
Remove PlayfieldUnderlay for now
2017-12-02 19:53:20 +09:00
e07b85311b
removed unnecessary using
2017-12-01 22:15:10 +01:00
c466296b14
reverted split at Decoder, moved logic down
...
I'm done experimenting, sorry
- `Decoder` only returns a "Beatmap"`Decoder` now
- "Storyboard"`Decoder` is retrieved from a "Beatmap"`Decoder`
- moved parse methods down in the hierarchy where I forgot to do that
- renamed `OsuLegacyDecoderTest` to `LegacyDecoderTest`
2017-12-01 22:05:01 +01:00
a49f3479a2
Split retrieving of beatmap and storyboard decoder
...
Storyboard works again. Not satisfied with the solution though.
2017-12-01 19:11:52 +01:00
6faa0f62b3
Merge pull request #1643 from gtensha/master
...
Fix filename casing to compile on Linux
2017-12-02 02:21:49 +09:00
de94082b1e
Fix filename casing to compile on Linux
2017-12-01 18:10:39 +01:00
db50ad794e
CI adjustments
...
- removing unnecessary `using`s
- name Fields/Methods according to rules
- removing unnecessary initializations
2017-12-01 17:58:11 +01:00
806c0e3b26
restructured OsuLegacyDecoder into LegacyDecoder
...
Beatmap works, Storyboard not...
2017-12-01 17:43:33 +01:00
f547b3bde5
Merge pull request #1630 from Aergwyn/fix-set-hidden-crash
...
Fix crash when all beatmaps in a set are hidden
2017-12-01 23:48:30 +09:00
70b29b8b62
Merge branch 'master' into fix-set-hidden-crash
2017-12-01 23:35:48 +09:00
33572a7326
Merge pull request #1633 from peppy/fix-track-disposal
...
Fix DisposeTrack not working as expected
2017-12-01 23:35:28 +09:00
ee75f90ab3
Update framework
2017-12-01 23:17:54 +09:00
7532795935
Lock during validity checks
2017-12-01 22:43:49 +09:00
87b6181a19
Merge remote-tracking branch 'upstream/master' into fix-track-disposal
2017-12-01 22:36:20 +09:00
8c3ae9430b
Add difficulty scaling considerations to hyperdash initialisation
2017-12-01 20:39:58 +09:00
997cdfaee4
Add missing licence header
2017-12-01 20:31:54 +09:00
912d5edcf6
Merge branch 'master' into catch-hyperdash
2017-12-01 20:16:37 +09:00
79e1bf3394
Remove unused testcase
2017-12-01 20:14:42 +09:00
e75d73ac1c
Change hyperdash colour again
2017-12-01 20:13:46 +09:00
bf606522c1
Make hyperdash testcase easier to win again
2017-12-01 20:13:32 +09:00
273793f185
Add comments
2017-12-01 20:08:49 +09:00
25207c51b5
Add directionality
2017-12-01 20:07:28 +09:00
445bb70ef5
Add hyperdash visual testing to TestCaseCatcherArea
...
Also tidies up hyperdash state logic
2017-12-01 19:58:00 +09:00
07081f400c
Make hyperdash testcase easier to win
2017-12-01 19:33:20 +09:00
51cae24a26
Add basic hyperdash movement
...
Doesn't restrict direction yet. Also improves readability of fruit catch detection.
2017-12-01 19:33:13 +09:00
442b234a86
Merge pull request #1631 from smoogipoo/csharp-7
...
Migrate to C# 7
2017-12-01 18:47:37 +09:00
5be00cb0ec
Add todo
2017-12-01 18:40:55 +09:00
0b95e36675
Fix RelativeChildSize error temporarily
2017-12-01 18:00:20 +09:00
881745d756
Initial implementation of hyperdash calculation
2017-12-01 17:59:36 +09:00
