1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 12:42:54 +08:00
Commit Graph

8774 Commits

Author SHA1 Message Date
smoogipoo
cc9e06e161 Remove unused elements 2017-11-28 19:07:10 +09:00
smoogipoo
eaf2b1d94d Remove line that shouldn't have been added yet 2017-11-28 19:06:46 +09:00
smoogipoo
567e378bbb CI fixes 2017-11-28 19:02:39 +09:00
smoogipoo
f8c296877b Add testcase for mania beatmap conversion (currently ignored) 2017-11-28 18:59:20 +09:00
Dean Herbert
b11de50df2 Cleanups 2017-11-28 18:42:50 +09:00
Dean Herbert
5ae9b4c791 Make CatchStacker testcase more useful 2017-11-28 18:39:54 +09:00
Dean Herbert
b517523f4a Add back CatcherArea to simplify layout 2017-11-28 18:39:45 +09:00
Dean Herbert
8f3fd7092e CatchBaseHit -> CatchHitObject
Also moves default scale to CatchHitObject.
2017-11-28 18:37:41 +09:00
Dean Herbert
2deb33ac41 Add basic fruit scaling support 2017-11-28 18:34:40 +09:00
Dean Herbert
bd88df2722 Add note about sequential execution of ConvertHitObject 2017-11-28 18:33:41 +09:00
smoogipoo
b97cab4f29 Make ManiaFramedReplayInputHandler properly account for special keys
These are interleaved into the playfield, so we have to use the playfield's columns' actions.
2017-11-28 15:27:20 +09:00
smoogipoo
84702211ec Rewrite mania auto generator to properly account for overlapping objects 2017-11-28 15:17:02 +09:00
Dan Balasescu
58c88196ae
Merge pull request #1607 from peppy/fix-chat-height-precision
Remove precision limitation on chat height to allow pixel-perfect dragging
2017-11-28 13:07:21 +09:00
Dean Herbert
473eba9776 Remove precision limitation on chat height to allow pixel-perfect dragging 2017-11-28 12:09:44 +09:00
Dean Herbert
f54cbc2b2f
Merge pull request #1597 from peppy/new-sounds-and-more
Add new UI and menu samples
2017-11-27 19:53:37 +09:00
Dean Herbert
3a01bfc1ef Remove unnecessary new prefix 2017-11-27 18:53:19 +09:00
Dean Herbert
8ebfe7f0f4
Merge branch 'master' into new-sounds-and-more 2017-11-27 18:49:07 +09:00
Dean Herbert
5947af13b7
Merge pull request #1602 from smoogipoo/fix-mania-conversion
Fix possible invalid cast when generating mania patterns
2017-11-27 18:47:13 +09:00
smoogipoo
2c53be7853 Fix possible invalid cast when generating mania patterns 2017-11-27 18:39:13 +09:00
Dean Herbert
bf5ea027ef Add xmldoc to TriangleButton 2017-11-27 18:26:20 +09:00
Dean Herbert
96d42b3e5b Fix redundant string interpolation 2017-11-27 18:20:13 +09:00
Dean Herbert
51372d7cda Remove HandleInput override from TriangleButton 2017-11-27 18:19:06 +09:00
Dean Herbert
760f7d02d9 Remove AlwaysPresent (not actually required) 2017-11-27 18:12:52 +09:00
Dean Herbert
cbd7e1ca0d Update submodules 2017-11-27 18:06:53 +09:00
Dean Herbert
7877f42763 Merge remote-tracking branch 'upstream/master' into new-sounds-and-more 2017-11-27 17:59:24 +09:00
Dan Balasescu
90e1f16645
Merge pull request #1594 from peppy/global-track-volume-reduction
Add a global reduction of audio track volume
2017-11-27 17:16:21 +09:00
FreezyLemon
82a9b57277 Removed unnecessary "using" statement 2017-11-27 08:58:09 +01:00
FreezyLemon
b4513497d6 Added a textContainer reference to MetadataSection so casting is no longer required for setting new text 2017-11-27 08:52:26 +01:00
FreezyLemon
507da0dfb7 Renamed addTextAsync to setTextAsync 2017-11-27 08:48:47 +01:00
FreezyLemon
ac0942df86 Removed unnecessary private method to update the metadata 2017-11-27 08:48:12 +01:00
FreezyLemon
d49ee295d9 Removed unnecessary schedule and null checks 2017-11-27 08:47:36 +01:00
FreezyLemon
b34e724b8d Changed MetadataSection so that the Text setter loads the new text in async before displaying it. 2017-11-27 08:18:09 +01:00
Dean Herbert
3e0f282d52
Merge branch 'master' into global-track-volume-reduction 2017-11-27 12:27:01 +09:00
Dan Balasescu
4943df3b08
Merge pull request #1596 from peppy/panel-hover-effect
Add visual highlighting on song select panel hover
2017-11-27 11:32:14 +09:00
Dan Balasescu
00c552dea1
Merge branch 'master' into panel-hover-effect 2017-11-27 11:14:04 +09:00
Dan Balasescu
954bac6b54
Merge pull request #1595 from peppy/local-deploy-fixes
Allow osu.Desktop.Deploy to work without a github token
2017-11-27 11:13:49 +09:00
Dan Balasescu
144a8591ca
Merge branch 'master' into local-deploy-fixes 2017-11-27 10:57:57 +09:00
Dan Balasescu
9a4e5d0c6b
Merge pull request #1593 from peppy/change-transition-blur-rate
Adjust background blur rate to be snappier
2017-11-27 10:57:41 +09:00
Dan Balasescu
a574b092f6
Merge branch 'master' into change-transition-blur-rate 2017-11-27 10:42:32 +09:00
Dan Balasescu
42e13ae7a1
Merge pull request #1590 from Aergwyn/fix-stuck-in-play
Fix being stuck in gameplay if exit is pressed too fast
2017-11-27 10:42:18 +09:00
Dan Balasescu
77bfc6037d
Merge branch 'master' into fix-stuck-in-play 2017-11-27 10:06:34 +09:00
Dan Balasescu
d20277f734
Merge pull request #1589 from Aergwyn/fix-reload-all-panels
Fix osu!direct download reloading all panels
2017-11-27 10:06:21 +09:00
Dean Herbert
c555867aaf Merge remote-tracking branch 'upstream/master' into panel-hover-effect 2017-11-27 10:01:47 +09:00
Dean Herbert
f189de437a Simplify blending assignment 2017-11-27 10:01:44 +09:00
Dan Balasescu
98de969b47
Merge branch 'master' into fix-reload-all-panels 2017-11-27 09:56:44 +09:00
Dan Balasescu
e63fc40e76
Merge pull request #1584 from peppy/show-converts-toggle
Add a setting to toggle showing converted beatmaps
2017-11-27 09:53:05 +09:00
Dan Balasescu
bb9e399808
Merge branch 'master' into fix-reload-all-panels 2017-11-27 09:50:17 +09:00
Dan Balasescu
55741f3898
Merge branch 'master' into show-converts-toggle 2017-11-27 09:41:30 +09:00
Dan Balasescu
d6ba5685cf
Merge pull request #1581 from peppy/fix-sprite-icon
Fix SpriteIcon potentially not updating texture during a load race condition
2017-11-27 09:39:43 +09:00
Dan Balasescu
3f65c19bce
Merge branch 'master' into fix-sprite-icon 2017-11-27 09:32:37 +09:00