RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,724 Commits 3 Branches 651 Tags 358 MiB
Commit Graph

1671 Commits

Author SHA1 Message Date
Dean Herbert bea20efb64
Merge branch 'master' into mod_content_centering 2020-01-30 10:34:46 +09:00
Bartłomiej Dach c9dda78ded Refactor drawable hierarchy to center properly 
* Use FillFlowContainer.Spacing instead of manually applying margins.
* Use Update() for calculating button padding to preserve it after
  mod button expansion and adjust FooterButtonRandom to use this method
  while avoiding flickering.
* Expose mod display margin to clear it in the footer button.
 2020-01-29 18:59:51 +01:00
unknown aa264cd2a8 allow tooltip to show as percentage as needed 2020-01-28 12:32:30 +08:00
Dean Herbert 997b49f6dc Change display to always show progress bar, only hiding seeking handle instead 2020-01-24 14:21:22 +09:00
Dean Herbert da65fff48e Merge remote-tracking branch 'upstream/master' into collapse-graph-option 2020-01-24 13:55:42 +09:00
Dean Herbert eb5abcab8c Rename and simplify circle logic 2020-01-24 12:01:40 +09:00
Dean Herbert 851b891285 Fix incorrect insert logic 2020-01-24 12:01:14 +09:00
Dean Herbert c390348eab Merge remote-tracking branch 'upstream/master' into colour-score-meter 2020-01-24 11:45:33 +09:00
Dean Herbert 8a7f7c5e46 Merge remote-tracking branch 'smoogipoo/void-key-up-returns' into update-framework 2020-01-22 22:57:56 +09:00
Dean Herbert 7c62cc3ac3 Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework 2020-01-22 22:57:52 +09:00
smoogipoo 7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
smoogipoo 40f502c6d1 Apply input method signature refactorings 2020-01-20 19:35:37 +09:00
smoogipoo 1b1003bd73 Refactor 2020-01-20 18:31:25 +09:00
smoogipoo bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
Dan Balasescu 03c778df75
Merge branch 'master' into update-framework 2020-01-09 19:02:26 +09:00
smoogipoo 91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
Bartłomiej Dach f0fe3bc804 Pass bindable to BeatmapMetadataDisplay 
It was reported that mods selected in song select would show up during
loading of replays which were recorded under a different set of mods.
This was caused by BeatmapMetadataDisplay accepting a plain read-only
value of the Mods bindable in PlayerLoader.load(), therefore making the
mod value assignment in ReplayPlayerLoader.OnEntering() have no effect
on that component.

To resolve this issue, make BeatmapMetadataDisplay accept the
higher-level bindable, bind to it locally and pass it down the hierarchy
to ModDisplay.
 2020-01-08 20:10:43 +01:00
Bartłomiej Dach a3f7d3c445 Add failing test 
Add test case demonstrating the lack of update of the metadata display's
mods upon setting the Mods property in PlayerLoader.
 2020-01-08 19:55:35 +01:00
Dean Herbert ca862124a5 Fix replay import from main menu causing a hard crash 2019-12-27 19:36:48 +09:00
Dean Herbert b330aec03e Drain starting at the first hitobject, not gameplay start 2019-12-27 16:16:30 +09: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 a041f32072 Use cleaner solution via cancellation of older schedule 2019-12-26 19:05:32 +09:00
smoogipoo 8903f286ef Fix escape not continuing to results screen 2019-12-26 18:27:48 +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 a4b1c79e18 Initial implementation of HP drain 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
smoogipoo c7936e40d5 Protect against potential nullref 2019-12-23 19:13:36 +09:00
Andrei Zavatski 7a0d76ae77 Fix nullref 2019-12-22 03:41:19 +03:00
Andrei Zavatski aded12af9e Refactoor to avoid bindable usage 2019-12-22 03:30:17 +03:00
Andrei Zavatski eb75c6c70f Update FadeIn animation for new judgement 2019-12-22 03:17:56 +03:00
Andrei Zavatski 46501cf0ac Use FillFlowContainer 2019-12-22 03:06:57 +03:00
Andrei Zavatski 14a77a8f16 Improve animations 2019-12-21 16:08:28 +03:00
Andrei Zavatski b61aa660c6 Move colours to HitErrorMeter class 2019-12-21 14:52:53 +03:00
Andrei Zavatski 5e3c3f2a90 Make judgements work 2019-12-21 14:30:41 +03:00
Andrei Zavatski 5b115d8d8a Implement basic logic 2019-12-21 13:41:50 +03:00
Salman Ahmed 7d090d6cd9 Fix key overlay appearing regardless of the setting 2019-12-19 17:52:58 +03:00
smoogipoo 76f2fb378f Separate score and health parts of ScoreProcessor 2019-12-19 20:03:14 +09:00
Dean Herbert e0ce87adca
Move CreateScoreProcessor() to Ruleset (#7244) 
Move CreateScoreProcessor() to Ruleset
 2019-12-17 22:15:42 +09:00
Dan Balasescu fd2785bab3
Merge branch 'master' into fxcop 2019-12-17 20:14:45 +09:00
smoogipoo 49bf8d27d1 Move CreateScoreProcessor() to Ruleset 2019-12-17 20:08:13 +09:00
Huo Yaoyuan d5994ed484 CA2208: create exceptions correctly. 2019-12-17 13:00:10 +08:00
Huo Yaoyuan ecfc6dfa3d CA1825: use Array.Empty. 2019-12-17 12:59:48 +08:00
Dean Herbert b5db927d93 Merge branch 'master' into cinema-mod 2019-12-17 12:56:06 +09:00
smoogipoo 6cf318c34b Merge remote-tracking branch 'refs/remotes/origin/master' into improve-hud-hiding 2019-12-16 18:41:21 +09:00
smoogipoo a276643a4b Reorder health display and score elements 2019-12-16 18:41:14 +09:00
smoogipoo 83f77d9c35 Make the layout faster 2019-12-16 18:41:02 +09:00