1
0
mirror of https://github.com/ppy/osu.git synced 2024-10-01 19:17:25 +08:00
Commit Graph

7655 Commits

Author SHA1 Message Date
Dean Herbert
603a98f6cc
Merge branch 'master' into editor-hitobject-overlays 2018-03-01 21:33:27 +09:00
Dean Herbert
6dc9411a90 Don't use BufferedContainer for OsuLogo
Minor performance improvement. Not sure why this was done but it's not required any more.
2018-03-01 16:01:42 +09:00
smoogipoo
d5d4bcb558 Merge branch 'master' into editor-hitobject-overlays 2018-03-01 14:04:38 +09:00
smoogipoo
e869f7d05b Fix converted frames not getting time values 2018-03-01 02:28:15 +09:00
smoogipoo
fb16c3db87 Privatise CurrentTime's setter 2018-03-01 02:28:14 +09:00
smoogipoo
19911193cf Minify LegacyReplayFrame 2018-03-01 02:28:14 +09:00
smoogipoo
cf42d5bbd5 Remove mostly-unused Score parameter 2018-03-01 02:28:14 +09:00
smoogipoo
c9c65cab53 CreateReplayFrame -> CreateConvertibleReplayFrame 2018-03-01 02:28:14 +09:00
smoogipoo
ab4d7fa46e Remove IScoreParser interface
It's too early for this.
2018-03-01 02:28:14 +09:00
smoogipoo
a3c7755ade Implement a conversion process for ReplayFrames 2018-03-01 02:28:14 +09:00
Dean Herbert
b8ea4b11ab
Adjust range further
This is not a great idea.
2018-03-01 00:39:59 +09:00
Dean Herbert
e2f57ae346
Merge branch 'master' into parser-sanity-checks 2018-03-01 00:38:44 +09:00
jorolf
46dfb761c5 basic volume meter and testcase 2018-02-28 16:14:52 +01:00
Dean Herbert
eacb9ba743
Merge branch 'master' into user-profile-recent 2018-02-28 23:49:33 +09:00
Dean Herbert
36beaffa7a
Merge branch 'master' into editor-hitobject-overlays 2018-02-28 23:48:54 +09:00
Dean Herbert
bda673e6fe
Merge branch 'master' into player-reduced-parallax 2018-02-28 23:15:25 +09:00
Dean Herbert
572d3b1316 Move bpm clamping to TimingControlPoint, adjust range to 1-10000bpm
In line with stable editor restrictions
2018-02-28 22:53:28 +09:00
Dan Balasescu
33a64cb497
Merge branch 'master' into fix-multiple-tracks-playing 2018-02-28 22:53:02 +09:00
Dan Balasescu
25c748ed45
Merge branch 'master' into fix-player-exit 2018-02-28 22:05:44 +09:00
Dean Herbert
f9faf8e3d8 Localise offset clock usage out of Player as much as possible 2018-02-28 22:01:52 +09:00
Dean Herbert
01fcf9c813 Update in line with framework changes 2018-02-28 22:01:48 +09:00
Dan Balasescu
b898226a91
Merge branch 'master' into fix-mod-select 2018-02-28 21:52:07 +09:00
Dan Balasescu
a3d26d7d55
Merge branch 'master' into fix-song-select-iteration 2018-02-28 21:40:25 +09:00
naoey
2e535afb84
Remove redundant subsection title.
- Also handle opening UserProfile in LinkFlowContainer similar to how
beatmaps and channels are handled
2018-02-28 15:25:29 +05:30
Dean Herbert
5b4fef0180 Add bare minimum sanity checking of beatmap input values to make broken maps load
Resolves ppy/osu#1988.
2018-02-28 18:12:24 +09:00
Dean Herbert
968291c61e Sort hitobjects imported from legacy beatmps
Apaprently some ranked maps contain unordered hitobjects. We probably never want to allow for this.
2018-02-28 18:11:28 +09:00
Dean Herbert
6f44db6de0 Clamp at DifficultyControlPoint
This is what stable did.
2018-02-28 18:10:38 +09:00
Dean Herbert
08497427fd
Merge branch 'master' into fix-multiple-tracks-playing 2018-02-28 15:32:16 +09:00
Dean Herbert
bc0bbd2e3b
Merge branch 'master' into reduce-transforms 2018-02-28 14:39:31 +09:00
Dean Herbert
4a52db14d1 Fix depth of already-visible panels not being updates after a sorting change 2018-02-28 14:18:25 +09:00
Dean Herbert
dd6cf1379e Reduce parallax effect during gameplay
This also cleans up some shared code in OsuScreen.
2018-02-28 11:42:47 +09:00
Dean Herbert
0cd049c6b0 Rely less on zero-duration transform helpers
They have huge overheads.

