h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 20:57:25 +08:00
Code Issues Releases Wiki Activity
22,989 Commits 3 Branches 653 Tags 359 MiB
acc0251124
Commit Graph

14612 Commits

Author SHA1 Message Date
Dan Balasescu
456def70c8
Merge branch 'master' into fix-negative-key-counter 2019-10-04 15:26:18 +09:00
Dan Balasescu
457e0c4d7b
Merge pull request #6117 from bdach/beatmap-parsing-fallback-v2 
Add fallback decoder option for badly-headered files
 2019-10-04 15:03:10 +09:00
Dean Herbert
aeb62825cd Move out requireMoreUpdateLoops for better consistency 2019-10-04 13:42:06 +08:00
Dean Herbert
49fdb4b731
Fix Alt-F4 being blocked during gameplay (#6369) 
Fix Alt-F4 being blocked during gameplay

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-10-04 13:33:00 +08:00
Dean Herbert
ddef7fa3ba Repair behavioural change 2019-10-04 13:32:47 +08:00
Dean Herbert
bcdc22087a Merge remote-tracking branch 'upstream/master' into fix-negative-key-counter 2019-10-04 13:24:59 +08:00
Dan Balasescu
2b61bb709e
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-10-04 14:08:27 +09:00
Dean Herbert
f1772d01d2
Add the new switch button + labelled switch button (#6257) 
Add the new switch button + labelled switch button

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-10-04 13:01:57 +08:00
Dan Balasescu
dc984d0d81
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-10-04 13:51:56 +09:00
smoogipoo
ffde389641 Add difficulty calculator beatmap decoder fallback 2019-10-04 13:28:32 +09:00
Dean Herbert
47c1f36f9d Add ValidForResume check 2019-10-04 11:41:53 +08:00
Dean Herbert
71985c7ef1 Update fail logic to match 2019-10-04 11:23:42 +08:00
Dean Herbert
a7b58cad99
Merge branch 'master' into labelled-switch-button 2019-10-04 11:15:54 +08:00
Dan Balasescu
e9cb06a5e2
Merge branch 'master' into truncate-metadata-on-wedge 2019-10-04 12:08:06 +09:00
Dean Herbert
a7d7a28d34
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays 2019-10-04 11:05:28 +08:00
Dean Herbert
925615320e Update lazer default combo colours to match stable 2019-10-04 10:46:48 +08:00
Dean Herbert
d2c9a29c0d Remove unnecessary local assign 2019-10-04 10:45:18 +08:00
smoogipoo
a5e1cb8feb Merge remote-tracking branch 'Game4all/master' into truncate-metadata-on-wedge 2019-10-04 11:21:33 +09:00
Joseph Madamba
d87f6d270b
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays 2019-10-03 08:43:31 -07:00
Dean Herbert
0dd12990c4
Fix possible nullref in MusicController (#6379) 
Fix possible nullref in MusicController
 2019-10-03 20:11:52 +08:00
Craftplacer
dbcb9e51c2
Merge branch 'master' into muted-notification 2019-10-03 12:51:22 +02:00
smoogipoo
636913a4a6 Refactor PlayerLoader changes 2019-10-03 19:22:41 +09:00
smoogipoo
6c878cb167 Prevent nullrefs 2019-10-03 19:15:37 +09:00
smoogipoo
662a1a9c2c Use current 2019-10-03 18:55:53 +09:00
smoogipoo
bcf0b2752e Fix possible MusicController nullref 2019-10-03 18:48:44 +09:00
smoogipoo
2d0c522398 Remove unused method 2019-10-03 18:43:46 +09:00
smoogipoo
f2ba87a1d2 Fix placement blueprint test scenes not working 2019-10-03 16:28:56 +09:00
smoogipoo
652acac87f Move placement movement event to BlueprintContainer 2019-10-03 16:14:42 +09:00
Dean Herbert
6268bbcfc8
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-10-03 15:12:21 +08:00
Dean Herbert
b28689c774 Fix key counters appearing negative on intense beatmaps 
When `FrameStabilityContainer` decides it needs multiple updates on the same frame, it ends up with an elapsed time of zero. This was interacting badly with the condition used in `RulesetInputManager` to govern playback direction.

I have changed this to use `Rate` as exposed by the frame stable clock.

- Closes #6198.
 2019-10-03 15:01:54 +08:00
smoogipoo
2c13043c42 Hook up the event to HitObjectComposer 2019-10-03 14:40:00 +09:00
smoogipoo
3fb0b0b668 Rename to StartTimeChanged and add xmldocs 2019-10-03 14:37:16 +09:00
smoogipoo
897b3233af Add start time tracking to EditorBeatmap 2019-10-03 14:23:48 +09:00
smoogipoo
f8eb07b211 Only lock database for the duration of a model restoration 2019-10-03 11:24:17 +09:00
Dean Herbert
c85d7c8b3f
Merge branch 'master' into reduce-database-deletion-locks 2019-10-03 10:17:27 +08:00
Joehu
8017788521 Revert "Fix alt-f4 being blocked in interface" 
This reverts commit 752dd26a4f.
 2019-10-02 16:08:24 -07:00
Joehu
148089f160 Revert "Remove unnecessary exitConfirmed condition check" 
This reverts commit 38fe519c91.
 2019-10-02 16:08:19 -07:00
Joehu
38fe519c91 Remove unnecessary exitConfirmed condition check 2019-10-02 12:28:48 -07:00
Joehu
752dd26a4f Fix alt-f4 being blocked in interface 2019-10-02 11:17:43 -07:00
Joehu
a69b9f1148 Fix alt-f4 being blocked during gameplay 2019-10-02 11:16:31 -07:00
Craftplacer
4d4e846296
Merge branch 'master' into muted-notification 2019-10-02 17:31:34 +02:00
Craftplacer
6929847b08 Remove redundant override 2019-10-02 17:22:34 +02:00
Dean Herbert
3e07e508f2
Merge branch 'master' into fix-track-leak 2019-10-02 22:20:05 +08:00
smoogipoo
dfaa9531f8 Only lock the database for the duration of a deletion 2019-10-02 18:48:50 +09:00
Dan Balasescu
2519fd26a9
Merge pull request #6351 from Joehuu/simplify-exit-logic-of-screens 
Simplify exit logic of screens with textboxes using back button receptor
 2019-10-02 18:38:06 +09:00
Dan Balasescu
b161aa22c3
Merge branch 'master' into simplify-exit-logic-of-screens 2019-10-02 18:13:57 +09:00
HDragonHR
faf8fe132e Change bindable int to float 2019-10-02 12:26:46 +08:00
Ganendra Afrasya
b6dd610af8 Apply reviews 2019-10-01 23:18:03 +07:00
Craftplacer
5f399add82 Resolve @iiSaLMaN 's suggested changes 2019-10-01 18:15:40 +02:00
Craftplacer
2ac5e0bfa0 Make use of SessionStatics 2019-10-01 17:39:01 +02:00
Joehu
e3502f5200 Fix typo on Key.Escape comment 2019-10-01 08:37:08 -07:00
Joehu
ff6367fa4b Make back button glow when pressing escape 2019-10-01 08:26:45 -07:00
Joehu
5f700f2ae9 Simplify exit logic of screens with textboxes using back button receptor 2019-10-01 08:26:34 -07:00
Craftplacer
4e394e0ed5
Merge branch 'master' into muted-notification 2019-10-01 17:26:11 +02:00
Ganendra Afrasya
208b9a4eba Add new virtual float for username to timestamp padding 2019-10-01 20:47:53 +07:00
smoogipoo
a310c4b65f Make selection blueprints a bit more testable 2019-10-01 19:32:47 +09:00
smoogipoo
cc533e8fe4 Remove BindableBeatmap 2019-10-01 17:24:47 +09:00
Dan Balasescu
b4da92e5a6
Merge branch 'master' into bot-profile 2019-10-01 16:26:48 +09:00
smoogipoo
81a227796e Merge remote-tracking branch 'origin/master' into rulesets_fail_load_exception_log 2019-10-01 15:41:16 +09:00
smoogipoo
ce609302ed Fix CI error 2019-10-01 15:41:09 +09:00
smoogipoo
04ac414249 Fix memory leaks due to audio track recycle order 2019-10-01 13:49:09 +09:00
Dean Herbert
351e89bf18 Update framework 2019-09-30 22:03:56 +09:00
Dan Balasescu
2d4e557134
Merge branch 'master' into fix-potential-null-test 2019-09-30 12:19:11 +09:00
miterosan
9f498d2990 Log the exception that caused to loading of rulesets to fail. 2019-09-29 19:25:44 +02:00
Andrei Zavatski
907f73ef8f Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile 2019-09-29 14:45:36 +03:00
Dean Herbert
193a9b0dd7
Merge branch 'master' into labelled-switch-button 2019-09-29 14:56:26 +08:00
Dean Herbert
ce62f3c75b Simplify and future-proof random retrieval method 
Will support future added intros without further code changes. Also uses RNG instead of `new Random`.
 2019-09-29 14:35:35 +08:00
Dean Herbert
740efa5747 Handle potential null case 2019-09-29 12:19:42 +08:00
V1ntagezTV
9f1c378733 moved into the switch case 2019-09-29 00:35:47 +05:00
V1ntagezTV
2681e2064a remove comment 2019-09-29 00:34:09 +05:00
V1ntagezTV
1babd139bc remove needless blank 2019-09-29 00:22:23 +05:00
V1ntagezTV
52b044b7f6 Add random intro! 2019-09-29 00:10:17 +05:00
Dean Herbert
02c1f490f1
Merge branch 'master' into muted-notification 2019-09-28 20:33:32 +08:00
Dean Herbert
a45f8c968b Rename and add simple xmldoc 2019-09-28 20:21:51 +08:00
Dean Herbert
d01c30fd52
Merge branch 'master' into introduce-session-statics 2019-09-28 20:16:52 +08:00
Dean Herbert
1d1df2433f
Merge branch 'master' into fix-track-adjustments-not-applied-after-resume 2019-09-28 19:42:31 +08:00
Andrei Zavatski
a8eef0d0c4 Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile 2019-09-28 12:34:16 +03:00
iiSaLMaN
fb9f21237e Reset track adjustments on resuming from another screen 2019-09-28 04:18:16 +03:00
dependabot-preview[bot]
3af7c910fb
Bump Humanizer from 2.7.2 to 2.7.9 
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.7.2 to 2.7.9.
- [Release notes](https://github.com/Humanizr/Humanizer/releases)
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md)
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.7.2...v2.7.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-27 19:09:07 +00:00
Dan Balasescu
8b7f558728
Merge branch 'master' into improve-hold-button-text 2019-09-27 17:35:03 +09:00
Andrei Zavatski
4908cb826b Fix line breaks 2019-09-27 09:46:11 +03:00
Andrei Zavatski
475455d7cd Add missing line breaks 2019-09-27 09:32:46 +03:00
Andrei Zavatski
94eacbca5d Fix Bot users have all the profile sections in ProfileOverlay 2019-09-27 09:22:25 +03:00
Dean Herbert
f4f5a7e9c8 Fix test regressions 2019-09-27 13:20:17 +08:00
Dean Herbert
b50ef8ffa4 Allow null NotificationManager 2019-09-27 13:15:33 +08:00
iiSaLMaN
2670a23e6f Assign to field and move to load complete 2019-09-27 08:15:24 +03:00
iiSaLMaN
7904f77cd5 Bind event to activation delay change 2019-09-27 02:59:42 +03:00
smoogipoo
45f2bcc440 Fix combo bindings not being bound to nested hitobjects 2019-09-26 17:39:19 +09:00
smoogipoo
706e884cc0 Update accent colour on combo index change 2019-09-26 17:13:13 +09:00
smoogipoo
bbf0544a8d Add bindables for IHasComboInformation properties 2019-09-26 16:55:08 +09:00
iiSaLMaN
911094e790 Replace menu button text with "press for menu" on 0ms activation delay 2019-09-26 01:42:56 +03:00
Dean Herbert
e2744054c7
Merge branch 'master' into back-button-part-2 2019-09-25 22:46:08 +09:00
Dean Herbert
7d5544460b
Fix mania scrolling speed not including beatmap slider multipli… (#6236) 
Fix mania scrolling speed not including beatmap slider multiplier

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-09-25 22:34:46 +09:00
Dean Herbert
45f833ceea Add invocation null checks for safety 2019-09-25 22:14:42 +09:00
Salman Ahmed
3aa9a172d8
Merge branch 'master' into introduce-session-statics 2019-09-25 16:14:39 +03:00
Dean Herbert
42fd323020 Move protected method 2019-09-25 22:13:49 +09:00
Dean Herbert
8c01677e0b Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 22:12:00 +09:00
iiSaLMaN
8844d567cb Use bindable setting instead 2019-09-25 15:56:47 +03:00
smoogipoo
244627ff10 Add comment + test for slider multiplier 2019-09-25 20:12:01 +09:00
Dean Herbert
f11156c2dc Fix tests not working correctly 2019-09-25 19:30:25 +09:00
smoogipoo
9f77a1ef35 Adjust namespaces 2019-09-25 17:53:08 +09:00
smoogipoo
d32a0acd10 Merge remote-tracking branch 'origin/master' into labelled-switch-button 2019-09-25 17:51:12 +09:00
smoogipoo
c9e39c124e Add a labelled switch button 2019-09-25 17:42:35 +09:00
smoogipoo
261ba5c80a Fix button not transforming correctly in some cases 2019-09-25 17:42:27 +09:00
Dean Herbert
ff9033f9ac Merge remote-tracking branch 'upstream/master' into muted-notification 2019-09-25 16:47:56 +09:00
Dean Herbert
3bd0fc2947 Merge remote-tracking branch 'upstream/master' into android-build-automation 2019-09-25 16:33:36 +09:00
Dan Balasescu
0eff9aa5e9
Merge branch 'master' into improve-carousel-tests 2019-09-25 15:55:11 +09:00
Dan Balasescu
213488a25e
Merge branch 'master' into abstract-update-manager 2019-09-25 15:41:45 +09:00
Dean Herbert
c83db94eb7 Use isolated storage/api 2019-09-25 15:00:08 +09:00
Dean Herbert
654b815b36 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-09-25 14:38:39 +09:00
Dean Herbert
bb1289e83c
Merge branch 'master' into improve-carousel-tests 2019-09-25 14:24:28 +09:00
Joehu
102dbd85bd Fix CI errors 2019-09-24 16:48:22 -07:00
Joehu
9861b21440 Remove unnecessary padding/margin 2019-09-24 16:28:40 -07:00
Joehu
7fab1a4337 Truncate long metadata on beatmap info wedge 2019-09-24 16:06:33 -07:00
Bartłomiej Dach
9323df26a1 Decouple bar line hitobjects from generator 
Introduce an IBarLine interface, which together with generic constraints
helps decouple BarLineGenerator from the actual hitobject types it
creates. Thanks to this, all rulesets that want bar lines can provide
an implementation of IBarLine that also derives from the base hitobject
class.

This allows DrawableBarLines in taiko and mania to be migrated back to
DrawableTaikoHitObject and DrawableManiaHitObject base classes
respectively. This in turn resolves #6215 without code duplication,
since the missing anchoring application is now done in mania's
DrawableBarLine through deriving from DrawableManiaHitObject.
 2019-09-25 00:36:27 +02:00
iiSaLMaN
cde7f49db1 Use direct get and set instead 2019-09-25 01:26:02 +03:00
iiSaLMaN
d013b73d33 Move in-memory logic to a base class 2019-09-25 01:25:05 +03:00
Dean Herbert
4a59e3351e Update beatmap carousel tests code style 
Also fixes one issue I spotted in BeatmapCarousel related to incorrectly holding a selection after new sets are loaded.
 2019-09-25 02:42:12 +09:00
Dean Herbert
03ec0fb27d
Merge branch 'master' into fix-mania-scrolling-speed 2019-09-24 22:20:19 +09:00
Dean Herbert
d2b76ec688
Make LabelledTextBox use the new LabelledComponent class (#6188) 
Make LabelledTextBox use the new LabelledComponent class

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-09-24 19:37:12 +09:00
LeNitrous
afa043aa7d always use default samples 2019-09-24 18:17:27 +08:00
Dean Herbert
f493f1c71d Move new components to v2 namespace 2019-09-24 19:00:26 +09:00
Dean Herbert
551b66ccec
Update framework (#6234) 
Update framework

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-09-24 18:54:47 +09:00
smoogipoo
028c958431 Initial implementation of a switch button 2019-09-24 18:39:11 +09:00
Dean Herbert
42b6041763 Move post-update notification logic to UpdateManager base class 2019-09-24 18:37:05 +09:00
Dean Herbert
c226d52b53 Don't automatic download for now 2019-09-24 18:34:54 +09:00
Dan Balasescu
1e70b83fd3
Merge branch 'master' into update-framework 2019-09-24 18:27:38 +09:00
smoogipoo
6b702eb6de Update with generic labelledcomponent 2019-09-24 18:25:17 +09:00
smoogipoo
5212c50654 Merge branch 'generic-labelledcomponent' into labelled-textbox-improvements 2019-09-24 18:23:01 +09:00
smoogipoo
df692b091c Make LabelledComponent generic 2019-09-24 18:22:02 +09:00
Dean Herbert
84d9f98ff1 fixup! Move post-update notification logic to UpdateManager base class 2019-09-24 18:15:57 +09:00
Dean Herbert
1c474de0ed Move post-update notification logic to UpdateManager base class 2019-09-24 18:03:05 +09:00
Dan Balasescu
45015fc4ba
Merge branch 'master' into tournament-setup 2019-09-24 17:27:17 +09:00
smoogipoo
4abe0473b9 Fix relative beat length not considering slider multiplier 2019-09-24 16:49:42 +09:00
smoogipoo
af0c15a93c Fix initial hitobject states not being recomputed correctly 2019-09-24 16:48:39 +09:00
smoogipoo
75cceb9e30 Fix LifetimeChanged being invoked before lifetime is set 2019-09-24 16:47:34 +09:00
Dean Herbert
1860c2f9ce Update framework 2019-09-24 16:22:30 +09:00
Dan Balasescu
b67b594036
Merge branch 'master' into menu-key-support 2019-09-24 15:09:38 +09:00
smoogipoo
4555ecc5e0 Check for exact key 2019-09-24 15:09:08 +09:00
Dan Balasescu
615e300bc9
Merge branch 'master' into fix-changelog-margin 2019-09-24 13:39:17 +09:00
iiSaLMaN
267e12ce3c Add sample usage to the session statics 2019-09-24 05:45:47 +03:00
LeNitrous
ec78889e94 remove unused dependencies 2019-09-24 08:14:20 +08:00
dependabot-preview[bot]
53603b5591
Bump System.ComponentModel.Annotations from 4.5.0 to 4.6.0 
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/corefx) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-23 20:15:51 +00:00
Andrei Zavatski
5c4dfe0809 Apply suggested change 2019-09-23 17:05:19 +03:00
Andrei Zavatski
ffbab25358 Fix incorrect icon margin in ChangelogOverlay 2019-09-23 16:12:43 +03:00
LeNitrous
5024770544 move common logic to IntroScreen 2019-09-23 20:52:44 +08:00
iiSaLMaN
e3e245ab20 Introduce SessionStatics 2019-09-23 08:15:27 +03:00
Dean Herbert
9a6d748498
Merge branch 'master' into add-creator-artist-filters 2019-09-23 12:31:51 +09:00
Craftplacer
9a687ae8e2
Merge branch 'master' into muted-notification 2019-09-23 01:59:37 +02:00
Dean Herbert
b41ac543c5 Allow changing logged in user 2019-09-23 04:46:50 +09:00
Bartłomiej Dach
96c0c80dc5 Factor out methods in FilterQueryParser 
Factor FilterQueryParser.ApplyQueries into shorter methods to reduce
method complexity.
 2019-09-22 21:20:50 +02:00
Dean Herbert
d6ec6b1eda
Merge branch 'master' into labelled-textbox-improvements 2019-09-23 00:39:29 +09:00
Dean Herbert
9fe7675be8
Add a base class for all future labelled components (#6187) 
Add a base class for all future labelled components
 2019-09-23 00:38:51 +09:00
Dean Herbert
e5b14ce74d
Add null check for safety 
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
 2019-09-22 21:42:32 +09:00
Dean Herbert
fc1d49631a Allow top-level menu key pressed to progress the osu! logo 2019-09-22 20:31:53 +09:00
Dean Herbert
cdf29b0952
Specify model name on initialize and fail import notification m… (#6192) 
Specify model name on initialize and fail import notification messages
 2019-09-22 15:54:04 +09:00
Bartłomiej Dach
70842f71f4 Fix floating point handling in filter intervals 
Due to floating-point rounding and representation errors, filters could
wrongly display results incongruous with the wedge display text (ie.
a beatmap with the BPM of 139.99999 would be displayed as having 140
BPM and also pass the bpm<140 filter).

Apply tolerance when parsing floating-point constraints. The tolerance
chosen is half of what the UI displays for the particular values (so
for example half of 0.1 for AR/DR/CS, 0.01 for stars, etc.)

Tests updated accordingly.
 2019-09-22 00:20:55 +02:00
Bartłomiej Dach
b262ba13cd Add creator= and artist= filters 
To match stable, add creator= and artist= filters to the beatmap
carousel on song select screen. Contrary to stable, this implementation
supports phrase queries with spaces within using double quotes.

The quote handling is not entirely correct (can't nest), but quotes
should rarely happen within names, and it is an edge case of an edge
case - leaving best-effort as is. Test coverage also included.
 2019-09-22 00:20:55 +02:00
Bartłomiej Dach
f5f5094611 Take culture into account when parsing filters 
Culture was not taken into account when parsing filters, which meant
that in cultures that use the comma (,) as a decimal delimiter, it would
conflict with the comma used to delimit search criteria. To remove
any ambiguity, introduce local helper functions that allow the decimal
point to be utilised, using the invariant culture. This also matches
stable behaviour.

The decision to not reuse osu.Game.Beatmaps.Formats.Parsing was
deliberate due to differing semantics (it's not really sane to throw
exceptions on receiving user-facing input).
 2019-09-22 00:18:53 +02:00
Bartłomiej Dach
dddd94684b Split out lower and upper interval inclusivity 
A single IsInclusive field causes unexpected issues when trying to
formulate a half-open interval query. Split out IsInclusive into two
fields, Is{Lower,Upper}Inclusive and update usages accordingly.
 2019-09-22 00:18:28 +02:00
Bartłomiej Dach
33c51d5178 Extract parsing filter queries to class 
For the sake of testability without having to spin up visual tests,
extract methods related to parsing filter queries from FilterControl
to a static FilterQueryParser class.
 2019-09-22 00:18:28 +02:00
iiSaLMaN
9be8bdef52 Remove pluralize and use title letter casing 2019-09-21 21:00:24 +03:00
iiSaLMaN
6bb0f3eb41 Move humanizing to the model name instead 2019-09-21 20:04:12 +03:00
Dean Herbert
db90d211cb
Fix scores importing with deleted beatmap sets (#6190) 
Fix scores importing with deleted beatmap sets
 2019-09-22 01:15:22 +09:00
Dean Herbert
c99b48f934 Bring up-to-date and use IApplicableFailOverride 2019-09-21 23:30:54 +09:00
Dean Herbert
4c4b71eeec
Merge branch 'master' into master 2019-09-21 22:45:05 +09:00
Dean Herbert
a76771e696
Add support for "additions" in changelog (#6177) 
Add support for "additions" in changelog
 2019-09-21 22:27:18 +09:00
Dan Balasescu
73fe402756
Merge branch 'master' into fix-html-unescaping 2019-09-21 12:59:57 +09:00
Andrei Zavatski
befdd140f4 Reverse padding changes 2019-09-20 23:50:19 +03:00
Andrei Zavatski
6ad26e61d1 Merge remote-tracking branch 'refs/remotes/ppy/master' into changelog-improvements 2019-09-20 23:49:24 +03:00
Dean Herbert
dced3c38b5
Update framework (#6196) 
Update framework
 2019-09-21 02:21:00 +09:00
Dean Herbert
92f9cf3e06 Update framework 2019-09-21 02:08:19 +09:00
Vperus
ac8fe6045f Fixed typo 
Changed CreateReourceStore() to CreateResourceStore()
 2019-09-20 19:58:39 +03:00
iiSaLMaN
3be03a26c9 Pluralize instead of adding 's' 2019-09-20 16:18:55 +03:00
iiSaLMaN
8300e86f20 Specify model name on import notification messages 2019-09-20 15:46:43 +03:00
smoogipoo
c89c092b98 Allow undeleting scores if their beatmap exists 2019-09-20 19:55:59 +09:00
smoogipoo
dfc0928ebe Fix scores importing with deleted beatmap sets 2019-09-20 19:39:21 +09:00
smoogipoo
2bbf4ca4b5 Update LabelledTextBox to use LabelledComponent 2019-09-20 18:50:50 +09:00
smoogipoo
523272edab Add xmldocs 2019-09-20 18:39:04 +09:00
smoogipoo
e0a97cfac5 Add a LabelledComponent base class 2019-09-20 18:35:15 +09:00
Dean Herbert
a06cb54732
Merge branch 'master' into beatmap-parsing-fallback-v2 2019-09-20 15:28:08 +09:00
Dean Herbert
d0a4e1e3c2 Force a checksum check before skipping FileStore copy op 2019-09-20 15:00:27 +09:00
Revel
f7f9c0f7e0 Update BeatmapDetailAreaTabControl.cs 2019-09-19 15:47:32 -04:00
Lucas A
5663e3e6b3 Fix escaped html strings not being unescaped in changelog entries. 2019-09-19 20:08:14 +02:00
Andrei Zavatski
daa64f1be7 Adjust icon padding 2019-09-19 20:53:06 +03:00
Andrei Zavatski
573da7b1e7 Implement ChangelogEntryType 2019-09-19 20:34:37 +03:00
Dean Herbert
636582e089 Always show exit confirmation when closing via alt-f4 or window control 2019-09-20 02:22:49 +09:00
Dean Herbert
67796e0982 Apply code styling suggestions 2019-09-19 22:46:21 +09:00
Dean Herbert
4e9bb7b121 Merge remote-tracking branch 'upstream/master' into hold-to-press-setting 2019-09-19 22:35:18 +09:00
Dean Herbert
0a67d1db1b
Merge pull request #5355 from EVAST9919/songselect-best-user-score 
Show personal best on song select
 2019-09-19 21:17:23 +09:00
smoogipoo
94d3bcc612 Fix top score not being selectable 2019-09-19 20:47:33 +09:00
Dean Herbert
50d4206c45 Fix exit scenarios 2019-09-19 20:17:58 +09:00
Dean Herbert
ead3ee3b41 Merge branch 'master' into hold-to-press-setting 2019-09-19 20:05:14 +09:00
Dean Herbert
cffee1fd5e Fix imported beatmap paths not correctly matching files 2019-09-19 20:02:45 +09:00
Dean Herbert
ddff9882cf Fix importing archives which are nested in a single folder within a zip 2019-09-19 19:11:04 +09:00
Dean Herbert
0640b2eb35
Fix judgement sizes not matching legacy skins (#6145) 
Fix judgement sizes not matching legacy skins
 2019-09-19 18:49:35 +09:00
Dean Herbert
3abcd898a6
Add hit lighting (#6144) 
Add hit lighting

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-09-19 18:49:22 +09:00
Dean Herbert
28342baa8f
Add auto-restart functionality to sudden death and perfect mods (#6159) 
Add auto-restart functionality to sudden death and perfect mods

Co-authored-by: Paul Teng <plankp@outlook.com>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-09-19 18:49:09 +09:00
Dan Balasescu
027d6194f2
Merge branch 'master' into add-hit-lighting 2019-09-19 18:07:29 +09:00
smoogipoo
bc9941a990 Newline required when xmldocs are involved 2019-09-19 18:00:11 +09:00
smoogipoo
65276cd235 Remove whitespace 2019-09-19 17:58:10 +09:00
smoogipoo
db24cfbead Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect 
# Conflicts:
#	osu.Game/Screens/Play/Player.cs
 2019-09-19 17:57:04 +09:00
smoogipoo
da15b900f7 Remove virtual member from ModBlockFail 2019-09-19 17:44:24 +09:00
Dean Herbert
646d762468
Merge branch 'master' into songselect-advanced-filtering 2019-09-19 17:42:32 +09:00
Dean Herbert
fa54a0bfd3 Fix test failures 2019-09-19 17:40:46 +09:00
smoogipoo
5120d82ef8 Fix crash with multiple range criterias 2019-09-19 17:36:44 +09:00
Dean Herbert
e6c36a8bc7 Fix scaling mode being applied to judgements 2019-09-19 17:36:32 +09:00
smoogipoo
96ea507320 Reorder comparison for readability 2019-09-19 17:21:22 +09:00
smoogipoo
e075dd7ea8 Fix equals operator not working 2019-09-19 17:16:34 +09:00
smoogipoo
7683f7ff23 Make OnlineStatus use OptionalRange 2019-09-19 17:12:07 +09:00
smoogipoo
d7831d8f5d Use non-generic IComparable interface 2019-09-19 17:11:43 +09:00
smoogipoo
167bb9fcc1 Fix ugly casts 2019-09-19 17:11:28 +09:00
smoogipoo
0915a94470 Make BeatDivisor use OptionalRange 2019-09-19 16:53:27 +09:00
smoogipoo
3c21b68b73 Make OptionalRange generic 2019-09-19 16:51:57 +09:00
Dean Herbert
2cd7c769e1 Merge remote-tracking branch 'upstream/master' into fix-judgement-size 2019-09-19 16:32:37 +09:00
Dean Herbert
929f05884b Always confirm exit when button is clicked 2019-09-19 16:28:06 +09:00
Dean Herbert
a214e7e72f Add confirmation dialog when exiting game 2019-09-19 16:26:22 +09:00
Dean Herbert
39a5a3eebe Merge remote-tracking branch 'upstream/master' into hold-to-press-setting 2019-09-19 16:26:14 +09:00
Dean Herbert
83657239bd
Disallow failing for replay players (#6162) 
Disallow failing for replay players

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-09-19 16:00:37 +09:00
Dean Herbert
e2f7d4bc62 Remove unnecessary ToMetric avoidance 2019-09-19 15:45:43 +09:00
Dean Herbert
48ee95955b Remove unnecessary redirection 2019-09-19 15:45:08 +09:00
smoogipoo
c1daa187fe Reduce default tolerance 2019-09-19 15:44:14 +09:00
Dean Herbert
36d0695e5c Add spacing 2019-09-19 15:44:05 +09:00
Dean Herbert
033c68a428 Fade in score, not container 2019-09-19 15:44:00 +09:00
Dean Herbert
2b6c9aeb26 Move top score container to more local namespace 2019-09-19 15:38:40 +09:00
Dean Herbert
e0fd8609d1 Fix margins and clean up implementation 2019-09-19 15:34:46 +09:00
smoogipoo
80f46e02d8 Add equals (=) query operator variants 2019-09-19 15:33:54 +09:00
Dean Herbert
098e89cb66 Improve state reset flow 2019-09-19 15:23:33 +09:00
Dan Balasescu
9f8c9af3b4
Merge branch 'master' into add-class-combo-colours 2019-09-19 15:13:00 +09:00
Salman Ahmed
865425d35e
Merge branch 'master' into block-failing-on-replays 2019-09-19 09:09:56 +03:00
smoogipoo
c76e27549a Remove spacing 2019-09-19 14:56:52 +09:00
Dan Balasescu
1f0f4d52f3
Merge branch 'master' into state-update-on-skin-change 2019-09-19 14:55:21 +09:00
Dean Herbert
4967ffd8e5 Move inside leaderboard 2019-09-19 14:52:31 +09:00
iiSaLMaN
da4d83063e Simplify LINQ expression 2019-09-19 08:31:11 +03:00
Dean Herbert
a7b6895d4c Revert changes to BeatmapDetailArea 2019-09-19 14:26:15 +09:00
smoogipoo
762adb783a Fix duplicate invocation of updateState on load complete 2019-09-19 14:15:06 +09:00
Dean Herbert
177a789d79 Add setting to adjust hold-to-confirm activation time 2019-09-19 14:06:25 +09:00
iiSaLMaN
e793854735 Invert BypassFail usage 2019-09-19 08:00:41 +03:00
iiSaLMaN
9de0bcae1e Check for blocking fail mods by default 2019-09-19 07:58:54 +03:00
smoogipoo
4b97327b37 Cleanup draggedItem usages and make them more safe 2019-09-19 13:53:52 +09:00
smoogipoo
0644443979 Use resolved attribute for music controller 2019-09-19 13:51:50 +09:00
smoogipoo
c34842cb80 Merge remote-tracking branch 'Joehuu/master' into randomise-song-playback 2019-09-19 13:37:46 +09:00
Dean Herbert
2e0a85c2f6 Merge remote-tracking branch 'upstream/master' into songselect-best-user-score 2019-09-19 12:57:30 +09:00
Dean Herbert
3fa1b53b2a Add back combo colours for osu!classic 2019-09-19 12:39:15 +09:00
Craftplacer
c3221e1a36 Prepare classes for player loader test scene 2019-09-18 23:27:26 +02:00
iiSaLMaN
775b90e066 Bypass fail on replays 2019-09-18 22:49:48 +03:00
iiSaLMaN
ecd721e8c5 Add bypass fail property to Player 2019-09-18 22:49:28 +03:00
Dean Herbert
92556db9cd Add query-based filter modes to song select search field 2019-09-19 02:48:28 +09:00
Dean Herbert
2296ea75d7
Add reference to xmldoc 
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
 2019-09-19 02:03:30 +09:00
Dean Herbert
2fcc8c2d72 Simplify implementation, play fail animation during restart 2019-09-19 01:45:59 +09:00
Dean Herbert
1150e9fdfb Bring other mods up-to-date 2019-09-19 01:45:42 +09:00
Dean Herbert
ff3a7c1d13 Merge remote-tracking branch 'upstream/master' into auto-restart-mod-perfect 2019-09-19 01:36:29 +09:00
dependabot-preview[bot]
1d7377df65
Bump ppy.osu.Framework from 2019.911.0 to 2019.918.0 
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.911.0 to 2019.918.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-09-18 14:51:01 +00:00
Dean Herbert
5901a915e7 Always update drawable hitobject state on skin change 2019-09-18 20:19:57 +09:00
Dean Herbert
2046f64b22 Revert clamping logic 2019-09-18 16:07:02 +09:00
Dean Herbert
b4a396885d Merge remote-tracking branch 'upstream/master' into key-counter-fixes 2019-09-18 14:08:40 +09:00
Dean Herbert
91bdece9af Localise OrderChanged handling and fix callbacks 
The dragged item's position now only updates after the drag finishes. Local handling changes were required to ignore the bindable remove/add events that are fired as a result.
 2019-09-18 13:15:39 +09:00
Dean Herbert
7e791f7cd7 Expose as IBindableList 2019-09-18 13:14:33 +09:00
Dean Herbert
18fd82e83a Merge remote-tracking branch 'upstream/master' into randomise-song-playback 2019-09-18 13:14:08 +09:00
Dean Herbert
26eca5b1f4 Fix judgement sizes not matching skins stable 2019-09-18 02:56:03 +09:00
Dean Herbert
ba76f09c99 Add initial implementation of hit lighting 
Requires a supporting skin, like osu!classic for now.
 2019-09-18 02:49:54 +09:00
Dean Herbert
63cc8d4f90 Add hit lighting setting 2019-09-18 02:16:57 +09:00
Dean Herbert
b5b29a21e7 Move menu cursor rotation to more appropriate settings section 2019-09-18 02:15:18 +09:00
Dean Herbert
3ab352ffe5 Randomise beatmap playback order on startup 
Closes #6135.
 2019-09-17 23:15:03 +09:00
Dean Herbert
ec5f420818
Merge branch 'master' into key-counter-fixes 2019-09-17 22:56:34 +09:00
Dean Herbert
057c4aa795 Remove unused using statement 2019-09-17 22:42:20 +09:00
Dean Herbert
77947e8309 Fix rewind tests failing 2019-09-17 22:33:27 +09:00
Dean Herbert
38d85e44be Merge branch 'master' into key-counter-fixes 2019-09-17 22:33:15 +09:00
Dean Herbert
fd3e2375bb
Fix disclaimer potentially pushing a null screen (#6137) 
Fix disclaimer potentially pushing a null screen
 2019-09-17 16:39:04 +09:00
smoogipoo
f0bcb2b933 Debounce user-requested replay seeks 2019-09-17 16:12:18 +09:00
smoogipoo
efedfefe63 Fix disclaimer potentially pushing a null screen 2019-09-17 15:54:11 +09:00
Craftplacer
220fdd0a04 Make muteWarningShownOnce static 
... so it will actually get an instance per osu session.
 2019-09-16 06:56:52 +02:00
Bartłomiej Dach
a407e267a2 Fix PF/SD legacy mod conversion 
Upon investigating an user report in #6091 that indicated that viewing
replays using the Perfect mod would also display the Sudden Death mod
icon despite Perfect being the more restrictive of the two, it turned
out that the logic of importing legacy scores was missing that corner
case. A similar case of Double Time/Nightcore mutual exclusion was
handled, but PF/SD was missed.

Add analogous handling of PF/SD legacy mods for all four rulesets,
and additionally cover a tiny fraction of all cases with unit tests.
The most problematic cases (NC+HD and PF+SD) are covered in all four
basic rulesets.
 2019-09-15 22:55:25 +02:00
Craftplacer
cb033591c4
Merge branch 'master' into muted-notification 2019-09-15 17:59:27 +02:00
Craftplacer
ecce12981e Use block body for constructor to fix remaining code inspection issue 2019-09-15 17:47:44 +02:00
Craftplacer
e3884658af Resolve code inspection errors 2019-09-15 17:36:53 +02:00
Dean Herbert
2381b4c003 Move video behind storyboard 2019-09-16 00:20:56 +09:00
Craftplacer
ec788ac09d Make notification only show up once per session 2019-09-15 17:20:07 +02:00
Dean Herbert
e1de0b0537 Merge remote-tracking branch 'upstream/master' into fix-video-fill-mode 2019-09-16 00:19:30 +09:00
Craftplacer
08ab4e508f Use loadComponentSingleFile for caching 2019-09-15 17:15:52 +02:00
Craftplacer
811a08d18f Use Bindable instead of bool 2019-09-15 16:50:01 +02:00
Craftplacer
00e46fdefe Add check if game is muted by MuteButton 2019-09-15 16:32:23 +02:00
Craftplacer
0afb5c5bb0 Expose muted state from VolumeOverlay 2019-09-15 16:31:57 +02:00
Craftplacer
72af640df7 Expose VolumeOverlay as available dependencies 2019-09-15 16:31:40 +02:00
Craftplacer
4a10e6c44e Use ResolvedAttribute for NotificationOverlay 2019-09-15 16:11:45 +02:00
Craftplacer
78931c8e23 Implement notification when user has track or master volume muted 
This took around under a hour to implement, it has the same behavior and content from osu!stable.
A notification will show up when the user has either its master or track volume set to the minimum, clicking it will set it to the default values.
 2019-09-15 15:59:46 +02:00
Dean Herbert
fedbac74e4
Wait for cursor hiding using ManualResetEventSlim (#6112) 
Wait for cursor hiding using ManualResetEventSlim
 2019-09-15 15:00:38 +09:00
Andrei Zavatski
96453d8197 Remove redundant string interpolation 2019-09-15 02:46:28 +03:00
Andrei Zavatski
babd34470e Fix DrawableFlag returns empty texture if there's no flag avaliable for needed country 2019-09-15 02:33:21 +03:00
Bartłomiej Dach
dd9f620c23 Fix misleading xmldoc 2019-09-15 01:28:07 +02:00
Bartłomiej Dach
86588778b1 Implement fallback decoder registration 
After the preparatory introduction of LineBufferedReader, it is now
possible to introduce registration of fallback decoders that won't drop
input supplied in the first line of the file.

A fallback decoder is used when the magic in the first line of the file
does not match any of the other known decoders. In such a case,
the fallback decoder is constructed and provided a LineBufferedReader
instance. The process of matching magic only peeks the first non-empty
line, so it is available for re-reading in Decode() using ReadLine().

There can be only one fallback decoder per type; a second attempt of
registering a fallback will result in an exception to avoid bugs.

To address the issue of parsing failing on badly or non-headered files,
set the legacy decoders for Beatmaps and Storyboards as the fallbacks.

Due to non-trivial logic, several new, passing unit tests with possible
edge cases also included.
 2019-09-15 01:28:07 +02:00
Bartłomiej Dach
11eda44d34 Migrate decoding to line-buffered reader 
Migrate all usages of StreamReader in the context of decoding beatmaps,
storyboards or skins to the new LineBufferedReader.
 2019-09-15 01:28:07 +02:00
Bartłomiej Dach
7b1ff38df7 Implement line-buffered reader 
Add a line-buffered reader decorator operating on StreamReader
instances. The decorator has two main operations - PeekLine(), which
allows to see the next line in the stream without consuming it,
ReadLine(), which consumes and returns the next line in the stream, and
ReadToEnd() which reads all the remaining text in the stream (including
the unconsumed peeked line). Peeking line-per-line uses an internal
queue of lines that have been read ahead from the underlying stream.

The addition of the line-buffered reader is a workaround solution to
a problem with decoding. At current selecting a decoder works by
irreversibly reading the first line from the stream and looking for
a magic string that indicates the type of decoder to use.

It might however be possible for a file to be valid in format, just
missing a header. In such a case a lack of a line-buffered reader makes
it impossible to reparse the content of that first line. Introducing it
will however allow to peek the first line for magic first.

 - If magic is found in the first line, GetDecoder() will peek it and
   use it to return the correct Decoder instance. Note that in the case
   of JsonBeatmapDecoder the magic is the opening JSON object brace,
   and therefore must not be consumed.

 - If magic is not found, the fallback decoder will be able to consume
   it using ReadLine() in Decode().

This commit additionally contains basic unit tests for the reader.

Suggested-by: Aergwyn <aergwyn@t-online.de>
 2019-09-15 01:26:15 +02:00
Roman Kapustin
8456861b8d Wait for cursor hiding using ManualResetEventSlim 2019-09-14 17:08:56 +03:00
Andrei Zavatski
2783ae62ef Remove useless container 2019-09-14 06:34:57 +03:00
Andrei Zavatski
9febeb1f3d Add black background 2019-09-14 06:32:00 +03:00
Andrei Zavatski
a36c808682 Use Fit FillFode 2019-09-14 06:28:59 +03:00
Andrei Zavatski
8ad782a82d Fix RankingsHeader dropdown can be clickable when not visible 2019-09-14 06:16:25 +03:00
Andrei Zavatski
9a94405b3a Fix video playback is stretched on client resize 2019-09-14 06:05:09 +03:00
Dean Herbert
65aa7b2016 Recreate beatmap video on each consumption 
Should not be shared over multiple usages
 2019-09-14 00:07:06 +09:00
Dean Herbert
1b8d5decfa
Add beatmap video support (#5908) 
Add beatmap video support

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-09-13 23:31:34 +09:00
Dean Herbert
2cd3657b5e
Merge branch 'master' into beatmap-video 2019-09-13 23:08:57 +09:00
Dean Herbert
624e5644a4 Change osu!catch key trigger to occur on frame before positional change 2019-09-13 23:06:35 +09:00
Dean Herbert
9e53c091a3
Merge pull request #6095 from peppy/fix-test-dummy-api 
Fix incorrect DI usage of IAPIProvider in many tests
 2019-09-13 22:22:07 +09:00
Dean Herbert
2379b665e3 Use InvalidOperationException 2019-09-13 22:15:11 +09:00
Dean Herbert
d385c35955
Apply suggestions from code review 
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
 2019-09-13 21:55:45 +09:00
Andrei Zavatski
9e742839ac Use correct database migration 2019-09-13 13:57:55 +03:00
Andrei Zavatski
fb9b25b786 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video 2019-09-13 13:48:14 +03:00
Dan Balasescu
b10ce0b12d
Merge branch 'master' into key-counter-fixes 2019-09-13 19:43:33 +09:00
Andrei Zavatski
c13950fbbf Remove custom db additions 2019-09-13 13:43:21 +03:00
Andrei Zavatski
437e121056 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video 2019-09-13 13:39:58 +03:00
Dan Balasescu
125b3fda6c
Merge branch 'master' into improve-catch-replay-frames 2019-09-13 19:23:15 +09:00
Dean Herbert
e1ed5dfa7d
Reset DrawableHitObject lifetimes on state change (#6028) 
Reset DrawableHitObject lifetimes on state change

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-09-13 19:10:02 +09:00
Dean Herbert
614e68cdf9 Remove redundant BindTarget usage 2019-09-13 18:11:17 +09:00
Dean Herbert
031f0ee1e7 Consume ValueChanged and inline some pointless constants 2019-09-13 18:09:15 +09:00
Dean Herbert
1e4f3507ed Fix layout not matching web 2019-09-13 18:07:52 +09:00
Dean Herbert
0cc21c9c74 Fix changelog overlay potentially adding children after disposal 2019-09-13 17:21:47 +09:00
Dean Herbert
7cb79dd760 Fix incorrect DI usage of IAPIProvider in many tests 2019-09-13 17:15:33 +09:00
Andrei Zavatski
6867b3c232 Update resources 2019-09-13 10:56:21 +03:00
Andrei Zavatski
cb98b07e33 Merge master with conflicts resolved 2019-09-13 10:45:01 +03:00
Dean Herbert
ffd205f470 Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6076 2019-09-13 16:25:30 +09:00
Dean Herbert
78e7be919f Remove unnecessary container 2019-09-13 16:25:25 +09:00
Dean Herbert
c4f9be5913
Merge pull request #6093 from smoogipoo:fix-player-restart 
Fix player not correctly restarting after an unpause
 2019-09-13 16:09:41 +09:00
Dean Herbert
7818ecd71c Forward ValueChangedEvent instead 2019-09-13 16:03:44 +09:00
Dean Herbert
a05ae2c1b2 Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6082 2019-09-13 15:53:11 +09:00
smoogipoo
cf2f841b4d Fix player not correctly exiting after an unpause 2019-09-13 15:42:58 +09:00
Dean Herbert
c66e963705 Make constructor private 2019-09-13 15:42:36 +09:00
Dean Herbert
dc8c7a5041 Add null check for safety 2019-09-13 15:27:42 +09:00
Dean Herbert
44947aa9ed Make PopupDialog abstract 2019-09-13 15:27:29 +09:00
Dean Herbert
e2e87d5268
Merge branch 'master' into properly-fix-dialog-double-samples 2019-09-13 14:53:29 +09:00
Andrei Zavatski
5a72083c13 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title 2019-09-13 08:32:06 +03:00
Dean Herbert
43d7615734 Merge remote-tracking branch 'upstream/master' into rankings-scope-selector 2019-09-13 14:07:39 +09:00
Dean Herbert
0e679fb468 Use colour constant rather than opacity helper function 2019-09-13 14:06:19 +09:00
Dean Herbert
b917f29cfe Make GradientLineTabControl abstract 2019-09-13 13:59:06 +09:00
Dean Herbert
3b82c6db49
Merge branch 'master' into leaderboard-mod-icons-spacing 2019-09-13 13:27:18 +09:00
Joehu
2a8fa2f593 Refactor modsContainer on profile scores 2019-09-12 14:01:12 -07:00
Andrei Zavatski
99fc13b4d8 Update usage of the DismissableFlag 2019-09-12 19:34:58 +03:00
Andrei Zavatski
0142fcd07a Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title 2019-09-12 19:29:05 +03:00
Andrei Zavatski
b17d097a39 Simplify colour usage in GradientLine 2019-09-12 17:17:57 +03:00
Andrei Zavatski
4dd819c150 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector 2019-09-12 17:17:32 +03:00
Andrei Zavatski
cafb5105bc Rename HeaderFlag to DismissableFlag 2019-09-12 16:44:15 +03:00
Dean Herbert
2cb084666b
Merge branch 'master' into rankings-scope-selector 2019-09-12 22:37:14 +09:00
Dean Herbert
5f77236c01
Merge branch 'master' into closable-flag 2019-09-12 22:27:34 +09:00
Dean Herbert
b81b162ee1 Update InitialLifetimeOffset comment 2019-09-12 19:30:27 +09:00
Dean Herbert
9fc60aeefc Merge branch 'master' into reset-dho-lifetimes 2019-09-12 19:29:14 +09:00
Dean Herbert
f21e47d6d2 Move expire to DrawableHitObject 2019-09-12 19:29:08 +09:00
Dean Herbert
1dfd104690 Merge branch 'improve-catch-replay-frames' into key-counter-fixes 2019-09-12 18:34:00 +09:00
Dean Herbert
acdfeef1dc Improve how osu!catch stores and replays key actions 2019-09-12 18:33:46 +09:00
Dean Herbert
831d04f339 Don't use gameplay clock in KeyCounter 2019-09-12 15:48:07 +09:00
Dean Herbert
0cdf125c1e Handle key counter rewinding in a better way 
Use ElapsedFrameTime rather than storing state data
 2019-09-12 15:42:14 +09:00