1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 16:57:25 +08:00
Commit Graph

9082 Commits

Author SHA1 Message Date
smoogipoo
5f9de399e4 Add keydown override 2017-12-04 11:30:25 +09:00
Aergwyn
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
Aergwyn
9d13bf3602 remove redundant expression 2017-12-03 14:35:23 +01:00
Aergwyn
dfa7448716 use ?: expression 2017-12-03 14:25:12 +01:00
Aergwyn
0c9ebcd58c fix possible NullRef 2017-12-03 14:15:08 +01:00
Aergwyn
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
Dean Herbert
7957e55710
Merge branch 'master' into editor-composer 2017-12-03 14:47:07 +09:00
Dean Herbert
5a6f59bed0
Merge pull request #1640 from peppy/catch-hyperdash
osu!catch hyperdash
2017-12-03 14:38:22 +09:00
Aergwyn
ad8cd7eb5d fix possible NullReference?
AppVeyor pls?
2017-12-02 17:04:42 +01:00
Aergwyn
cc76c58f5f fall back to .osu file for storyboard if no .osb file is present
+ CI fixes
2017-12-02 16:05:39 +01:00
Aergwyn
2bbfe0dda1 expanded BeatmapDecoder tests, added StoryboardDecoder tests 2017-12-02 15:28:00 +01:00
smoogipoo
2852337b04 Remove unused using 2017-12-02 20:35:47 +09:00
smoogipoo
cd20d6df16 Apply suggested changes 2017-12-02 20:31:15 +09:00
smoogipoo
c14d68e685 Use OsuColour for radio buttons 2017-12-02 20:30:18 +09:00
smoogipoo
a80059032c Remove PlayfieldOverlay 2017-12-02 20:24:10 +09:00
Dan Balasescu
66f3cc747d
Merge branch 'master' into catch-hyperdash 2017-12-02 20:18:21 +09:00
smoogipoo
5a7c4772bd Remove PlayfieldUnderlay for now 2017-12-02 19:53:20 +09:00
Aergwyn
e07b85311b removed unnecessary using 2017-12-01 22:15:10 +01:00
Aergwyn
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
Aergwyn
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
Dean Herbert
6faa0f62b3
Merge pull request #1643 from gtensha/master
Fix filename casing to compile on Linux
2017-12-02 02:21:49 +09:00
gtensha
de94082b1e Fix filename casing to compile on Linux 2017-12-01 18:10:39 +01:00
Aergwyn
db50ad794e CI adjustments
- removing unnecessary `using`s
- name Fields/Methods according to rules
- removing unnecessary initializations
2017-12-01 17:58:11 +01:00
Aergwyn
806c0e3b26 restructured OsuLegacyDecoder into LegacyDecoder
Beatmap works, Storyboard not...
2017-12-01 17:43:33 +01:00
smoogipoo
cf859a6cf2 Make the dragger attach to objects it surrounds
Plus a lot more implementation.
2017-12-02 00:26:02 +09:00
Dean Herbert
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
Dean Herbert
70b29b8b62
Merge branch 'master' into fix-set-hidden-crash 2017-12-01 23:35:48 +09:00
Dean Herbert
33572a7326
Merge pull request #1633 from peppy/fix-track-disposal
Fix DisposeTrack not working as expected
2017-12-01 23:35:28 +09:00
Dean Herbert
ee75f90ab3 Update framework 2017-12-01 23:17:54 +09:00
Dean Herbert
7532795935 Lock during validity checks 2017-12-01 22:43:49 +09:00
Dean Herbert
87b6181a19 Merge remote-tracking branch 'upstream/master' into fix-track-disposal 2017-12-01 22:36:20 +09:00
Dean Herbert
8c3ae9430b Add difficulty scaling considerations to hyperdash initialisation 2017-12-01 20:39:58 +09:00
Dean Herbert
997cdfaee4 Add missing licence header 2017-12-01 20:31:54 +09:00
Dean Herbert
912d5edcf6
Merge branch 'master' into catch-hyperdash 2017-12-01 20:16:37 +09:00
Dean Herbert
79e1bf3394 Remove unused testcase 2017-12-01 20:14:42 +09:00
Dean Herbert
e75d73ac1c Change hyperdash colour again 2017-12-01 20:13:46 +09:00
Dean Herbert
bf606522c1 Make hyperdash testcase easier to win again 2017-12-01 20:13:32 +09:00
Dean Herbert
273793f185 Add comments 2017-12-01 20:08:49 +09:00
Dean Herbert
25207c51b5 Add directionality 2017-12-01 20:07:28 +09:00
Dean Herbert
445bb70ef5 Add hyperdash visual testing to TestCaseCatcherArea
Also tidies up hyperdash state logic
2017-12-01 19:58:00 +09:00
Dean Herbert
07081f400c Make hyperdash testcase easier to win 2017-12-01 19:33:20 +09:00
Dean Herbert
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
Dean Herbert
442b234a86
Merge pull request #1631 from smoogipoo/csharp-7
Migrate to C# 7
2017-12-01 18:47:37 +09:00
smoogipoo
5be00cb0ec Add todo 2017-12-01 18:40:55 +09:00
smoogipoo
0b95e36675 Fix RelativeChildSize error temporarily 2017-12-01 18:00:20 +09:00
Dean Herbert
881745d756 Initial implementation of hyperdash calculation 2017-12-01 17:59:36 +09:00
Dean Herbert
19051dd529 Update framework 2017-12-01 16:44:49 +09:00
smoogipoo
a73dfd692b Merge LangVer.props and osu.Game.props 2017-12-01 13:53:32 +09:00
smoogipoo
edb9b19079 Make JoinNullCheckWithAssignment a hint 2017-12-01 13:53:18 +09:00
smoogipoo
f6591851c3 Implement a selection dragger box 2017-12-01 13:15:58 +09:00