RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,877 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

14877 Commits

Author SHA1 Message Date
jorolf 023924396d Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time 2018-11-11 18:38:12 +01:00
jorolf 5c09662c14 Allow flashlight size to be variant 2018-11-07 23:40:33 +01:00
jorolf 2cffce805a add flashlight mod 2018-11-07 00:48:54 +01: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 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 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
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
Dean Herbert 79611eee7d
Merge branch 'master' into spinner-selection 2018-11-02 19:24:09 +09:00
Dean Herbert edd7feda20
Merge pull request #3668 from peppy/fix-path-control-point-drag 
Fix not being able to drag control points mid-snake
 2018-11-02 13:45:12 +09:00
Dan Balasescu 7b9afe9cf7
Merge branch 'master' into fix-path-control-point-drag 2018-11-02 13:04:04 +09:00
Dean Herbert ef1416c297
Merge pull request #3663 from peppy/fix-disk-space-errors 
Don't log disk space related IO errors
 2018-11-02 13:03:08 +09:00
Dan Balasescu 173d2904b8
Merge branch 'master' into fix-disk-space-errors 2018-11-02 12:15:13 +09:00
Dean Herbert 7f1ee3bcb4 Disallow spinner movement for now 2018-11-02 12:06:53 +09:00
Dean Herbert 0a0023920f Fix not being able to drag control points mid-snake 2018-11-02 04:09:33 +09:00
TPGPL d9e371ccbb Add new specs-checking methods 2018-11-01 18:08:12 +01:00
smoogipoo 2ac4f2b6af Lock spinners to centre of screen 2018-11-01 19:24:58 +09:00
smoogipoo d78348f178 Reduce duplicate code 2018-11-01 19:23:37 +09:00
smoogipoo 1aae123ff5 Make approximators share an interface 2018-11-01 19:16:44 +09:00
Dean Herbert 1265d5ac0b
Merge branch 'master' into spinner-placement-2 2018-11-01 18:05:44 +09:00
Dean Herbert c1304eca1b Merge remote-tracking branch 'upstream/master' into slider-placement 2018-11-01 17:59:37 +09:00
Dean Herbert 5fd21d35dc
Merge branch 'master' into spinner-selection 2018-11-01 17:47:59 +09:00
Dean Herbert e13e4b7308
Merge pull request #3655 from smoogipoo/slider-controlpoint-masks 
Implement slider controlpoint visualisation
 2018-11-01 17:39:27 +09:00
Dean Herbert bb2f8deb18 ControlPoint -> PathControlPoint 
Also Curve -> Path.
 2018-11-01 03:56:51 +09:00
Dean Herbert 9cb4374b51
Merge branch 'master' into slider-controlpoint-masks 2018-11-01 02:37:31 +09:00
smoogipoo ffec532079 Fix segment control points not changing in unison 2018-10-31 19:02:47 +09:00
smoogipoo d2fbf05137 Reduce size of control point 2018-10-31 18:01:53 +09:00
Dan Balasescu 4c358a3d4d
Merge pull request #3664 from peppy/fix-scroll-handling 
Fix placement masks handling scroll events
 2018-10-31 17:38:18 +09:00
Dean Herbert 85a7325911 Fix placement masks handling scroll events 2018-10-31 17:23:27 +09:00
Dean Herbert 9aa88293e2 Use HResult 2018-10-31 17:07:05 +09:00