1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 03:17:28 +08:00
Commit Graph

11160 Commits

Author SHA1 Message Date
Dean Herbert
e55a503f79 Tidy up test case 2018-03-08 00:58:16 +09:00
Dean Herbert
453fd83e01
Merge branch 'master' into user-profile-recent 2018-03-08 00:42:02 +09:00
Dean Herbert
b4d20c81e0
Merge pull request #2184 from delftswa2018/master
Removing "mouse wheel disabled" checkbox from visual settings in gameplay
2018-03-08 00:03:31 +09:00
naoey
983cefbe40
Add VisualTest. 2018-03-07 19:08:26 +05:30
pdrapoport
3731cbe5eb Removing "mouse wheel disabled" checkbox from visual settings gameplay menu 2018-03-07 14:20:59 +01:00
Dean Herbert
f78538fea8
Merge branch 'master' into user-profile-recent 2018-03-07 19:41:52 +09:00
Dean Herbert
04f5563238 Match HP drain harshness closer to stable
Based on number of misses before fail on two arbitrary tests. Obviously not final, just making the game more playable for the time being.
2018-03-07 19:37:26 +09:00
Dean Herbert
fe3ab94afb Fix mania judgement regression 2018-03-07 19:19:56 +09:00
Dean Herbert
b62ed004f2 Remove judgements when deciding a new judgement for a HitObject
Generally happens when rewinding.
2018-03-07 19:14:42 +09:00
Dean Herbert
f2d7621df3 Add skin support for explode/flash layers
Basically to hide them for legacy skins, though.
2018-03-07 18:21:05 +09:00
Dean Herbert
05eb678654 Add skin support for judgements 2018-03-07 18:21:05 +09:00
Dean Herbert
bd952ce370 Allow skinnable drawables to be of non-restricted size 2018-03-07 18:21:05 +09:00
Dean Herbert
fbe8641ec4
Merge pull request #2178 from peppy/slider-tick-transform-cleanup
SliderTick transform improvements
2018-03-07 17:19:16 +09:00
Dean Herbert
6a768e378a
Merge branch 'master' into rewrite-break-overlay 2018-03-07 17:00:34 +09:00
Dan Balasescu
1375ee8408
Merge branch 'master' into slider-tick-transform-cleanup 2018-03-07 16:59:04 +09:00
Dean Herbert
9aa52db2c0
Merge pull request #2177 from peppy/api-error-shouldnt-retry
Fix arbitrary API request errors getting identified as timeouts
2018-03-07 16:58:54 +09:00
Dan Balasescu
fb349e68a3
Merge branch 'master' into api-error-shouldnt-retry 2018-03-07 16:50:14 +09:00
Dean Herbert
7a005bdb6a
Merge pull request #2176 from peppy/nullable-legacy-id
Make LegacyID nullable
2018-03-07 16:50:03 +09:00
Dan Balasescu
0c154e07ed
Merge branch 'master' into nullable-legacy-id 2018-03-07 16:12:08 +09:00
Dan Balasescu
d486a55487
Merge pull request #2174 from peppy/fix-textbox-arrows
Fix left and right arrows keys in chat overlay not working
2018-03-07 16:12:02 +09:00
Dan Balasescu
5fda7881c3
Merge branch 'master' into fix-textbox-arrows 2018-03-07 16:01:44 +09:00
Dean Herbert
43f7139dc7
Merge pull request #2165 from jorolf/volume-control
Implement updated volume control overlay design
2018-03-07 15:03:04 +09:00
Dean Herbert
a71e5ce19c Tidy up 2018-03-07 14:54:54 +09:00
Dean Herbert
4094ffbddd Remove unnecessary comment 2018-03-07 14:54:15 +09:00
Dean Herbert
96ea42d3ba Ensure initial value is set even if that value is zero 2018-03-07 14:51:34 +09:00
Dean Herbert
05a13d4d39 Improve the way bindings are done 2018-03-07 14:50:50 +09:00
Dean Herbert
51a9dd038e Add default bindable values 2018-03-07 14:38:41 +09:00
Dean Herbert
fac4cd6a32 Move to overlayContent 2018-03-07 14:20:47 +09:00
Dean Herbert
e2f9e237e8 Use GradientHorizontal helper function 2018-03-07 14:07:04 +09:00
Dean Herbert
c176e309e1
Merge branch 'master' into volume-control 2018-03-07 14:03:09 +09:00
Dean Herbert
b84367c52a
Merge pull request #2175 from smoogipoo/flowcontainer-changes
Update framework with FlowContainer changes
2018-03-07 14:01:14 +09:00
Dean Herbert
08c469a8b3 Update framework 2018-03-07 13:22:08 +09:00
Dean Herbert
4dfd3a61cc Remove alpha setting 2018-03-06 18:40:39 +09:00
Dean Herbert
7cf1d4450a SliderTick transform improvements 2018-03-06 18:28:36 +09:00
Dean Herbert
e82cadc811 Make LegacyID nullable
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
Dean Herbert
07bf8549eb Fix arbitrary API request errors getting identified as timeouts 2018-03-06 17:39:34 +09:00
smoogipoo
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
smoogipoo
27e0ed4ea8 Update framework 2018-03-06 14:16:17 +09:00
smoogipoo
148551afa2 osu!-side changes in-line with framework layout changes 2018-03-06 14:12:37 +09:00
naoey
9669c5aee3
Make locally used things local and rename method. 2018-03-06 09:33:15 +05:30
Poyo
e187c6453d Added mania-difficulty mod support 2018-03-05 18:19:06 -08:00
Dean Herbert
90828cca8f Fix left and right arrows keys in chat overlay not working
Misplaced override. Resolves ppy/osu-framework#1444
2018-03-06 08:59:40 +09:00
TocoToucan
697ad63d72 Resolve merge conflicts 2018-03-05 22:24:25 +03:00
Dean Herbert
a6460832f4
Merge pull request #2167 from smoogipoo/fix-taiko-conversion
Fix incorrect slider-to-drumroll conversions in taiko
2018-03-06 01:52:22 +09:00
Dean Herbert
c4c1b0b6ff Fix merge regression 2018-03-06 01:39:01 +09:00
Dean Herbert
7b18e8a5ca Merge branch 'master' into fix-taiko-conversion 2018-03-06 01:16:47 +09:00
Dean Herbert
e1eb18702b
Merge pull request #2171 from smoogipoo/fix-drumroll-nullref
Fix taiko drumrolls potentially getting incorrect judgements
2018-03-05 23:07:48 +09:00
Dean Herbert
41727509d7
Merge branch 'master' into fix-drumroll-nullref 2018-03-05 22:46:33 +09:00
Dan Balasescu
efcf2ae311
Merge pull request #2164 from peppy/fix-skin-performance
Fix skin file path lookup performance
2018-03-05 21:43:43 +09:00
smoogipoo
2a9fb2c2c6 Make NestedHitObjects lazily-constructed 2018-03-05 21:40:26 +09:00