|
|
50acab8d86
|
Merge branch 'master' into relative-date-drawable
|
2018-03-12 11:28:43 +09:00 |
|
|
|
09b13ee618
|
Merge pull request #2182 from peppy/fix-duplicate-judgements
Remove judgements when deciding a new judgement for a HitObject
|
2018-03-12 11:28:34 +09:00 |
|
|
|
0da407f75c
|
Merge branch 'master' into fix-duplicate-judgements
|
2018-03-12 11:02:54 +09:00 |
|
|
|
89582f7afe
|
Merge pull request #2160 from peppy/rewrite-break-overlay
Rewrite BreakOverlay to work with rewinding
|
2018-03-12 11:02:40 +09:00 |
|
|
|
86d93ffe3c
|
Fix tooltip not working due to not handling input
|
2018-03-12 10:49:50 +09:00 |
|
|
|
96e2aca1ba
|
Merge branch 'master' into relative-date-drawable
|
2018-03-12 10:36:43 +09:00 |
|
|
|
209d91fe21
|
Fix duplicate item in csproj
|
2018-03-12 10:35:37 +09:00 |
|
|
|
8ba87dfdbd
|
Merge branch 'master' into fix-duplicate-judgements
|
2018-03-12 10:29:50 +09:00 |
|
|
|
33c721bcbb
|
Fix post-merge errors
|
2018-03-12 09:51:32 +09:00 |
|
|
|
6e51b74890
|
Merge remote-tracking branch 'origin/master' into rewrite-break-overlay
|
2018-03-12 09:47:05 +09:00 |
|
|
|
7bf38eb1ad
|
Merge pull request #2200 from HoLLy-HaCKeR/fix-legacyid-check
Fix check against LegacyID for non-default rulesets
|
2018-03-12 09:06:53 +09:00 |
|
|
|
9c75c392f2
|
Only check by null instead of sign
|
2018-03-11 21:27:49 +01:00 |
|
|
|
a321bcf3af
|
Fix check against LegacyID for non-default rulesets
|
2018-03-11 20:19:03 +01:00 |
|
|
|
3a5283f96d
|
Merge pull request #2159 from naoey/fix-unplayable-beatmaps
Make song select ensure current beatmap is always playable in the active ruleset
|
2018-03-11 01:38:11 +09:00 |
|
|
|
db2a663234
|
Use private instead of protected
|
2018-03-11 01:26:03 +09:00 |
|
|
|
d1ab52e7bc
|
Merge branch 'master' into fix-unplayable-beatmaps
|
2018-03-11 01:19:54 +09:00 |
|
|
|
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 |
|
|
|
ac5a2f18c4
|
Merge branch 'master' into drawableslider-cleanup
|
2018-03-10 16:34:15 +09:00 |
|
|
|
8ed5fce43a
|
Split out the slider head into a separate drawable hitobject
|
2018-03-10 01:13:59 +09:00 |
|
|
|
5727965431
|
Merge pull request #2193 from peppy/update-framework-again
Fix major regression (framework revert)
|
2018-03-10 01:08:17 +09:00 |
|
|
|
7cabc54f64
|
Fix major regression (framework revert)
|
2018-03-10 00:48:48 +09:00 |
|
|
|
56730247e3
|
Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps
|
2018-03-09 19:40:00 +05:30 |
|
|
|
2c0488b1f1
|
Invert bool, add test, and handle ruleset change.
|
2018-03-09 19:39:28 +05:30 |
|
|
|
9ad9fc5aa9
|
Merge branch 'master' into fix-unplayable-beatmaps
|
2018-03-09 21:39:48 +09:00 |
|
|
|
1ecd051383
|
Merge pull request #2190 from peppy/framework-too-far-behind
Update framework
|
2018-03-09 21:38:57 +09:00 |
|
|
|
2b0309b26d
|
Update framework
|
2018-03-09 21:29:13 +09:00 |
|
|
|
d04f47718f
|
Make song select choose random when initial selection fails.
- Revert TestCasePlaySongSelect to master
|
2018-03-09 17:36:55 +05:30 |
|
|
|
25fb527cc7
|
Remove previous fix and move filtered logic to carousel.
- Add an optional bool parameter to SelectBeatmap to skip selecting
filtered maps
|
2018-03-09 15:51:00 +05:30 |
|
|
|
c11f6efab5
|
Merge pull request #2045 from UselessToucan/PlayerBase
Allow previewing background adjustments at player loading screen
|
2018-03-08 22:26:39 +09:00 |
|
|
|
6d91889ca6
|
Move player-specific configuration bindables back to player
|
2018-03-08 22:16:47 +09:00 |
|
|
|
2cb197d0c4
|
Replace ConfigureBackgroundUpdate with OnEntering
|
2018-03-08 11:35:00 +03:00 |
|
|
|
8f3f886805
|
Merge branch 'master' into PlayerBase
|
2018-03-08 16:12:12 +09:00 |
|
|
|
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 |
|
|
|
2c0928896b
|
Merge branch 'master' into fix-difficulty-calculator
|
2018-03-08 15:03:33 +09:00 |
|
|
|
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 |
|
|
|
ffc9a7644e
|
Merge branch 'master' into less-hp-drain
|
2018-03-08 14:44:40 +09:00 |
|
|
|
81c1ec2005
|
Merge branch 'master' into fix-unplayable-beatmaps
|
2018-03-08 13:02:57 +09:00 |
|
|
|
3b56999118
|
Add drawable to display (and update) relative dates
|
2018-03-08 12:58:16 +09:00 |
|
|
|
70a16667b6
|
Fix difficulty calculator regression when applying mods
|
2018-03-08 12:57:36 +09:00 |
|
|
|
ee96e974a8
|
Update framework
|
2018-03-08 09:43:31 +09:00 |
|
|
|
91c984ed97
|
Merge branch 'master' into rewrite-break-overlay
|
2018-03-08 09:31:59 +09:00 |
|
|
|
ca249ab866
|
Merge pull request #2120 from naoey/user-profile-recent
Add recent section to user profile
|
2018-03-08 01:14:30 +09:00 |
|
|
|
e55a503f79
|
Tidy up test case
|
2018-03-08 00:58:16 +09:00 |
|
|
|
453fd83e01
|
Merge branch 'master' into user-profile-recent
|
2018-03-08 00:42:02 +09:00 |
|
|
|
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 |
|
|
|
983cefbe40
|
Add VisualTest.
|
2018-03-07 19:08:26 +05:30 |
|
|
|
3731cbe5eb
|
Removing "mouse wheel disabled" checkbox from visual settings gameplay menu
|
2018-03-07 14:20:59 +01:00 |
|
|
|
f78538fea8
|
Merge branch 'master' into user-profile-recent
|
2018-03-07 19:41:52 +09:00 |
|
|
|
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 |
|
|
|
b62ed004f2
|
Remove judgements when deciding a new judgement for a HitObject
Generally happens when rewinding.
|
2018-03-07 19:14:42 +09:00 |
|
