Dan Balasescu
bba89fc57b
Merge branch 'master' into lock-difficulty-adjust
2019-12-27 23:17:04 +09:00
Dean Herbert
5efb7e8015
Always update default value
2019-12-27 23:01:52 +09:00
Dan Balasescu
3836567992
Merge branch 'master' into fix-replay-import
2019-12-27 22:52:27 +09:00
Dean Herbert
651abd2e11
Update framework
2019-12-27 21:51:18 +09:00
smoogipoo
6069d98ced
Remove generic editor beatmap
2019-12-27 19:39:30 +09:00
Dean Herbert
ca862124a5
Fix replay import from main menu causing a hard crash
2019-12-27 19:36:48 +09:00
Dean Herbert
2c8879f0fb
Lock user adjusted difficulty settings when changing beatmap
2019-12-27 19:05:17 +09:00
Dan Balasescu
199c0bca02
Merge branch 'master' into fix-mod-read-setting
2019-12-27 17:45:24 +09:00
Dan Balasescu
ecfe1d361b
Merge branch 'master' into fix-mod-read-setting
2019-12-27 17:29:13 +09:00
Dean Herbert
b330aec03e
Drain starting at the first hitobject, not gameplay start
2019-12-27 16:16:30 +09:00
Dean Herbert
aa97487f8e
Merge branch 'master' into hp-drain
2019-12-27 14:58:22 +09:00
Dean Herbert
6bff5cfb9e
Merge remote-tracking branch 'upstream/master' into avoid-duplicate-empty-archives
2019-12-27 14:07:34 +09:00
Dean Herbert
ea52bbea35
Update framework
2019-12-27 14:05:48 +09:00
Dean Herbert
9478fe5ec3
Revert to using empty container, not null
2019-12-27 13:15:55 +09:00
smoogipoo
c22744de2c
Better define minimum health targets
2019-12-27 12:46:35 +09:00
smoogipoo
fbbd16b4f0
Remove healthIncreases nullability
2019-12-27 12:39:25 +09:00
Andrei Zavatski
04a4821a9f
Make CreateContent a method again
2019-12-27 06:36:41 +03:00
Andrei Zavatski
2d167a5161
Some little size adjustments
2019-12-27 05:53:31 +03:00
Andrei Zavatski
3feaaa3e4d
Use FillMode.Fit for icons
2019-12-27 05:37:06 +03:00
Andrei Zavatski
dc720dd653
Bump ppy.osu.Game.Resources from 2019.1215.0 to 2019.1227.0
2019-12-27 05:27:36 +03:00
Andrei Zavatski
3ae0564db7
Merge master with conflicts resolved
2019-12-27 05:17:53 +03:00
Dean Herbert
183307d636
Use circle instead of CircularContainer
2019-12-27 10:53:20 +09:00
Andrei Zavatski
bd6e603be3
Add icon for profile header
2019-12-27 04:01:33 +03:00
Andrei Zavatski
25f6517fba
Update dependency
2019-12-27 03:53:01 +03:00
Andrei Zavatski
3d7c7a1ced
Fix profile title wasn't in lowercase
2019-12-26 22:39:13 +03:00
Bartłomiej Dach
193e41f878
Add origin adjustment for hitobject lifetime
...
Visual inspection of taiko gameplay has shown that hitobjects appeared
on screen only when the origin of the hitobject came into the bounds
of the screen, instead of appearing when any visible part of the
hitobject came into the screen bounds.
This behaviour was due to lifetime calculation being based on the origin
of the hitobject and not taking into account the actual object
dimensions. Adjust the lifetime start of the hitobject by subtracting
the time needed to show the part of the hitobject that should already
be visible on screen when the origin comes into frame.
2019-12-26 20:37:29 +01:00
Andrei Zavatski
e360aa4588
Fix TabControl wasn't on top of everything
2019-12-26 22:16:20 +03:00
Andrei Zavatski
a1c91af095
Update layout of every overlay using OverlayHeader
2019-12-26 22:09:06 +03:00
Andrei Zavatski
647c83e6c8
Add ability to not create content for headers
...
Rather than creating an empty container
2019-12-26 21:21:15 +03:00
Andrei Zavatski
ca3e8db79f
Merge dependency
2019-12-26 21:03:39 +03:00
Andrei Zavatski
2d32fe08ff
Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay_headers_update
2019-12-26 21:02:14 +03:00
Dean Herbert
cac011edc1
Merge branch 'master' into hp-drain
2019-12-26 23:51:12 +09:00
Dean Herbert
033bb15500
Fix early-escape not continuing to results screen ( #7362 )
...
Fix early-escape not continuing to results screen
2019-12-26 23:50:21 +09:00
Dean Herbert
3d5561b02e
Separate health and score processing components ( #7358 )
...
Separate health and score processing components
2019-12-26 23:48:55 +09:00
Dean Herbert
a4d4efc312
Fix missing comments
2019-12-26 19:33:59 +09:00
Dean Herbert
a041f32072
Use cleaner solution via cancellation of older schedule
2019-12-26 19:05:32 +09:00
Dean Herbert
74d875a2e0
Give empty archives a hash based on archive name to avoid duplicate imports
2019-12-26 18:44:50 +09:00
smoogipoo
8903f286ef
Fix escape not continuing to results screen
2019-12-26 18:27:48 +09:00
smoogipoo
35f64d9aae
More comments
2019-12-26 17:54:31 +09:00
smoogipoo
f5dbd57d55
Refactor drain calculation for resiliency
2019-12-26 17:36:40 +09:00
smoogipoo
662ec2d812
Refactor gameplay-time drain limitation
2019-12-26 15:46:07 +09:00
smoogipoo
96a4f9ae53
Fix nub position getting offset by size changes
2019-12-26 15:14:19 +09:00
smoogipoo
e0c1072ab2
Add xmldocs
2019-12-26 15:01:19 +09:00
smoogipoo
eba6371526
Re-implement taiko's accumulating health processor
2019-12-26 15:01:19 +09:00
smoogipoo
3b07c3913d
Add perfect and ok values, move to base Judgement
2019-12-26 15:00:59 +09:00
smoogipoo
0454c5022d
Fix some maps potentially starting with 0 health
2019-12-26 15:00:59 +09:00
smoogipoo
90a0569660
Tweak drain values
2019-12-26 15:00:58 +09:00
smoogipoo
522847987b
Implement break/gameplay start times
2019-12-26 15:00:58 +09:00
smoogipoo
b348abcd07
Only drain health in non-break times
2019-12-26 14:59:49 +09:00
smoogipoo
977fb3d1bf
Make processors and break overlay frame-stable
2019-12-26 14:59:49 +09:00
smoogipoo
85c44b5a5a
Disable list additions during gameplay
2019-12-26 14:59:49 +09:00
smoogipoo
bd74d086fb
Remove adjustment factor
2019-12-26 14:59:49 +09:00
smoogipoo
70d2d8a2fa
Add adjustable target percentage
2019-12-26 14:59:49 +09:00
smoogipoo
a4b1c79e18
Initial implementation of HP drain
2019-12-26 14:59:49 +09:00
smoogipoo
985277da79
Add time elapsation to judgement simulation
2019-12-26 14:59:49 +09:00
smoogipoo
90cb9d9162
Simplify scoreprocesor/healthprocessor implementations
2019-12-26 14:59:49 +09:00
smoogipoo
7414a6aadd
Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
...
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Mania/ManiaRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
Dean Herbert
f603dd82bc
Fix difficulty adjust mod not correctly reading settings while leaderboard visible
2019-12-26 14:52:08 +09:00
Salman Ahmed
89fa1be2c8
Fix download manager potentially not handling cancel requests
2019-12-25 22:55:14 +03:00
Andrei Zavatski
bb4d02a1f8
Fix incorrect icon offset
2019-12-25 22:09:14 +03:00
Andrei Zavatski
c77679e36c
Naming fixes for overlays using ScreenTitle
2019-12-25 21:57:22 +03:00
Andrei Zavatski
3e34155114
Update ScreenTitle with the new design
2019-12-25 21:56:43 +03:00
Dean Herbert
a47e5aeead
Fix sample lookup not working correctly for custom rulesets
2019-12-26 00:51:44 +09:00
Dean Herbert
9b0af901ef
Merge branch 'master' into remove-legacy-id
2019-12-25 21:25:33 +09:00
Dan Balasescu
9702cc9809
Merge branch 'master' into remove-legacy-id
2019-12-25 21:01:12 +09:00
Dean Herbert
41d99df73c
Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls
2019-12-25 20:49:45 +09:00
Dean Herbert
1b1c255394
Make the Easy mod's extra life count customizable ( #7331 )
...
Make the Easy mod's extra life count customizable
2019-12-25 20:19:08 +09:00
Dean Herbert
504a55e803
Merge branch 'master' into better-beatmap-conversion
2019-12-25 19:52:06 +09:00
Dean Herbert
4e419cabdc
Merge branch 'master' into update-framework
2019-12-25 19:32:17 +09:00
Dean Herbert
81c330ec26
Update framework
2019-12-25 18:51:44 +09:00
Dan Balasescu
38219255c7
Merge branch 'master' into settings-source-value-changed
2019-12-25 18:03:36 +09:00
Dan Balasescu
a265a0c7c5
Merge branch 'master' into settings-source-value-changed
2019-12-25 17:23:08 +09:00
Dean Herbert
d84b319a3a
Merge remote-tracking branch 'upstream/master' into adjustable-map-settings
2019-12-25 15:20:17 +09:00
Dean Herbert
911dc2d98d
Fix code inspections
2019-12-25 15:20:10 +09:00
Dean Herbert
52ba0cd816
Rename method to be more appropriate
...
Also adds xmldoc.
2019-12-25 15:20:04 +09:00
Dean Herbert
783159f7a0
Remove redundant logic
2019-12-25 14:55:22 +09:00
Dean Herbert
145ac8e0b5
Remove redundant setter
2019-12-25 14:55:05 +09:00
Dean Herbert
f84d98223f
Merge branch 'master' into fallback-to-skin-combo-colours
2019-12-25 14:38:09 +09:00
Dean Herbert
e019ea408a
Merge branch 'master' into adjustable-map-settings
2019-12-25 13:16:47 +09:00
Dean Herbert
89886ceb79
Fix incorrect dialog button animating on requesting quit twice ( #7325 )
...
Fix incorrect dialog button animating on requesting quit twice
2019-12-25 13:15:30 +09:00
Joseph Madamba
2a5f661408
Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls
2019-12-24 08:29:56 -08:00
Dean Herbert
bc75bd34f6
Fix caret width having changed
2019-12-24 18:23:09 +09:00
Lucas A
e3753ae29f
Make the easy mod's extra life count customizable
2019-12-24 10:13:12 +01:00
Dean Herbert
e088a85662
Update framework
2019-12-24 17:12:12 +09:00
smoogipoo
00546787c8
Remove unused method
2019-12-24 16:52:49 +09:00
Dean Herbert
fcb7a9ade5
Update RulesetStore to read from populated defaults
2019-12-24 16:16:55 +09:00
Dean Herbert
5738267642
Copy ruleset info over default
2019-12-24 16:05:20 +09:00
Dean Herbert
d87203857b
Move default construction into constructor
2019-12-24 16:02:35 +09:00
Dean Herbert
0677f746aa
Provide the ruleset to converter classes
2019-12-24 16:02:16 +09:00
smoogipoo
0bfd757936
Make OsuTextBox use BasicTextBox
2019-12-24 14:21:16 +09:00
Dean Herbert
a324bfbc2c
Remove LegacyID from Ruleset
2019-12-24 13:48:27 +09:00
smoogipoo
c7936e40d5
Protect against potential nullref
2019-12-23 19:13:36 +09:00
smoogipoo
3e03916c39
Add length check back to workingbeatmap
2019-12-23 17:45:59 +09:00
smoogipoo
6e7426a098
Simplify/improve beatmap conversion precheck
2019-12-23 17:44:18 +09:00
Joehu
b038c192d1
Rename property to IsSwitchable
2019-12-22 19:47:47 -08:00
mcendu
796223d3e0
Invert if
2019-12-22 21:39:25 +08:00
mcendu
1f41acc5b9
Integrate auto click into exit confirmed check
2019-12-22 21:20:55 +08:00
mcendu
5d29ff29cb
Animate "Good bye" instead on exit
2019-12-22 20:52:00 +08:00
unknown
fe73b9f8d3
make HP and OD generic and instantiate CS and AR to modes that need it
2019-12-22 16:45:32 +08:00
Joehu
119b48ccb0
Remove redundant tab item override
2019-12-21 10:48:11 -08:00
Joehu
1342556894
Allow ctrl tabbing navigation to chat and song select leaderboards
2019-12-21 10:48:11 -08:00
Salman Ahmed
ff5e6c0dcf
Make DefaultComboColours a property
2019-12-21 12:36:34 +03:00
Salman Ahmed
55be4478aa
Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours
2019-12-21 12:36:09 +03:00
Willy Tu
8e60ae7039
Removed directive is not required
2019-12-20 15:45:20 -08:00
Willy Tu
8353c893c0
Update BodyText of LocalScoreDeleteDialog
2019-12-20 12:00:10 -08:00
unknown
1bd44529dd
add full-stop to mod description for consistency
2019-12-20 18:31:16 +08:00
unknown
08b477ed52
make ModDifficultyAdjust abstract
2019-12-20 18:30:23 +08:00
Willy Tu
ad41a5cc57
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-20 02:14:01 -08:00
Dean Herbert
a6bdf04f6b
Remove unused using
2019-12-20 18:36:39 +09:00
Dean Herbert
822903d5db
Update song select statistics when mod changes settings
2019-12-20 18:01:35 +09:00
smoogipoo
1802e0ff11
Fix storyboard incorrectly re-ordering elements
2019-12-20 16:04:05 +09:00
Willy Tu
2769ddb3bb
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-19 22:23:13 -08:00
Dean Herbert
1451f06739
Fix key overlay appearing regardless of the setting ( #7289 )
...
Fix key overlay appearing regardless of the setting
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-20 15:09:02 +09:00
Willy Tu
6ccacab0bc
Merge branch 'master' into #7146
2019-12-19 22:05:16 -08:00
Dean Herbert
f66c12a1f3
Add post-update notification for iOS users ( #7300 )
...
Add post-update notification for iOS users
2019-12-20 15:00:19 +09:00
Willy Tu
6abbd33b51
Fixed CI issues
2019-12-19 21:57:14 -08:00
Dan Balasescu
aa2fcbb660
Merge branch 'master' into fix-key-overlay-always-shown
2019-12-20 14:47:20 +09:00
Willy Tu
f9dbebc96c
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-19 21:30:12 -08:00
Willy Tu
8ab26e8889
Update Tests with dependencies on LeaderboardScore. Added its dependency on DialogOverlay for the tests. Added test for deleting individual local score
2019-12-19 21:29:54 -08:00
Dean Herbert
11214628ad
Add post-update notification for iOS users
2019-12-20 14:02:01 +09:00
Dean Herbert
656c584503
Update RestoreDefaultValueButton when default value changes
2019-12-20 13:59:01 +09:00
Salman Ahmed
7d090d6cd9
Fix key overlay appearing regardless of the setting
2019-12-19 17:52:58 +03:00
Dean Herbert
a3154f2f7b
Update framework
2019-12-19 20:30:58 +09:00
smoogipoo
50fa6c5f77
Update score on reverts
2019-12-19 20:18:23 +09:00
smoogipoo
04c3a6f8a4
Move more properties to the base class
2019-12-19 20:18:17 +09:00
smoogipoo
76f2fb378f
Separate score and health parts of ScoreProcessor
2019-12-19 20:03:14 +09:00
smoogipoo
1da8cc8690
Encapsulate common logic of ScoreProcessor
2019-12-19 19:03:27 +09:00
Willy Tu
d4d4ddc624
Remove new line for CodeFactor
2019-12-18 22:42:26 -08:00
Willy Tu
643911ada9
Fix code format for CI
2019-12-18 22:41:07 -08:00
Willy Tu
1617a9ce80
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-18 22:39:22 -08:00
Dean Herbert
b1533ae2a9
Fix score serialisation failing for unknown mod properties
2019-12-19 14:58:56 +09:00
Willy Tu
ed07b779b1
Update to use score.ID identify local scores
2019-12-18 21:54:02 -08:00
Willy Tu
27163a5133
Removed unnecessary code for deleting individual local score.
2019-12-18 21:04:10 -08:00
Willy Tu
9ed2dbce8c
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-18 20:59:29 -08:00
Dean Herbert
c94c803562
Implement local sorting by name and country in SocialOverlay ( #5847 )
...
Implement local sorting by name and country in SocialOverlay
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-19 12:54:02 +09:00
Willy Tu
b67f986058
Fix CodeFactor issues
2019-12-18 19:26:35 -08:00
Willy Tu
531ac16743
Update Scoreboard Refresh Method for deleting individual scores
2019-12-18 19:22:42 -08:00
Willy Tu
d1fcadc700
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-18 19:16:54 -08:00
Dean Herbert
ada8efb4ab
Merge branch 'master' into fix-storyboard-crash
2019-12-19 11:44:20 +09:00
Dean Herbert
a46602f705
Move cancellation token construction closer to usage
2019-12-19 11:26:22 +09:00
smoogipoo
dd68106d90
Recreate panels only while loading/loaded
2019-12-19 02:21:33 +09:00
smoogipoo
007e2e80c1
Refactor to fix sorting issues
2019-12-19 02:02:57 +09:00
Dan Balasescu
37d7c984bc
Merge branch 'master' into friends-sorting
2019-12-19 01:33:03 +09:00
smoogipoo
f38853d229
Improve performance of storyboard loading
2019-12-19 00:52:50 +09:00
smoogipoo
8d6987c870
Refactor storyboard timeline to reduce GC / fix crashes
2019-12-18 23:59:48 +09:00
smoogipoo
2905a4418d
Fix potential nullref
2019-12-18 21:30:57 +09:00
smoogipoo
cb5a35f8f9
Fix incorrect bindable valuechanged usage
2019-12-18 21:08:49 +09:00
smoogipoo
4e11fb0fd7
Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text
2019-12-18 19:36:16 +09:00
smoogipoo
39489e2901
Merge remote-tracking branch 'refs/remotes/origin/master' into fix-editor-movement-crash
2019-12-18 18:51:56 +09:00
smoogipoo
5664ce3109
Add hitobject container regression test
2019-12-18 18:51:12 +09:00