See ppy/osu-framework#1411.
2018-02-28 11:00:54 +09:00
naoey
62913163e0
Fix long recent activity text overlapping timestamp.
- Also remove unnecessary fallback from absolute URL helper
2018-02-27 21:21:53 +05:30
Dean Herbert
510ecd7c87 Ensure selection is finalised before exiting song select
Resolves #2080.
2018-02-28 00:07:28 +09:00
Dean Herbert
f64afc738d Fix incorrect exit block conditional
Resolves #2130.
2018-02-27 23:59:34 +09:00
Dean Herbert
84a8fbe0b3 Fix null ref 2018-02-27 21:26:06 +09:00
Dean Herbert
034875be47 Fix bindings not being unbound on ModSelect
Resolves #2018.
Closes #2079.
2018-02-27 20:45:32 +09:00
Dean Herbert
9b44f447ca Fix song select iteration when all panels are filtered
Resolves #2069.
2018-02-27 17:52:12 +09:00
Dean Herbert
cff17f1864 Update in line with inverse ShoudProcessClock default 2018-02-27 17:23:38 +09:00
Dean Herbert
8e78a7b114 Fix HUD using incorrect clock for time display 2018-02-27 17:23:38 +09:00
Dean Herbert
37d2a2c3cc Rename clock types to match across classes 2018-02-27 17:23:38 +09:00
Dean Herbert
3d52ead213 Rename sourceClock 2018-02-27 17:23:38 +09:00
Dean Herbert
fee258f2f2 Rework PauseContainer to better pause 2018-02-27 17:23:38 +09:00
Dean Herbert
d4f1723ae6 Remove unnecessary secondary argument from HUDOverlay 2018-02-27 17:23:38 +09:00
Dean Herbert
0635ae2293 Include missing offset 2018-02-27 17:23:38 +09:00
Dean Herbert
9c0dfb7c8c Avoid creating an extra framed clock in SkipButton 2018-02-27 17:23:38 +09:00
Dean Herbert
73fb185132 Change the way ShouldProcessClock is specified in line with framework changes 2018-02-27 17:23:38 +09:00
Dean Herbert
d2f98642a1
Merge branch 'master' into confine-mode-reset 2018-02-26 20:59:53 +09:00
Dean Herbert
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays 2018-02-26 17:53:50 +09:00
naoey
a77d1eedae
Fix achievements parsing and add badges to recent activity. 2018-02-26 13:08:12 +05:30
naoey
a20e4bc2c3
Fix typos and missing fields in JSON mappings. 2018-02-26 11:46:16 +05:30
Dean Herbert
9cbed461c4
Merge branch 'master' into sliderbody-rework 2018-02-26 15:00:18 +09:00
naoey
5724618b2a
Add license headers and sanitise open profile argument. 2018-02-26 09:58:11 +05:30
naoey
1ad45b0941
R# fixes. 2018-02-26 01:21:31 +05:30
naoey
75fdca928e
Handle links correctly and don't re-open profile if the user is same. 2018-02-26 01:21:29 +05:30
naoey
bb40919f9c
Add link handling to recent activities.
- Add a show user action to link handling
2018-02-26 01:21:27 +05:30
naoey
7e4bd36391
Create drawable and add response to profile.
- Add missing JSON fields to response model
- Add missing enum value
2018-02-26 01:21:24 +05:30
naoey
e3a1b07172
Create API request and reponse model. 2018-02-26 01:21:16 +05:30
Dean Herbert
ab9aed351f Remove null channels from SkinnableSound playable channels 2018-02-25 17:14:35 +09:00
Dean Herbert
4a52df2dd4 Apply review 2018-02-24 23:07:02 +09:00
Dean Herbert
768e0a4e2a Add SkinnableSound class
Tidy things up, move logic out of SampleInfo.
2018-02-24 22:47:14 +09:00
Dean Herbert
a312fb365a Merge remote-tracking branch 'ppy/master' into skinning-basics 2018-02-24 22:41:17 +09:00
V.Kalyuzhny
ef6b207c7e Fix file case 2018-02-24 14:18:53 +02:00
smoogipoo
066abfbdbc Rename PositionAt -> CurvePositionAt to represent its new meaning 2018-02-24 02:43:36 +09:00
smoogipoo
8c90abe0dc Make slider control points relative to start position 2018-02-23 20:59:27 +09:00
smoogipoo
278b25bcbd Fix border being the wrong size 2018-02-23 15:29:56 +09:00
smoogipoo
d72290ee24 Make ScaledContainer private 2018-02-23 15:06:08 +09:00
Dean Herbert
a36986ef5a Make ComponentName readonly 2018-02-23 14:28:57 +09:00
Dean Herbert
0e20c4e6bb Fix typo 2018-02-23 14:27:53 +09:00
Dean Herbert
ff75cf6b75 Remove unnecessary braces 2018-02-23 14:27:39 +09:00
Dean Herbert
f81eb2de65 Remove unnecessary local store 2018-02-23 14:24:32 +09:00
Dean Herbert
c0d983bbdf
Merge branch 'master' into PlayerBase 2018-02-23 13:51:11 +09:00
Dean Herbert
92d20eea8c Add missing licence header 2018-02-23 13:38:12 +09:00
Dean Herbert
6ceabfe19e Add basic hitsound skinning 2018-02-23 13:38:12 +09:00
Dean Herbert
84b707f4f8 Add basic hitcircle skinning 2018-02-23 13:38:12 +09:00
Dean Herbert
3726db53b5 Allow instantiation of skins 2018-02-23 13:38:12 +09:00
Dean Herbert
e9c5834387 Add query method for now 2018-02-23 13:26:01 +09:00
Dean Herbert
72fcbfe12b Merge remote-tracking branch 'upstream/master' into editor-hitobject-overlays 2018-02-23 12:37:30 +09:00
Dean Herbert
402d71a8d9 Add user skin setting storage 2018-02-22 16:29:05 +09:00
Dean Herbert
659cf629b6 Add skin seleciton dropdown to settings 2018-02-22 15:46:11 +09:00
Dean Herbert
2351b6ab26 Add migration 2018-02-22 15:46:11 +09:00
Dean Herbert
4c14b32783 Add basic skin database model layout and importing 2018-02-22 15:46:11 +09:00
Dean Herbert
c070c69522 Update framework 2018-02-22 15:01:53 +09:00
smoogipoo
0cdf6fa7e2 Make HitObjectOverlay into an OverlayContainer 2018-02-22 14:36:58 +09:00
Dean Herbert
871bcb4142
Merge branch 'master' into sign-in-edits 2018-02-22 14:35:29 +09:00
smoogipoo
45c579630d Make selectionLayer handle input below object overlays 2018-02-22 14:34:37 +09:00
Dan Balasescu
6cc54a464c
Merge branch 'master' into editor-hitobject-overlays 2018-02-22 14:25:27 +09:00
smoogipoo
07252254eb Fix post-merge issues 2018-02-22 14:22:04 +09:00
Dean Herbert
ee9a45cc45
Merge branch 'master' into sign-in-edits 2018-02-22 14:18:49 +09:00
Dean Herbert
f2b3d9a0e8 Change some missed instances 2018-02-22 14:17:35 +09:00
smoogipoo
99e9eb81f2 Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays 2018-02-22 14:16:01 +09:00
Dean Herbert
a3336f2577
Merge branch 'master' into fix-editor-osu-scale 2018-02-22 14:14:41 +09:00
smoogipoo
ded2644df8 Merge branch 'master' into editor-hitobject-overlays 2018-02-22 14:08:36 +09:00
Joseph Madamba
3d4bed462b
Reword sign in text 2018-02-21 20:54:47 -08:00
Dean Herbert
7c942eb592 Tidy up layer container logic 2018-02-22 13:42:36 +09:00
Dean Herbert
b74cfffc6f
Merge branch 'master' into editor-hitobject-movement 2018-02-22 13:19:39 +09:00
Dean Herbert
c84ded258f Reset mouse confine mode on input setting reset hotkey 2018-02-22 10:08:56 +09:00
smoogipoo
5faec5c2f1 Add a separate property to control playfield area 2018-02-21 20:54:33 +09:00
smoogipoo
6757be2007 Fix incorrect RelativeChildSize in Catch 2018-02-21 20:15:51 +09:00
smoogipoo
f012cce668 Rewrite some xmldocs to make methods easier to understand 2018-02-21 17:33:22 +09:00
smoogipoo
4934ef7429 Add playfield aspect ratio + scaling modifications to composer layers 2018-02-21 11:07:42 +09:00
smoogipoo
7fd7dc1538 Extract playfield scaling into a separate class
And make it more general.
2018-02-21 11:07:42 +09:00
Dean Herbert
ba10eb5e50
Merge branch 'master' into osu-rulesetcontainer-aspect 2018-02-21 10:13:44 +09:00
smoogipoo
7fe0989427 Merge branch 'general-slider-improvements' into editor-hitobject-overlays 2018-02-20 23:51:47 +09:00
smoogipoo
ad2f556133 Add hitobject overlays to selected hitobjects 2018-02-20 18:01:45 +09:00
Dean Herbert
cce7855bf9
Merge branch 'master' into fix-selection-border-radius 2018-02-20 15:28:51 +09:00
smoogipoo
2a5bfdb4b8 Deselect hitobjects that are now not in the selection quad 2018-02-20 15:06:51 +09:00
smoogipoo
2f4925d031 Add some xmldocs 2018-02-20 15:06:14 +09:00
smoogipoo
285df52f43 Encapsulate logic for selecting/deselecting further 2018-02-20 14:54:45 +09:00
smoogipoo
995ecb7d94 Make selectedHitObjects into a HashSet for quick Contains checks 2018-02-20 14:48:35 +09:00
smoogipoo
87065a0b13 Rename + publicise DeselectAll 2018-02-20 14:38:57 +09:00
smoogipoo
423fe4eba8 Combine border radiuses of selection and capture boxes 2018-02-20 14:25:42 +09:00
Dan Balasescu
3d7f998c9b
Merge branch 'master' into osu-rulesetcontainer-aspect 2018-02-20 14:07:04 +09:00
smoogipoo
4da93e8f1d Merge remote-tracking branch 'origin/master' into editor-hitobject-movement 2018-02-20 14:03:47 +09:00
smoogipoo
8f25a5da66 Add playfield aspect ratio + scaling modifications to composer layers 2018-02-20 14:01:33 +09:00
smoogipoo
4a5cd6520c Extract playfield scaling into a separate class
And make it more general.
2018-02-20 13:50:31 +09:00
Dean Herbert
835136aecb
Merge branch 'master' into api-interface 2018-02-20 09:33:53 +09:00
Dean Herbert
f41a40be15
Merge branch 'master' into editor-hitobject-movement 2018-02-19 17:59:50 +09:00
Dean Herbert
fae6ea1ee2
Merge branch 'master' into storyboard-improvements 2018-02-19 17:28:53 +09:00
smoogipoo
4898c321f8 Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement 2018-02-19 17:07:03 +09:00
smoogipoo
b7be162f28 Remove AspectAdjust property (override GetAspectAdjustedSize instead) 2018-02-19 17:05:10 +09:00
smoogipoo
cd2c9a9de6 Adjust xmldoc and rename to GetAspectAdjustedSize 2018-02-19 17:04:18 +09:00
Dean Herbert
d70d40e3b8 Add back forgotten score store to valid importers 2018-02-19 15:52:14 +09:00
Dan Balasescu
34f76a4136
Merge branch 'master' into storyboard-improvements 2018-02-19 15:40:09 +09:00
Dan Balasescu
80010dd845
Merge branch 'master' into api-interface 2018-02-19 15:24:50 +09:00
Dan Balasescu
5401b0dfcd
Merge branch 'master' into abstract-model-managers 2018-02-19 14:56:21 +09:00
Dean Herbert
7c43a3b4c0
Merge branch 'master' into storyboard-improvements 2018-02-19 14:54:12 +09:00
Dean Herbert
57e61b0b0e Update xmldoc 2018-02-19 14:50:42 +09:00
Dean Herbert
8b89735e9e Improve xmldoc for DatabaseContextFactory.Get 2018-02-19 14:17:41 +09:00
Dean Herbert
a7915e7041 Fix typo 2018-02-19 14:00:48 +09:00
Dean Herbert
e0faf14a3e Actually consume ReplacesBackground 2018-02-19 12:33:07 +09:00
Dean Herbert
58af66bfc0 Merge branch 'master' into editor-hitobject-movement 2018-02-16 13:59:11 +09:00
Dean Herbert
75dcf72520 Improve testability of API 2018-02-16 13:57:39 +09:00
Dean Herbert
29adedfa96 Collapse visual settings by default in player 2018-02-16 12:47:32 +09:00
Dean Herbert
21b641b302 Give storyboards a BeatmapInfo to reduce weird method calls
Also removes unnecessary background texture (the actual storyboard background spec wasn't implemented correctly anyway).
2018-02-16 12:09:23 +09:00
Dean Herbert
9760f30ce9 Tidy things up to make more sense 2018-02-16 12:08:36 +09:00
Dean Herbert
f22f9b5de0
Merge branch 'master' into PlayerBase 2018-02-16 11:26:57 +09:00
Dean Herbert
ddf49c2e65 Fix intro not being replaced by a playable song when entering song select 2018-02-16 10:45:15 +09:00
TocoToucan
c57e8785e2 Move all storyboard loading to Player itself 2018-02-15 23:57:53 +03:00
Dean Herbert
9ea7f12f8d
Merge branch 'master' into abstract-model-managers 2018-02-15 20:39:08 +09:00
Dean Herbert
96c23d2a62 Add override to fix left/right arrow control 2018-02-15 19:41:15 +09:00
smoogipoo
cbac4de9c2 Expire + dispose CaptureBoxes 2018-02-15 19:11:29 +09:00
smoogipoo
ebcdb62570 Remove now unneeded hide 2018-02-15 19:10:55 +09:00
smoogipoo
9583191556 Dispose SelectionBoxes when they die 2018-02-15 19:08:03 +09:00
smoogipoo
4ac0c48ba6 Add fadein to SelectionBox 2018-02-15 19:07:53 +09:00
smoogipoo
dcbc8c3dcd Remove animated capture boxes for now 2018-02-15 18:06:33 +09:00
Dean Herbert
fa05822d7d Add missing licence headers 2018-02-15 16:33:33 +09:00
Dean Herbert
b9ef32b09b Further xmldoc and restoring of Cleanup method 2018-02-15 16:31:42 +09:00
Dean Herbert
1b13be1372 Cleanups and xmldoc additions 2018-02-15 16:24:14 +09:00
Dean Herbert
8c1d581fb3 Fix hiding beatmaps not refreshing correctly 2018-02-15 16:15:40 +09:00
Dean Herbert
89cf794f98 Add a lower level ConsumableItems implementation 2018-02-15 16:15:40 +09:00
Dean Herbert
671475f3b4 Ensure undeleted items are populated with includes before firing events 2018-02-15 16:15:40 +09:00
Dean Herbert
e51450a064 Fix query construction 2018-02-15 15:24:28 +09:00
Dean Herbert
d07ab1fbea Fix undelete all 2018-02-15 15:14:55 +09:00
Dean Herbert
fe5df663be Add more xmldoc 2018-02-15 15:14:46 +09:00
Dean Herbert
a0a65abcac Crentalise all import logic 2018-02-15 14:22:39 +09:00
Dean Herbert
d3dd31dadb Make deletion and purging logic even more global 2018-02-15 14:22:39 +09:00
Dean Herbert
d340509b1d Move ArchiveReaders to a more global namespace
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
6ff63c2f0c Move deletion to ArchiveModelImportManager 2018-02-15 14:22:39 +09:00
Dean Herbert
d8f84fcca3 Give ArchiveReader a filename 2018-02-15 14:22:39 +09:00
Dean Herbert
e0d28564d0 Move import logic to shared implementation 2018-02-15 14:22:39 +09:00
Dan Balasescu
c5b71d2cb7
Remove unused using 2018-02-14 23:15:34 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests 2018-02-14 22:48:29 +09:00
smoogipoo
115484741d Capture -> Select 2018-02-14 17:54:43 +09:00
smoogipoo
a9d14eadac Add clearSelection method 2018-02-14 17:53:04 +09:00
smoogipoo
344da5965c Add a CaptureBox that encloses hitobjects from the drag selection 2018-02-14 14:38:37 +09:00
smoogipoo
fcbeb97a54 Merge remote-tracking branch 'origin/master' into editor-hitobject-movement 2018-02-14 14:08:36 +09:00
smoogipoo
bfb21d3d69 Merge remote-tracking branch 'origin/master' into drag-lenience 2018-02-13 21:39:28 +09:00
Dean Herbert
30581d03d2
Merge branch 'master' into PlayerResumeHotfix 2018-02-13 20:34:22 +09:00
Dean Herbert
86acc84988 Apply formatting 2018-02-13 20:23:51 +09:00
Dean Herbert
5ecb77fda7 Merge remote-tracking branch 'upstream/master' into default-approachrate 2018-02-13 20:23:01 +09:00
Dean Herbert
6f29cd35af
Merge branch 'master' into PlayerResumeHotfix 2018-02-13 20:21:45 +09:00
Dean Herbert
f4ddc0717b Fix incorrect PlaylistItem drag handling 2018-02-13 20:08:59 +09:00
Dean Herbert
e2d11af4ef Fix incorrect MusicController drag handling 2018-02-13 20:08:59 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement 2018-02-13 18:56:16 +09:00
Dean Herbert
179a151653
Merge branch 'master' into beatmap-import-simplification 2018-02-13 16:54:52 +09:00
Dean Herbert
8c42225646 Fix outdated xmldoc 2018-02-13 15:08:51 +09:00
Dean Herbert
50cdb03cd9 Don't dispose read contexts 2018-02-13 15:08:45 +09:00
Dean Herbert
ab34123ba8 Remove unnecessary class variable 2018-02-13 15:05:19 +09:00
Shane Woolcock
d603d032d5 Inlined delete beatmap dialog 2018-02-13 16:26:05 +10:30
Dean Herbert
3561326306 Remove fixed issue 2018-02-13 14:54:46 +09:00
Dean Herbert
e8e093d6f2 Fix incorrect xmldoc 2018-02-13 14:54:01 +09:00
Shane Woolcock
8d313486b3 Add a confirmation dialog to the Delete option in the beatmap context menu 2018-02-13 00:40:34 +10:30
Dean Herbert
a738664167 Add interface for database context factory 2018-02-12 23:10:05 +09:00
Dean Herbert
64cda9fd0f Remove incorrect assert assumption 2018-02-12 22:16:09 +09:00
Dean Herbert
8b37fde15b Only write when writes occur
Also add finaliser logic for safety. Also better threading. Also more cleanup.
2018-02-12 19:57:21 +09:00
smoogipoo
87baa6febd Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments 2018-02-12 19:08:13 +09:00
smoogipoo
bfedd1cee0 Remove nested container 2018-02-12 19:01:50 +09:00
smoogipoo
c3212d36ef Remove handles for now (will be re-implemented) 2018-02-12 18:36:16 +09:00
smoogipoo
e10bb2db05 Unify SelectionLayer and HitObjectCapturer, rename SelectionBox 2018-02-12 18:35:01 +09:00
smoogipoo
20c0dee17d Remove SelectionInfo 2018-02-12 18:22:52 +09:00
smoogipoo
ee168f9a77 Split out drag selection box from post-capture box
Cleans up a lot of code, removes handles for now.
2018-02-12 18:20:05 +09:00
Dean Herbert
edc3638175 DatabaseWriteUsage 2018-02-12 17:55:11 +09:00
smoogipoo
1adbe3585c HitObjectSelectionBox -> SelectionDragger 2018-02-12 16:03:59 +09:00
smoogipoo
cfb2b3f1e8 Rework SelctionLayer to support click-selections 2018-02-12 16:02:42 +09:00
Dean Herbert
cc948d688f Fix unrelated spacing issue 2018-02-12 15:39:13 +09:00
Dean Herbert
e54de0c267 Remove sqlite-net migration
Anyone that may have benefited from this already has.
2018-02-12 15:25:09 +09:00
TocoToucan
86f200e257 Fix possible nullref 2018-02-09 22:04:39 +03:00
TocoToucan
a86a4f49cf Resolve "Pressing escape on continuing causes the game to return to song select" problem without removing Delay 2018-02-09 21:20:49 +03:00
Dean Herbert
721bb7e4dd Add proper handling for OnlineBeatmapSetID conflicts
Not yet working
2018-02-09 21:31:33 +09:00
Dean Herbert
a1513351c0 Add missing licence header 2018-02-09 20:35:54 +09:00
Dean Herbert
d547caa04e Further improve xmldoc 2018-02-09 19:44:17 +09:00
Dean Herbert
867b1b5f65 Move public methods up 2018-02-09 19:39:02 +09:00
Dean Herbert
c84cb0b33c Fix/add some xmldoc 2018-02-09 19:32:28 +09:00
Dean Herbert
db654004b7 Move BeatmapManagerWorkingBeatmap to its own file 2018-02-09 19:32:18 +09:00
Dean Herbert
fb6dc922c6 Reorder file 2018-02-09 19:25:55 +09:00
Dean Herbert
c7de79caf6 Remove storage class variable 2018-02-09 19:24:17 +09:00
Dean Herbert
5e0cb9d4b9 Simplify beatmap store retrieval 2018-02-09 19:12:29 +09:00
Dean Herbert
a166932468 Add deletion test 2018-02-09 17:51:29 +09:00
Dean Herbert
3b7018fcd6 Simplify beatmap import process 2018-02-09 17:22:48 +09:00
smoogipoo
0dab70cc05 Fix license header 2018-02-09 12:48:22 +09:00
Bang Sunghwan
3894622ddc Remove redundant initializing field by default 2018-02-09 09:55:02 +09:00
Bang Sunghwan
f20e3ff31d Fix ApproachRate setting only DEFAULT_DIFFICULTY 2018-02-09 09:45:43 +09:00
Bang Sunghwan
cc6114b344 Fix ApproachRate not inheriting OverallDifficulty when it is undefined 2018-02-09 09:31:19 +09:00
TocoToucan
4535e09607 Add missing license header 2018-02-09 00:36:31 +03:00
TocoToucan
a860dd7208 Preview visual settings at the “loading” screen 2018-02-09 00:06:24 +03:00
TocoToucan
d437c1d7ec Introduce PlayerBase class 2018-02-08 23:28:42 +03:00
TocoToucan
77a8b36529 Schedule Resume method call without delay 2018-02-08 22:30:15 +03:00
smoogipoo
77149b00ce Merge branch 'codestyle-fixes' into update-branch 2018-02-08 23:47:31 +09:00
smoogipoo
4699b5ad7c Fix a few code styling issues
These are present in the netstandard branch (the rules aren't working there - probably using the wrong configuration).
2018-02-08 23:47:03 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Dean Herbert
e107566575 Update user object to match new standardised api 2018-02-08 18:06:04 +09:00
Dean Herbert
534eb223b3
Merge branch 'master' into unified-hitwindows 2018-02-08 17:46:29 +09:00
smoogipoo
0511728fbe Remove "keypress" from comment 2018-02-08 17:38:46 +09:00
Dean Herbert
789e25069f Fix non-visual tests not cleaning up previous executions 2018-02-08 17:07:59 +09:00
Dean Herbert
cafa605b90 Fix visual settings checkboxes playing sounds in bindable binding
Move sound binding to much later in the process to avoid programmatic checkbox changes triggering interaction sounds
2018-02-08 14:43:47 +09:00
smoogipoo
46284c61ae Return HitResult.None instead of null 2018-02-08 14:25:59 +09:00
smoogipoo
c537af0289 Fix/improve commends 2018-02-08 14:25:44 +09:00
smoogipoo
a6f1a4689e Fix incorrect value copy-pasta 2018-02-08 14:16:37 +09:00
smoogipoo
17aa915c77 Rename DifficultyRange parameters 2018-02-08 13:57:45 +09:00
smoogipoo
802aaefe35 Give rulesets a way to disable/enable perfect/ok hit results 2018-02-08 13:54:08 +09:00
smoogipoo
cfdeac6428 Make hit windows settable by derived classes 2018-02-08 13:38:31 +09:00
smoogipoo
beaecbafbd Merge branch 'master' into unified-hitwindows 2018-02-08 13:22:44 +09:00
smoogipoo
ccc948a0b9 Update framework (testing) 2018-02-08 12:45:51 +09:00
Dean Herbert
a70989cb70 Rely on bindable's formatting rather than setting a default 2018-02-08 11:12:05 +09:00
Dean Herbert
7e83aedb86
Merge branch 'master' into slider-tooltip-precision 2018-02-08 11:00:46 +09:00
Dean Herbert
67bd375bfa Merge remote-tracking branch 'upstream/master' into raw-input-fixes 2018-02-07 22:05:44 +09:00
smoogipoo
ee93c0bc19 Use an endian-independent method to find precision 2018-02-07 20:03:37 +09:00
Dean Herbert
6b6d4f9527
Merge branch 'master' into country_rank 2018-02-07 18:49:40 +09:00
Dean Herbert
4c3606f8fb Handle non-present country rank 2018-02-07 18:34:38 +09:00
Dean Herbert
93c4612f4f Add comment about deserialising helper 2018-02-07 18:18:26 +09:00
Dean Herbert
647cc4bdad Remove in-between properties 2018-02-07 18:04:32 +09:00
smoogipoo
23d4c20726 Apply suggestions to normalisation function 2018-02-07 17:31:18 +09:00
Dean Herbert
20c00720e5 Fix formatting 2018-02-07 17:18:38 +09:00
smoogipoo
8e280b6b0c Use 0.1 precision for playback speed 2018-02-07 13:28:10 +09:00
smoogipoo
bd5db6fc8d Make playback speed sliderbar use the tooltip text as its display 2018-02-07 13:26:41 +09:00
smoogipoo
406ec6e92d Make OsuSliderBar always use number of digits from precision 2018-02-07 13:26:17 +09:00
tgi74000
bcd568e607 Check for possible null ranks 2018-02-06 23:00:52 +01:00
tgi74000
d86ce816c7 Add support for country rank 2018-02-06 21:40:52 +01:00
Shane Woolcock
e0c52c69cf Prevent revert-to-default OnHover from hiding visual settings at beatmap load 2018-02-06 22:31:30 +10:30
Dan Balasescu
b46c388b4c
Merge branch 'master' into fix-skip-button 2018-02-06 14:50:37 +09:00
Dean Herbert
9bfec9b233 Tidy up state change logic 2018-02-06 14:30:01 +09:00
smoogipoo
3fe3123cdc Merge branch 'master' into ismaskedaway-fix 2018-02-06 14:29:52 +09:00
Dean Herbert
dd8955cd90 Fix skip button not receiving screen-wide input 2018-02-06 14:29:03 +09:00
Dean Herbert
dfc344b47a Update OpenTK version 2018-02-06 13:47:54 +09:00
Dean Herbert
30b9439263 Fix default mouse sensitivity not reverting correctly 2018-02-05 20:00:36 +09:00
Dean Herbert
7e56519d6a Add setting for absolute input mapping 2018-02-05 16:13:39 +09:00
Dean Herbert
6b35ef7063 Update OpenTK version 2018-02-05 16:13:30 +09:00
Imnooby
c4f3223e34 Stops non-url text from being hyperlinks
Fixed crash when you attempted to click one
2018-02-03 18:24:49 -06:00
smoogipoo
9225e883c1 Add + use HalfHitWindow 2018-02-02 20:29:50 +09:00
smoogipoo
6976347d64 Protect hit window values 2018-02-02 20:28:59 +09:00
smoogipoo
e45b26c742 Cleanup/minify HitWindows 2018-02-02 19:35:44 +09:00
smoogipoo
d371425c87 BAD -> MEH 2018-02-02 18:56:44 +09:00
smoogipoo
70462ebee3 Make HitWindows settable by derived HitObjects 2018-02-02 18:53:05 +09:00
smoogipoo
acf20c079c General improvements around usage of HitWindows for mania 2018-02-02 18:47:54 +09:00
smoogipoo
558c53a6ba Give HitObject some HitWindows 2018-02-02 18:47:10 +09:00
smoogipoo
a0c1662fb7 Move mania's HitWindows to osu.Game 2018-02-02 17:52:55 +09:00
smoogipoo
75858bd3de Update in-line with framework changes 2018-02-02 15:41:54 +09:00
Dean Herbert
39160d895c Update design of "revert to default" button
Also fixes some inconsistencies in padding
2018-02-02 15:18:39 +09:00
Dan Balasescu
2c45fc67a4
Merge branch 'master' into PlayerSettigsOverlay_InputHandle 2018-02-02 11:12:33 +09:00
tgi74000
b0fbae9dfc Fix PlayerSettingsOverlay not reappearing when Hidden 2018-02-01 16:07:49 +01:00
tgi74000
e08a9350a0 Store and show SSPlus and SPlus statistics 2018-02-01 15:19:49 +01:00
Dean Herbert
5ba84a67f1
Merge branch 'master' into catmull-sliders 2018-02-01 20:58:33 +09:00
Dan Balasescu
c486609174
Merge branch 'master' into fix-replay-time-stop 2018-02-01 20:08:58 +09:00
smoogipoo
13f16077d4 Implement Catmull-Rom curve approximator 2018-02-01 20:04:41 +09:00
Dean Herbert
9d4ec6f8b5 Merge branch 'master' into ismaskedaway-input-fix 2018-02-01 19:29:10 +09:00
Dean Herbert
1d687c470c Fix clock not incrementing beyond last frame of replay 2018-02-01 18:49:14 +09:00
Dean Herbert
1cc7c23982 Hits -> JudgedHits 2018-02-01 18:08:15 +09:00
Dan Balasescu
c1d5a68e4d
Merge branch 'master' into VisualSettingsOverlay 2018-02-01 16:37:04 +09:00
Dan Balasescu
0589708da5
Merge branch 'master' into inactive-volume-duck 2018-02-01 16:21:33 +09:00
Dan Balasescu
d332a2dddd
Merge branch 'master' into url-parsing-support 2018-02-01 16:13:32 +09:00
smoogipoo
1b99e54005 Fix IsMaskedAway not being up-to-date when fastfowarding replays 2018-02-01 15:21:23 +09:00
Dean Herbert
cd37be9440
Merge branch 'master' into better-slider-objects 2018-02-01 08:39:39 +09:00
Dean Herbert
cdf4d9b033 Remove empty line 2018-01-31 18:33:18 +09:00
Dean Herbert
46a7de1845
Merge branch 'master' into fix-taiko-fastforwarding 2018-01-31 18:30:41 +09:00
Dean Herbert
888d2362fd
Merge branch 'master' into fix-taiko-fastforwarding 2018-01-31 18:30:15 +09:00
Dean Herbert
335f0d577c Add the ability to duck volume when the game is inactive 2018-01-31 18:16:55 +09:00
Dean Herbert
fef69cea04 Revert "Add volume ducking"
This reverts commit 01325de3a2897a24b2ba0f585d7e976d0fb44b70.
2018-01-31 18:12:25 +09:00
Dean Herbert
47b92f3d1d Fix mute button not prolonging volume control display 2018-01-31 18:00:44 +09:00
Dean Herbert
93ffa1f8a2 Fix button alignment and animation 2018-01-31 17:36:53 +09:00
Dean Herbert
86f5c9d6f1 Add inactive volume ducking, rather than outright mute 2018-01-31 16:57:26 +09:00
Dean Herbert
97ae44f23c Remove outwards exposure of mute property 2018-01-31 16:56:26 +09:00
Dean Herbert
2865dd3a10 Replace missed hardcoded int with enum reference 2018-01-31 16:20:01 +09:00
Dean Herbert
5a99651561 Remove unnecessary arrays 2018-01-31 16:10:55 +09:00
Dean Herbert
042a34e1c2 Add migration to ensure database aligns to changed enum 2018-01-31 16:10:48 +09:00
Dean Herbert
b47061f43d Merge remote-tracking branch 'upstream/master' into mute-toggle 2018-01-31 14:20:15 +09:00
Dean Herbert
a94b4a9ea0
Merge branch 'master' into url-parsing-support 2018-01-30 18:55:50 +09:00
Dean Herbert
df65443f07 Merge branch 'master'
Conflicts:
	osu-framework
	osu.Game/Screens/Play/Player.cs
2018-01-30 18:31:03 +09:00
Dean Herbert
28b67e3d77
Merge branch 'master' into url-parsing-support 2018-01-30 17:47:55 +09:00
Dean Herbert
53129e5235 Fix text getting truncated after last link in chat line 2018-01-30 17:47:22 +09:00
Dean Herbert
e5188fd151 Add better channel test cases (testing non-existent channels) 2018-01-30 17:43:19 +09:00
Dean Herbert
d81d884a01 Remove unnecessary paren handling from regex
Can't find a reason for this to exist
2018-01-30 17:16:01 +09:00
Dean Herbert
662c7c5bdc Fix osump links 2018-01-30 16:44:43 +09:00
Dean Herbert
dd2731b873 Add support for markdown style links 2018-01-30 16:38:45 +09:00
smoogipoo
c97ea3ed60 Post-process beatmap before applying defaults 2018-01-30 15:49:55 +09:00
smoogipoo
b4cd8ea716 GlobalKeyBindingContainer -> GlobalActionContainer
Consitent with "FrameworkActionContainer".
2018-01-30 14:54:30 +09:00
smoogipoo
ef3fb8c05a InputManager -> Container where KeyBindings are involved 2018-01-30 14:49:12 +09:00
Dean Herbert
df221b6786 Remove usage of ValueTuple to allow for dynamic recompilation 2018-01-29 17:45:23 +09:00
Dan Balasescu
2bae22999d
Merge branch 'master' into global-mod-binding 2018-01-29 15:18:11 +09:00
Dean Herbert
6e0cb1adb3 Remove redundant arguments 2018-01-29 15:05:07 +09:00
Dan Balasescu
ea0ef96557
Merge branch 'master' into global-mod-binding 2018-01-29 15:04:20 +09:00
Dean Herbert
0879366a30 Merge remote-tracking branch 'upstream/master' into add-r#-annotation-support 2018-01-29 13:52:21 +09:00
Dean Herbert
2b14438fe4 Merge remote-tracking branch 'upstream/master' into url-parsing-support 2018-01-29 12:55:32 +09:00
Dean Herbert
247833174c Fix incorrect case on migration file 2018-01-27 23:20:49 +09:00
Dean Herbert
a5b0d51205 Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
#	osu.Game/osu.Game.csproj
2018-01-27 14:06:58 +09:00
TocoToucan
ce4122b3c4 Display visual settings overlay on PlayerLoader screen 2018-01-26 23:29:54 +03:00
TocoToucan
d82835107c Remove autohide and clock related logic from Visual settings overlay 2018-01-26 22:20:24 +03:00
TocoToucan
615c831069 Merge from ppy/master 2018-01-26 21:56:17 +03:00
FreezyLemon
8f0ab2040f Add Jetbrains.Annotations NuGet package 2018-01-26 12:46:28 +01:00
Dean Herbert
7852015db3 Remember mod selection when re-entering song select
Removes mod application when exiting back to main menu.

Alternative to #1968.
Closes #1961.
2018-01-26 19:32:57 +09:00
smoogipoo
5742e61e68 Merge remote-tracking branch 'origin/master' into ruleset-configs 2018-01-26 15:39:09 +09:00
smoogipoo
929a710dfc Merge remote-tracking branch 'peppy/databased-config' into ruleset-configs 2018-01-26 15:37:57 +09:00
Dan Balasescu
81c759f1e1
Make field readonly 2018-01-26 15:17:56 +09:00
smoogipoo
0a505dde2e Remove MaskingAffectsInput override 2018-01-26 14:47:16 +09:00
Dean Herbert
7a2420ead2 Fix a couple of regressions 2018-01-26 08:21:09 +09:00
Dean Herbert
03154dbc63 Fix incorrect initial migration
Also adds variant to settings
2018-01-25 23:41:03 +09:00
Dean Herbert
80b8780f56 Revert "Remove game-wise settings store for the time being"
This reverts commit 72df2c681b.
2018-01-25 18:08:50 +09:00
smoogipoo
57cd50c45e Reorder the way input is handled for replays
Fixes https://github.com/ppy/osu/issues/1625 .
2018-01-25 17:39:50 +09:00
Dean Herbert
fd7d7c3953
Merge branch 'master' into MakeMusicControllerDraggableAgain 2018-01-25 09:01:54 +09:00
Dean Herbert
b06f60ac3f
Merge branch 'master' into fix-settings 2018-01-25 07:17:21 +09:00
Dean Herbert
284ff226b1
Merge branch 'master' into local-name-fix 2018-01-25 06:50:28 +09:00
TocoToucan
51e188401f Make MusicController draggable again 2018-01-25 00:38:22 +03:00
Dean Herbert
df43b7d84e
Merge branch 'master' into fix-settings 2018-01-25 01:21:41 +09:00
Dean Herbert
1e80908022
Merge branch 'master' into fix-settings 2018-01-25 01:19:44 +09:00
smoogipoo
b77f08941c Make mania play the next note's sounds if no note is hit
Fixes #1911.

This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.
2018-01-24 20:05:37 +09:00
Dean Herbert
53c6526b22 Remove unused code file 2018-01-24 18:04:54 +09:00
Dean Herbert
72df2c681b Remove game-wise settings store for the time being 2018-01-24 18:01:39 +09:00
Dean Herbert
29e98a58f2 Combine Setting and DatabasedSetting 2018-01-24 17:59:49 +09:00
smoogipoo
8d11596b2f Minor cleanups 2018-01-24 17:48:42 +09:00
Dean Herbert
aa913f6de5
Merge branch 'master' into ruleset-configs 2018-01-24 17:45:47 +09:00
Dean Herbert
5a00ae36d1 Add database-based configuration for rulesets 2018-01-24 17:45:28 +09:00
smoogipoo
7f299b2533 Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization 2018-01-24 17:44:28 +09:00
Aergwyn
205d3ed896 fix settings not getting injected 2018-01-23 19:42:21 +01:00
Michael Manis
6dfd0b5cc2 Unnecessary because of prior commit. 2018-01-23 10:55:22 -05:00
Michael Manis
d12e18d59b merged with master 2018-01-23 10:50:57 -05:00
james58899
fa800f0977
fix storyboard path 2018-01-23 18:18:54 +08:00
Dean Herbert
b197cd56af Allow DI'd OnScreenDisplay to be null 2018-01-23 16:42:31 +09:00
Dean Herbert
c01f67b0d8 Merge remote-tracking branch 'upstream/master' into ruleset-configs 2018-01-23 16:23:25 +09:00
Dean Herbert
384dc162b3
Merge branch 'master' into fix-repeat-confusion 2018-01-23 16:06:07 +09:00
Dean Herbert
52805cd82b
Merge branch 'master' into fix-repeat-confusion 2018-01-23 15:22:37 +09:00
Dan Balasescu
fcea12f83d
Merge branch 'master' into allow-quick-retry-key 2018-01-23 14:59:15 +09:00
Dean Herbert
b793c2ec93 Merge branch 'master' into bdl-cache-changes 2018-01-23 14:10:35 +09:00
smoogipoo
d37844c068 Clean up off-by-one offsets from repeat-related properties 2018-01-23 13:37:25 +09:00
Dean Herbert
fa1f4304f6 Remove usings 2018-01-23 13:24:04 +09:00
Dean Herbert
f823650b10 Allow user choice of the quick retry hotkey 2018-01-23 13:05:07 +09:00
Dean Herbert
b799dac5ac
Merge branch 'master' into mania_stage_fix 2018-01-23 10:55:33 +09:00
Felix Ang
d294fcfb0b Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?) 2018-01-22 18:42:03 +01:00
Felix Ang
423559ec6c Update license year. 2018-01-22 18:22:38 +01:00
Dean Herbert
76eac9057d
Merge branch 'master' into mania_stage_fix 2018-01-22 19:06:00 +09:00
Dean Herbert
95f941163b
Merge branch 'master' into direct-show-deleted-sets 2018-01-22 17:08:10 +09:00
Dan Balasescu
73799832ef
Merge branch 'master' into direct-show-deleted-sets 2018-01-22 16:54:32 +09:00
Dean Herbert
a931d6e381
Merge branch 'master' into fix-user-download-cancel 2018-01-22 16:27:26 +09:00
Aergwyn
82c8822888 we need to go back
reverted change and instead check `DeletePending` when retrieving existing online IDs
2018-01-22 08:04:14 +01:00
smoogipoo
c1331cef1b Disallow DualStages for non-converted beatmaps 2018-01-22 15:52:54 +09:00
Dean Herbert
56c001fd29
Merge branch 'master' into fix-downloads-during-import 2018-01-22 15:43:39 +09:00
Michael Manis
64d7868c03 Update APi.Username in APIAccess intead of ignoring it. 2018-01-22 01:19:22 -05:00
Michael Manis
794ae5380a Intverted conditionals. 2018-01-22 01:06:27 -05:00
Michael Manis
87ec36060d Save the obtained username when online. 2018-01-22 00:50:31 -05:00
Michael Manis
c4252ee022 Use obtained value for displayed name. 2018-01-22 00:50:31 -05:00
Dan Balasescu
152475858b
Merge branch 'master' into fix-downloads-during-import 2018-01-22 14:25:24 +09:00
Dan Balasescu
20be4bbbcd
Merge branch 'master' into better-direct-progress-bar 2018-01-22 14:25:23 +09:00
Michael Manis
35e7399bef Merge branch 'master' of https://github.com/ppy/osu into restart-crashfix 2018-01-21 23:56:16 -05:00
Dean Herbert
3d4e2d400c Remove unused using 2018-01-22 13:52:10 +09:00
Dean Herbert
53e40a77dc Don't show error messages when a download is user-cancelled
Resolves #1941.
2018-01-22 13:25:49 +09:00
Dean Herbert
88beee2d1f Keep downloads active until their associated import operation finishes
This avoids race conditions where a second download can potentially be started while the first is still active.
2018-01-22 13:20:04 +09:00
smoogipoo
9ac035f3d5 Merge branch 'bdl-cache-changes' into ruleset-configs 2018-01-22 13:11:45 +09:00
Dean Herbert
060d80efbe Continue showing progress bar on direct panels when importing
Previously the progrress bar would fade out once downloads completed, which felt unintuitive.
2018-01-22 13:05:07 +09:00
smoogipoo
b4e1872322 osu!-side changes in-line with framework BDL cache changes 2018-01-22 12:56:30 +09:00
Michael Manis
530e0afa2c Use IsCurrentScreen instead of a bool for both checks now. 2018-01-21 22:27:15 -05:00
Michael Manis
964c6da9a4 Use IsCurrentScreen instead of a bool 2018-01-21 22:00:18 -05:00
Michael Manis
806da21760 Removed rreduntant initialization. 2018-01-21 20:24:19 -05:00
Michael Manis
ad2df8d8df Fixed tilde-key crash at end of beatmap. 2018-01-21 20:09:44 -05:00
TocoToucan
e88f514cf4 Resolve merge conflicts 2018-01-21 18:32:21 +03:00
TocoToucan
4875443e12 Resolve merge conflicts 2018-01-21 18:11:43 +03:00
aQaTL
c4feb67bce
Using field properties to set mute / unmute instead of separate methods 2018-01-20 11:45:04 +01:00
Aergwyn
596044e19d show beatmapsets with pending deletion in osu!direct 2018-01-19 17:25:32 +01:00
為什麼
feb79ff9e7
Merge branch 'master' into mania_stage_fix 2018-01-19 20:08:24 +08:00
Dean Herbert
652f273961 Ensure previews stop playing when they are removed from the draw hierarchy 2018-01-19 15:46:42 +09:00
aQaTL
4a85266fca
Using BindableBool to mute the volume when it's value changes 2018-01-18 17:23:02 +01:00
Dan Balasescu
250e936099
Merge branch 'master' into preview-fixes 2018-01-19 00:03:47 +09:00
Aergwyn
56619ae926 use ternary expression 2018-01-18 15:53:53 +01:00
smoogipoo
a94ea7025e Register/Unregister -> BeginTracking/StopTracking and add exceptions 2018-01-18 18:45:48 +09:00
smoogipoo
dee298c395 No more statics + better unregistration 2018-01-18 17:40:05 +09:00
Dean Herbert
7ceed8b5eb Stop any playing preview when closing the direct overlay
Resolves #1925
2018-01-18 17:28:56 +09:00
smoogipoo
7910b47868 Move ConfigManager registration/dependency injection to RulesetContainer 2018-01-18 17:00:23 +09:00
smoogipoo
c2c478750d Remove generics from OSD registration methods 2018-01-18 16:57:32 +09:00
smoogipoo
09dfea7e29 Use tracked settings from ConfigManager changes 2018-01-18 15:26:03 +09:00
aQaTL
9c09b33e4e
Removed no longer used "lastVolume" field 2018-01-17 23:17:59 +01:00
aQaTL
18ff57fdf9
Inline changing mute icon properties with object creation 2018-01-17 21:09:46 +01:00
aQaTL
8471a579e0
Removed no longer neccessary "exiting" flag 2018-01-17 20:56:44 +01:00
aQaTL
a8fb732256
Added muted/unmuted icon 2018-01-17 20:43:08 +01:00
Aergwyn
65bac6d31a return preview instead of nothing if it exists already
allows listening to it again after reaching the end
2018-01-17 20:36:47 +01:00
Aergwyn
f86cb30e47 prevent negative width on progress bar 2018-01-17 20:35:28 +01:00
ANDY840119-PC\andy840119
6c67f96fdb fix ci error 2018-01-18 02:01:01 +09:00
aQaTL
1440edbf8b
Use AudioManager adjustments to mute volume 2018-01-17 17:15:13 +01:00
Dean Herbert
864d106635
Merge branch 'master' into fix-replays 2018-01-18 00:49:02 +09:00
smoogipoo
a05032779f Remove unneeded event binding 2018-01-18 00:04:33 +09:00
aQaTL
ac41cb59ea
Typo fix, removed unnecessary braces 2018-01-17 14:36:33 +01:00
ANDY840119-PC\andy840119
3b291abf60 Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game/Rulesets/UI/Playfield.cs
2018-01-17 22:27:32 +09:00
smoogipoo
c79603290d Move TriggerChange to LoadComplete() 2018-01-17 21:52:57 +09:00
Dean Herbert
e7524445ee Use Restart() 2018-01-17 21:33:19 +09:00
Dean Herbert
54ed608ddb Mute global track volume when a beatmap preview is playing 2018-01-17 21:26:12 +09:00
smoogipoo
d96234bf40 Enforce that there's only one configmanager per ruleset 2018-01-17 21:08:23 +09:00
smoogipoo
92da02db87 Add extension to filename 2018-01-17 21:07:37 +09:00
Dean Herbert
73d69e2fd9 Add more xmldoc 2018-01-17 20:32:26 +09:00
Dean Herbert
38c5434b82 Remove placeholder methods in OsuGame
Let's add these when they can actually be implemented.
2018-01-17 20:32:20 +09:00
smoogipoo
9f4ebad6e3 Add mania config manager 2018-01-17 20:21:25 +09:00
smoogipoo
379688e2f2 Add todo 2018-01-17 20:15:17 +09:00
smoogipoo
da22b3ec49 No more sorting 2018-01-17 20:12:39 +09:00
smoogipoo
0b7e1ce667 Add a way to have ruleset-specific configs 2018-01-17 19:45:18 +09:00
Dean Herbert
3892965894 Remove unnecessary region and make methods public 2018-01-17 19:45:10 +09:00
Dean Herbert
5a80c49640 Improve reference xmldoc 2018-01-17 19:44:15 +09:00
Dean Herbert
b27577e242 Add temporary browser handling of beatmap difficulty loading
until we have an api method to support this.
2018-01-17 19:37:20 +09:00
Dan Balasescu
be225eff90
Merge branch 'master' into fix-replays 2018-01-17 18:01:41 +09:00
smoogipoo
a01e46bb68 Fix ScoreStore replays not getting users 2018-01-17 17:55:55 +09:00
smoogipoo
2ebb3d6e0e Fix ReplayLoader not being treated as having a replay loaded
Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.
2018-01-17 17:37:14 +09:00
Dean Herbert
783ca40c64 Update with upstream changes 2018-01-17 16:51:47 +09:00
Dean Herbert
54b0f4b912 Merge branch 'master' into url-parsing-support 2018-01-17 16:16:55 +09:00
smoogipoo
52b48f2b7e Fix replays not correctly considering negative time diffs 2018-01-17 15:23:07 +09:00
aQaTL
538c20a947
Prevent not saving audio levels when user alt tabs before the window closes 2018-01-16 21:31:33 +01:00
aQaTL
0340e4f8dc
Option in settings to toggle mute/unmute when losing/gaining window focus 2018-01-16 20:33:30 +01:00
aQaTL
9277586907
Toggle mute/unmute keyboard shortcut 2018-01-16 17:46:54 +01:00
Dean Herbert
5212194e3f Merge remote-tracking branch 'ppy/master' into fix-cursor-hiding 2018-01-17 00:44:42 +09:00
Dean Herbert
5e1cd8ddc4 Apply conditionals directly rather than using an in-between property 2018-01-16 20:34:40 +09:00
Dean Herbert
e7a0a02466 Don't limit keyboard input based on menu button scale 2018-01-16 20:34:40 +09:00
Dean Herbert
39af9321cf Remove unnecessary overrides 2018-01-16 20:34:40 +09:00
smoogipoo
02564db43f Merge remote-tracking branch 'origin/master' into fix-cursor-hiding 2018-01-16 20:20:47 +09:00
Dean Herbert
9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
smoogipoo
d8275c4f9b Fix beatmap query not including beatmap files 2018-01-16 18:20:46 +09:00
Dean Herbert
5edff5c5fc
Merge branch 'master' into fix-cursor-hiding 2018-01-16 18:15:22 +09:00
Dean Herbert
56df27fcc2
Merge branch 'master' into fix-event-bindings 2018-01-16 17:49:01 +09:00
Dean Herbert
976f7cec39
Merge branch 'master' into playfield-judgements 2018-01-16 15:26:13 +09:00
Dean Herbert
807e455a58
Merge branch 'master' into more-nested-playfields 2018-01-16 14:50:09 +09:00
smoogipoo
0459f0a069 Invert CanShowCursor conditional to fix cursor not showing in VisualTests 2018-01-16 13:40:02 +09:00
Dan Balasescu
480a75b8d9
Merge branch 'master' into hr-crashing-game 2018-01-16 13:18:02 +09:00
TocoToucan
c3ca40dcff Local functions related CI fixes 2018-01-15 23:27:00 +03:00
TocoToucan
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
TocoToucan
a81f32a388 PlayerGroup -> PlayerSettingsGroup 2018-01-15 20:52:52 +03:00
aQaTL
65ecc18141
Cap ApproachRate in HardRock mod at 10.0f 2018-01-15 16:11:00 +01:00
smoogipoo
8c5ef0a330 Remove base OnJudgement from Playfield to properly accomodate nested playfields 2018-01-15 20:48:57 +09:00
smoogipoo
c32ff9c43b Move nested playfields to the base Playfield 2018-01-15 20:39:57 +09:00
smoogipoo
0ae0dac192 Fix DrawableHitObject not binding nested hitobject events 2018-01-15 20:35:38 +09:00
smoogipoo
28586317dd Give stages a size again 2018-01-15 19:44:42 +09:00
smoogipoo
561786c5ef Generate the correct default bindings for variants 2018-01-15 19:25:14 +09:00
Dean Herbert
053a29f9a7 Make judgements visually smaller
This is a temporary change based on people's feedback. Makes judgements feel a lot better.

nb: This is one of my changes that I've had deployed sinfce the end-of-year 2017 build.
2018-01-15 17:41:17 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
smoogipoo
7c41925144 ProvidesUserCursor -> ProvidingUserCursor, and update xmldoc 2018-01-15 14:07:09 +09:00
smoogipoo
43f8a8e8c5 Rename OsuCursorVisualiser -> CursorOverrideContainer 2018-01-15 14:00:13 +09:00
TocoToucan
6e35484160 Fix osu.Game.csproj which was broken during resolving merge conflict 2018-01-13 23:09:43 +03:00
TocoToucan
d3afbdaac6 Resolve merge conflict 2018-01-13 22:32:56 +03:00
TocoToucan
43d2ae348a Rename ReplaySomething -> PlayerSomething 2018-01-13 22:25:09 +03:00
Aergwyn
8ac6818639 expose IsHit 2018-01-13 16:26:14 +01:00
Dan Balasescu
ebb8550f53
Merge branch 'master' into shrink-drawablehitobject_t 2018-01-14 00:16:42 +09:00
Aergwyn
7875f0cb01 remove unnecessary internal 2018-01-13 16:15:41 +01:00
Aergwyn
356bb5da1e move sample logic up too 2018-01-13 12:55:52 +01:00
Aergwyn
70fc09f81e move judgement + state logic up to DrawableHitObject 2018-01-13 12:42:42 +01:00
TocoToucan
0c4fcdf6d8 Remove not used breakOverlay field 2018-01-12 23:59:36 +03:00
TocoToucan
3795411fd1 Do not assign hudOverlay's and breakOverlay's members in Player class 2018-01-12 23:33:24 +03:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
Aergwyn
1c5b3d009c remove volume reduction on preview
it doubles with global reduction
2018-01-12 17:09:57 +01:00
smoogipoo
d0b177e233 Proxying isn't needed anymore 2018-01-12 19:50:09 +09:00
smoogipoo
78441c05cb OsuCursorContainer -> OsuCursorVisualiser 2018-01-12 19:45:09 +09:00
smoogipoo
34aee4fea0 Improve comments 2018-01-12 19:39:35 +09:00
smoogipoo
16d739580b IProvideLocalCursor -> IProvideCursor 2018-01-12 19:37:03 +09:00
smoogipoo
620e125fad Fix cursor being displayed on intro/disclaimer 2018-01-12 19:34:55 +09:00
Dean Herbert
45301d07fd
Merge branch 'master' into url-parsing-support 2018-01-12 19:34:44 +09:00
smoogipoo
5952f1e7f1 Adjust transforms for cursor transitions 2018-01-12 19:34:14 +09:00
Dean Herbert
73aa56a8a7
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-12 18:58:30 +09:00
Dean Herbert
188b26472c Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision 2018-01-12 18:54:36 +09:00
smoogipoo
a6c6523a86 Make SkipButton an OverlayContainer to use the menu cursor 2018-01-12 18:21:17 +09:00
Dean Herbert
ff725f0e32 Fix incorrect online conditional check in social browser logic 2018-01-12 18:20:46 +09:00
smoogipoo
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
Dean Herbert
354d781002 Merge remote-tracking branch 'upstream/master' into fix-mod-implementation-check 2018-01-12 17:49:31 +09:00
Dean Herbert
b55adf655f Yeah, cinema mod isn't going to work 2018-01-12 17:46:24 +09:00
Dean Herbert
7f189080b9 Move fail override back to abstract implementation 2018-01-12 17:43:56 +09:00
Dean Herbert
29c8400ec7
Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-12 17:35:24 +09:00
Dan Balasescu
bb9e89b452
Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-12 17:31:08 +09:00
Dean Herbert
0a06f8069f Remove panel fade out for now
Should be implemented at one level above using a dedicated container.
2018-01-12 17:22:51 +09:00
smoogipoo
8a04c954a9 Cleanup 2018-01-12 17:19:59 +09:00
smoogipoo
441e8aced5 Better namings for the speed change "algorithms" 2018-01-12 17:18:34 +09:00
Dean Herbert
8f7c048c4e
Merge branch 'master' into expand-social-tab 2018-01-12 15:54:42 +09:00
james58899
f83c84a0a6
keep BlurTo 2018-01-12 14:24:42 +08:00
Dean Herbert
9a77005d2e Make sure unimplemented auto mods aren't consumable 2018-01-12 14:26:23 +09:00
Dean Herbert
057efa24c7 Move a few interfaces to base classes 2018-01-12 14:26:09 +09:00
james58899
61c8fd4ab9
useless using 2018-01-12 12:39:32 +08:00
smoogipoo
2e235660ad Fix skip button appearing below osu!mania's stage 2018-01-12 13:25:49 +09:00
james58899
1985e5bdb2
fix background dim 2018-01-12 12:21:37 +08:00
smoogipoo
4b2d971b00 Add some comments 2018-01-12 13:06:17 +09:00
smoogipoo
712d586d41 Revert "Add OSD + config value for scroll speed"
This reverts commit a6d8b28221.
2018-01-12 12:28:43 +09:00
TocoToucan
affbb7a847 Fix license header 2018-01-12 00:37:28 +03:00
TocoToucan
c1f756b16e Support background blur in visual settings 2018-01-12 00:03:55 +03:00
TocoToucan
3ec93966a0 Implement VisualSettings autohiding 2018-01-11 23:39:23 +03:00
FreezyLemon
2c67ff75ed added custom hoverclicksounds so links make sounds on hover&click 2018-01-11 18:52:50 +01:00
FreezyLemon
174fdf5037 Nicer code to remove non-existent channels from links 2018-01-11 18:51:20 +01:00
Dean Herbert
abcfe08f8d Merge remote-tracking branch 'upstream/master' into scrolling-hitobjects-rewrite 2018-01-11 20:38:48 +09:00
smoogipoo
5cfb2c2ffe Make VolumeControlReceptor handle global input
Fixes volume not being able to be changed in dead areas of OverlayContainers.
2018-01-11 19:03:31 +09:00
smoogipoo
c5c33e20bf OverlayContainer changes in-line with framework 2018-01-11 19:03:01 +09:00
Dan Balasescu
86581b6451
Remove extra braces 2018-01-11 17:02:09 +09:00
smoogipoo
ab762045d6 Move back to using load(), fix testcase 2018-01-11 16:51:46 +09:00
smoogipoo
d998936e9e Fix testcase errors 2018-01-11 15:50:44 +09:00
smoogipoo
9ae67b519b Optimise nested hitobject position computations 2018-01-11 15:25:15 +09:00
smoogipoo
9d00e5bb7d Make ScrollingHitObjectContainer handle nested hitobjects 2018-01-11 15:08:30 +09:00
james58899
4fa038aa27
if not storyboard file 2018-01-11 13:53:41 +08:00
smoogipoo
a6d8b28221 Add OSD + config value for scroll speed 2018-01-11 13:40:46 +09:00
smoogipoo
3a869edf36 Add a flag to disable user scroll speed adjustments 2018-01-11 12:44:39 +09:00
smoogipoo
6a5a3b01b2 Fix license headers 2018-01-11 12:39:06 +09:00
TocoToucan
98851e4a78 Stop time whenever visual settings are expanded 2018-01-11 01:24:34 +03:00
Aergwyn
312f52072b enable query
change Avatar animation too
add forgotten usings
2018-01-10 16:46:55 +01:00
james58899
fbffc8bb89
fix load storyboard in osu file 2018-01-10 18:55:04 +08:00
smoogipoo
6255aaab68 Per-hitobject lifetime management 2018-01-10 19:17:43 +09:00
smoogipoo
9036ea92eb Run child updates for nested hitobjects when parent hitobjects are masked 2018-01-10 18:29:46 +09:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
smoogipoo
d147683361 Cleanup 2018-01-10 17:39:15 +09:00
smoogipoo
c010b48b29 Remove number format specified from OsuSliderBar, override ToolTipText
Better/cleaner solution.
2018-01-10 17:29:16 +09:00
Dean Herbert
58626e3b30 Allow rulesets to create their own instantiation info 2018-01-10 17:04:07 +09:00
smoogipoo
17e7f75aca More osu!-side bindable fixes 2018-01-10 15:41:13 +09:00
Dean Herbert
338eaad0e5 Merge remote-tracking branch 'upstream/master' into background-blur 2018-01-10 13:38:53 +09:00
Dean Herbert
9ec8f130a6 Ensure changes are only applied when we are the current screen 2018-01-10 13:24:26 +09:00
Dean Herbert
9d099feadc
Merge branch 'master' into fix-catcher-width 2018-01-10 10:04:10 +09:00
TocoToucan
c48c7b085c Visual settings initial commit 2018-01-10 02:24:51 +03:00
Aergwyn
4ce125478a remove unnecessary Schedules
one was bugging out when rapidly switching display styles and the other was... unnecessary
2018-01-09 19:03:23 +01:00
Aergwyn
44d821172a tidying up 2018-01-09 16:29:12 +01:00
FreezyLemon
3bf9901dd2 Fixed bugs and added tests 2018-01-09 16:11:45 +01:00
Dean Herbert
fcb197f7b6 Simplify logic 2018-01-09 22:21:15 +09:00
Dean Herbert
2518d16a77 Denote unused variable 2018-01-09 21:34:31 +09:00
Dean Herbert
c2fadcfc1f
Merge branch 'master' into background-blur 2018-01-09 21:20:05 +09:00
Dean Herbert
1c9e9cb8af
Merge branch 'master' into expand-social-tab 2018-01-09 21:08:26 +09:00
Dean Herbert
72624aea18 Use a better method of link compilation
Adds word wrap back, simplifies a lot.
2018-01-09 20:33:20 +09:00
Dean Herbert
1be0569743 Update licence headers 2018-01-09 14:34:52 +09:00
Dean Herbert
b035a92bda
Merge branch 'master' into url-parsing-support 2018-01-09 14:28:20 +09:00
Dean Herbert
a3f05ca9ec Avoid unnecessary use of linq 2018-01-09 12:43:10 +09:00
Dean Herbert
b90b1e326e
Merge branch 'master' into fix-randomizer 2018-01-09 12:00:21 +09:00
Dean Herbert
4c0259a040
Merge branch 'master' into fix-storyboard-variables 2018-01-09 11:50:03 +09:00
Aergwyn
f6c168be27 add skip cutscene as "in game" keybinding 2018-01-08 18:22:43 +01:00
Dean Herbert
9eb4eb4b36
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-08 22:51:16 +09:00
smoogipoo
c4d1922c8b Add scrolling algorithm to global settings 2018-01-08 11:34:37 +09:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
smoogipoo
4ab3b0d76b Implement local scrolling hit object container 2018-01-07 13:24:09 +09:00
smoogipoo
117ab8a26d Split out scrolling algorithm 2018-01-07 13:23:16 +09:00
smoogipoo
98fd4f6ff2 Fix up precision + sizing issues 2018-01-07 11:33:59 +09:00
Aergwyn
d9866a2052 fix hover effects on social panels 2018-01-06 11:27:17 +01:00
Aergwyn
a61666d2a7 update licence headers 2018-01-06 10:54:53 +01:00
Aergwyn
e6b581e259 Merge branch 'master' into expand-social-tab 2018-01-06 10:48:27 +01:00
Aergwyn
57b44b8c29 fix new panels appearing too soon 2018-01-06 10:40:18 +01:00
Aergwyn
140a09ba3d fix requests not cancelling properly + formatting 2018-01-05 19:13:54 +01:00
smoogipoo
7526225282 Use DP for most of the code to avoid unnecessary computations 2018-01-05 20:56:21 +09:00
Dean Herbert
a1d94d7adf
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-05 20:48:30 +09:00
Dean Herbert
d1f03ebf0c Update in line with framework 2018-01-05 20:29:14 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
5d12682e83 Initial implementation of the new (old) mania scrolling calculations 2018-01-05 20:18:18 +09:00
smoogipoo
d2b135d2a8 Give hitobjects lifetimes 2018-01-05 15:48:19 +09:00
smoogipoo
1276e2c71a Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-05 14:58:57 +09:00
smoogipoo
1571c10c42 Fix up replay settings sliderbar formatting 2018-01-05 14:37:32 +09:00
smoogipoo
b84da31174 Change in-line with framework 2018-01-05 14:26:46 +09:00
smoogipoo
cbf4852438 Expose a NumberFormatInfo for more extensibility 2018-01-05 14:26:10 +09:00
smoogipoo
b84f83cf16 Trigger a value changed event when the number of digits changes 2018-01-05 14:26:10 +09:00
smoogipoo
eaa2a007e7 Cleanup 2018-01-05 14:26:10 +09:00
smoogipoo
08af3e6303 Make OsuSliderBar formatting support variable number of digits 2018-01-05 14:26:10 +09:00
smoogipoo
ddc9edab54 Make OsuSliderBar support both float and double values 2018-01-05 14:26:10 +09:00
smoogipoo
af86220dcc Merge remote-tracking branch 'origin/master' into update-branch 2018-01-05 12:08:50 +09:00
Dean Herbert
01038bd9bb
Merge branch 'master' into mania-rc-cleanup 2018-01-05 10:18:15 +09:00
smoogipoo
5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
smoogipoo
add68ff068 Fix swells not stopping at the hit position 2018-01-04 21:45:29 +09:00
smoogipoo
585df22c88 Add a way to calculate length of IHasEndTime objects 2018-01-04 20:56:18 +09:00
james58899
0158246ba1
AppVeyor 2018-01-04 19:23:00 +08:00
james58899
dcc4e863ab
move variables to StoryboardDecoder 2018-01-04 19:04:52 +08:00
Aergwyn
038fa682f7 Merge branch 'master' into expand-social-tab 2018-01-04 11:49:35 +01:00
Aergwyn
bf64b8fc69 added hover effects to panels in social
at least partially QQ
2018-01-04 11:42:50 +01:00
smoogipoo
a7aab21a29 Re-namespace files 2018-01-04 19:22:15 +09:00
smoogipoo
e0c921ff5c Split out ScrollingHitObjectContainer into new file 2018-01-04 19:20:43 +09:00
smoogipoo
651e24e3cc Implement proper scrolling directions 2018-01-04 19:17:40 +09:00
smoogipoo
f34131f8f4 Initial game-wide replacement of scrolling playfields 2018-01-04 18:50:17 +09:00
smoogipoo
0c5ab98965 Make MultiplierControlPoint's StartTime variable 2018-01-04 18:35:33 +09:00
smoogipoo
2b79ad879f Add a way to access alive hitobjects 2018-01-04 16:37:48 +09:00
Dean Herbert
c8ec27c4de Remove redundant prefix 2018-01-04 16:31:41 +09:00
Dean Herbert
152b846cff Fix incorrect scaling of hitobjects in catch 2018-01-04 16:29:53 +09:00
Aergwyn
d0c9d71ee7 fix covers not showing in user panels 2018-01-04 08:15:11 +01:00
smoogipoo
697efba5e2 Replace .OfType with .Cast 2018-01-04 15:55:35 +09:00
Dean Herbert
9bce322682
Merge branch 'master' into wedge-unicode 2018-01-04 15:09:31 +09:00
Aergwyn
9b70578af6 enabled Location as filter tab
forgot it QQ
2018-01-03 19:01:10 +01:00
Aergwyn
9d29adce27 bring social tab+filter behaviour closer to direct 2018-01-03 17:54:20 +01:00
Aergwyn
988f6ac901 fix SortDirection default to descending when retrieved data is ascending 2018-01-03 17:53:50 +01:00
Aergwyn
0e361aefeb added new tabs and sort criteria 2018-01-03 17:52:11 +01:00
Endrik Tombak
ce156098f6 Merge branch 'fix-randomizer' of https://github.com/LittleEndu/osu into fix-randomizer 2018-01-03 12:33:43 +02:00
Endrik Tombak
969fa65c42 Merge branch 'master' of https://github.com/ppy/osu into fix-randomizer 2018-01-03 12:31:59 +02:00
Endrik
35af5d1ce6
Merge branch 'master' into fix-randomizer 2018-01-03 12:25:07 +02:00
smoogipoo
6d253fd33c Add a way to adjust the conversion process with mods 2018-01-03 19:06:20 +09:00
james58899
89fe567496
use FileSafety.PathSanitise 2018-01-03 17:57:24 +08:00
smoogipoo
bd171926d6 Remove AvailableColumns from ManiaRulesetContainer
Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.
2018-01-03 18:44:25 +09:00
Dean Herbert
532c455f92
Merge branch 'master' into change-audio-settings-icon 2018-01-03 14:34:21 +09:00
Dan Balasescu
7ba59d9d56
Merge branch 'master' into fix-import-context-state 2018-01-03 14:21:04 +09:00
Dan Balasescu
2a6068f8e7
Merge branch 'master' into fix-play-song-select-tests 2018-01-03 14:12:49 +09:00
Dan Balasescu
e6df965da7
Merge branch 'master' into fix-testcase-performance 2018-01-03 14:04:34 +09:00
Dan Balasescu
262a7f7d19
Merge branch 'master' into large-texture-store 2018-01-03 13:56:39 +09:00
Dan Balasescu
d167663340
Merge branch 'master' into large-texture-store 2018-01-03 13:50:49 +09:00
Dean Herbert
b8fa33459a Merge branch 'master' into disable-unimplemented-mods 2018-01-03 13:39:29 +09:00
Dean Herbert
61c2bf7ebe Fix TestCasePerformancePoints binding to global beatmap
and never unbinding
2018-01-03 13:34:27 +09:00
Dan Balasescu
fa6db30d30
Fix broken xmldoc param 2018-01-03 13:12:49 +09:00
Dean Herbert
2291053205
Merge branch 'master' into wedge-unicode 2018-01-03 13:12:42 +09:00
Felix Ang
3e6f0c198c Remove tab 2018-01-02 18:02:04 +01:00
Aergwyn
699902234b remove unused code 2018-01-02 17:58:11 +01:00
Felix Ang
dccc134efa Don't allow auto to fail 2018-01-02 17:53:29 +01:00
Aergwyn
52c2ba49cf make loading indicator more visible by deleting panels preemptively 2018-01-02 17:42:44 +01:00
Aergwyn
313dfd4d46 remove unnecessary task + rename method 2018-01-02 17:22:12 +01:00
Aergwyn
a00f92dcb4 change unnecessary cast 2018-01-02 17:18:49 +01:00
Dean Herbert
faf1181fc3
Merge branch 'master' into url-parsing-support 2018-01-02 17:51:50 +09:00
Dean Herbert
1c3541f18e Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods 2018-01-02 16:58:28 +09:00
Dean Herbert
0e1b033008 Improve mod cycling logic further 2018-01-02 16:55:03 +09:00
Dean Herbert
f72239ef7a Centralise deselect logic and add animation to deselection 2018-01-02 16:09:22 +09:00
Dean Herbert
71bcebe7e1 Fix selections occurring even though buttons aren't selected 2018-01-02 16:08:48 +09:00
Dean Herbert
c0dd812a4c Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods 2018-01-02 15:33:08 +09:00
Dean Herbert
f419518887 Make comment xmldoc 2018-01-02 15:33:00 +09:00
Dean Herbert
4f8a830fbf Fix potential race condition with score retrieval 2018-01-02 15:30:29 +09:00
Dean Herbert
161e8d44b4
Merge branch 'master' into supporter-leaderboards 2018-01-02 15:09:52 +09:00
Dan Balasescu
5f3dbfef47
Merge branch 'master' into hide-unavailable-functions 2018-01-02 12:59:12 +09:00
Dan Balasescu
91c49913c9
Merge branch 'master' into focused-overlay-improvements 2018-01-02 12:44:09 +09:00
Dean Herbert
7154efa1c6 Refresh import context on import error 2018-01-02 12:31:21 +09:00
Dean Herbert
2354163900 Change icon for audio settings 2018-01-02 12:30:55 +09:00
Felix Ang
755befdf84 Check for supporter before displaying loading spinner 2018-01-01 14:30:53 +01:00
Aergwyn
cc4ef5d0aa Merge branch 'master' into expand-social-tab 2018-01-01 12:00:50 +01:00
Endrik Tombak
5abf93038b Reset only visible sets for more randomized feel 2017-12-31 14:47:27 +02:00
Dean Herbert
2079b7239c
Merge branch 'master' into result-page-date-order 2017-12-31 13:11:55 +09:00
Dean Herbert
77f6f25ad3
Merge branch 'master' into wedge-unicode 2017-12-31 13:09:41 +09:00
Dean Herbert
dfee8e911f Fix dummy beatmap selection not propagating to song select components 2017-12-31 12:55:53 +09:00
Dean Herbert
02514d4228 Update tests to account for correct beatmap displaying on details area 2017-12-31 12:54:27 +09:00
Dean Herbert
94b761e63e Remove local storage for now 2017-12-31 12:22:17 +09:00
Endrik Tombak
987a6403da Faster count for AppVeyor 2017-12-31 03:25:43 +02:00
Endrik Tombak
d032790e19 Doesn't allow randomizer to select invisible maps 2017-12-31 03:10:54 +02:00
FreezyLemon
e7721d71f3 Changed chat link implementation according to review 2017-12-31 00:51:47 +01:00
Dean Herbert
f2d302f8dc Create a LargeTextureStore for cached (but not atlased) global textures
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
2017-12-31 07:05:04 +09:00
Aergwyn
3d66b879a7 use ToShortTimeString to create a time depending on current culture 2017-12-30 22:45:28 +01:00
Aergwyn
2a0699f13c use ToShortDateString to create a date depending on current culture 2017-12-30 22:41:01 +01:00
Aergwyn
0dad9cbe53 change date to be more friendly to read 2017-12-30 21:49:05 +01:00
Aergwyn
d6af8ad748 swap date and time in ResultsPageScore 2017-12-30 21:48:49 +01:00
Aergwyn
61bbb66996 sort resultpage hitresults descending
HitCount was good to bad but HitResult is the opposite. To account for this just descending order on the result page.
2017-12-30 21:27:15 +01:00
Aergwyn
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
ColdVolcano
13900d6130 Use LocalisationEngine on BeatmapInfoWedge 2017-12-30 14:12:47 -06:00
Dean Herbert
c002d4e1d2
Merge branch 'master' into result-page-sorting 2017-12-31 04:34:48 +09:00
Dean Herbert
1c80f3e918 Disallow selection of non-implemented mods 2017-12-31 04:28:51 +09:00