1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 02:27:25 +08:00
Commit Graph

11067 Commits

Author SHA1 Message Date
Dean Herbert
1bcda4930e Add back beatmap version set 2018-03-12 11:33:12 +09:00
Dean Herbert
c346638459
Merge branch 'master' into decoders 2018-03-11 01:04:28 +09:00
Dean Herbert
a9327eac8f
Merge pull request #2194 from smoogipoo/drawableslider-cleanup
Split out the slider head into a separate drawable hitobject
2018-03-10 18:50:55 +09:00
Dean Herbert
ac5a2f18c4
Merge branch 'master' into drawableslider-cleanup 2018-03-10 16:34:15 +09:00
smoogipoo
8ed5fce43a Split out the slider head into a separate drawable hitobject 2018-03-10 01:13:59 +09:00
Dean Herbert
5727965431
Merge pull request #2193 from peppy/update-framework-again
Fix major regression (framework revert)
2018-03-10 01:08:17 +09:00
Dean Herbert
7cabc54f64 Fix major regression (framework revert) 2018-03-10 00:48:48 +09:00
Dan Balasescu
1ecd051383
Merge pull request #2190 from peppy/framework-too-far-behind
Update framework
2018-03-09 21:38:57 +09:00
Dean Herbert
2b0309b26d Update framework 2018-03-09 21:29:13 +09:00
Dean Herbert
217dd2ecdc Initial push for better decoders 2018-03-09 21:24:15 +09:00
Dean Herbert
c11f6efab5
Merge pull request #2045 from UselessToucan/PlayerBase
Allow previewing background adjustments at player loading screen
2018-03-08 22:26:39 +09:00
Dean Herbert
6d91889ca6 Move player-specific configuration bindables back to player 2018-03-08 22:16:47 +09:00
TocoToucan
2cb197d0c4 Replace ConfigureBackgroundUpdate with OnEntering 2018-03-08 11:35:00 +03:00
Dean Herbert
8f3f886805
Merge branch 'master' into PlayerBase 2018-03-08 16:12:12 +09:00
Dean Herbert
80bd2a95f6
Merge pull request #2186 from peppy/fix-difficulty-calculator
Fix difficulty calculator regression when applying mods
2018-03-08 15:14:13 +09:00
Dean Herbert
2c0928896b
Merge branch 'master' into fix-difficulty-calculator 2018-03-08 15:03:33 +09:00
Dean Herbert
213d749dab
Merge pull request #2183 from peppy/less-hp-drain
Match HP drain harshness closer to stable
2018-03-08 14:53:15 +09:00
Dan Balasescu
ffc9a7644e
Merge branch 'master' into less-hp-drain 2018-03-08 14:44:40 +09:00
Dean Herbert
70a16667b6 Fix difficulty calculator regression when applying mods 2018-03-08 12:57:36 +09:00
Dean Herbert
ca249ab866
Merge pull request #2120 from naoey/user-profile-recent
Add recent section to user profile
2018-03-08 01:14:30 +09:00
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
fbe8641ec4
Merge pull request #2178 from peppy/slider-tick-transform-cleanup
SliderTick transform improvements
2018-03-07 17:19:16 +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