1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-28 12:02:55 +08:00
Commit Graph

16588 Commits

Author SHA1 Message Date
Dean Herbert
5a4292717f Allow tests to run custom game 2018-11-06 17:59:01 +09:00
smoogipoo
f2a5f28ea2 SelectionMask -> SelectionBlueprint 2018-11-06 17:56:04 +09:00
smoogipoo
ad2836a61e MaskSelection -> SelectionBox 2018-11-06 17:52:47 +09:00
smoogipoo
65bb91dcf7 Merge MaskContainer into BlueprintContainer 2018-11-06 17:51:26 +09:00
smoogipoo
26c9390c16 HitObjectMaskLayer -> BlueprintContainer 2018-11-06 17:36:10 +09:00
smoogipoo
faab744cbd DragLayer -> DragBox 2018-11-06 17:24:57 +09:00
Dean Herbert
49d3beac19 Add rider config for tournament run 2018-11-06 17:01:22 +09:00
Dean Herbert
779e57f0ca Change .idea ignore rules to not ignore run configurations 2018-11-06 16:32:11 +09:00
Dean Herbert
5eecdffa5d
Merge pull request #3683 from peppy/build-executable-flag
Add executable flag to build.sh
2018-11-06 16:31:13 +09:00
Dean Herbert
2c4aa5af65 Add executable flag to build.sh 2018-11-06 16:16:15 +09:00
Dean Herbert
a2b28e0bf4 Add missing header 2018-11-06 16:15:03 +09:00
Dean Herbert
85fe4db2ec Hide game cursor so it is not included in stream 2018-11-06 15:08:14 +09:00
Dean Herbert
6f25548737 Remove now unnecessary null setters 2018-11-06 14:49:20 +09:00
Dean Herbert
9c5eddea54 Allow running tournament tools from main executable 2018-11-06 14:49:09 +09:00
Dean Herbert
43c70d354d Merge tag '2018.1105.0' into tournament-tools 2018-11-06 00:35:21 +09:00
Dean Herbert
fb93aea909 Use logo-less video by default 2018-11-05 23:15:30 +09:00
Dean Herbert
c7e5ae0573 Read from stable 2018-11-05 23:15:13 +09:00
Dean Herbert
1fbf15d65c
Merge pull request #3681 from peppy/update-framework
Update framework and other dependencies
2018-11-05 18:33:31 +09:00
Dean Herbert
4554fc2c7b Update framework and other dependencies 2018-11-05 18:22:16 +09:00
Dean Herbert
6aa61e1516
Merge pull request #3600 from smoogipoo/fix-slider-samples
Fix sliders using the wrong samples
2018-11-05 18:19:25 +09:00
smoogipoo
ace1dce281 Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
2018-11-05 18:10:22 +09:00
Dean Herbert
697b1f6728
Merge pull request #3680 from smoogipoo/fix-add-bank
Fix sample additions not falling back to non-addition bank
2018-11-05 18:06:21 +09:00
smoogipoo
92d570342c Fix sample additions not falling back to non-addition bank 2018-11-05 17:35:24 +09:00
smoogipoo
a4caaf56ef Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2018-11-05 16:38:28 +09:00
Dean Herbert
09b2710fbf
Merge pull request #3678 from smoogipoo/force-sort-objects
Sort nested hitobjects post-creation
2018-11-05 16:31:39 +09:00
Dean Herbert
998a540cf8
Merge branch 'master' into force-sort-objects 2018-11-05 16:23:11 +09:00
Dean Herbert
e600cbce80
Merge pull request #3679 from smoogipoo/debounce-seeks
Debounce editor summary timeline seeks
2018-11-05 16:21:57 +09:00
smoogipoo
171700cb91 Debounce editor summary timeline seeks 2018-11-05 15:59:40 +09:00
smoogipoo
1fffa48aa0 Sort nested hitobjects post-creation 2018-11-05 12:15:45 +09:00
Dean Herbert
5cba0942db
Merge pull request #3618 from TPGPL/issue-templates
Add issue templates
2018-11-05 09:59:53 +09:00
Dean Herbert
8d146e8ec8
Merge branch 'master' into issue-templates 2018-11-05 09:45:51 +09:00
Dean Herbert
292415140b
Update template 2018-11-05 09:45:15 +09:00
Dean Herbert
7e092c6084 Read videos from storage 2018-11-04 21:15:06 +09:00
Dean Herbert
89a1414c63 Read flag name from file 2018-11-04 21:14:16 +09:00
Dean Herbert
54a02ee2d7 Add showcase screen 2018-11-04 07:12:07 +09:00
Dean Herbert
2e348edd8d Fix filename 2018-11-04 05:29:06 +09:00
Dean Herbert
97b32a72f5 Read and write bracket from storage instead of arbitrary location 2018-11-04 04:59:11 +09:00
Dean Herbert
a918e83b1e Add drawings screen 2018-11-04 04:58:59 +09:00
Dean Herbert
b610095ff5 Update drawings design 2018-11-04 04:58:40 +09:00
Dean Herbert
5006dc47a3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-04 02:26:17 +09:00
Dean Herbert
7473349a9a
Merge pull request #3674 from FreezyLemon/binary-bmfont
Use binary bitmap fonts
2018-11-04 02:23:38 +09:00
FreezyLemon
56ff2686ac Update osu-resources and osu-framework to use binary fonts 2018-11-03 18:09:11 +01:00
gotopie
4c9dcdf156 hide seekbar when no song is playing 2018-11-02 19:04:30 -04:00
Dean Herbert
9f5546fd62 Fix API regression in direct 2018-11-02 21:13:46 +09:00
Dean Herbert
54fede4559
Merge pull request #3644 from smoogipoo/slider-placement
Implement slider placement
2018-11-02 20:27:58 +09:00
Dean Herbert
63cbc8e0e8
Merge branch 'master' into slider-placement 2018-11-02 19:45:34 +09:00
Dean Herbert
e2c520770e
Merge pull request #3657 from smoogipoo/spinner-placement-2
Implement spinner placements
2018-11-02 19:45:09 +09:00
Dean Herbert
ad49dca86e
Merge branch 'master' into spinner-placement-2 2018-11-02 19:32:52 +09:00
Dean Herbert
16d9ab2a0e
Merge pull request #3656 from smoogipoo/spinner-selection
Implement spinner selections
2018-11-02 19:32:33 +09:00
Dean Herbert
e6ee3dc73e Use framework helper functions for path approximation 2018-11-02 19:26:29 +09:00