Dan Balasescu
|
ee4607c86e
|
Merge branch 'master' into fix-exit-race-condition
|
2018-07-09 19:02:37 +09:00 |
|
Dean Herbert
|
49e94850b6
|
Fix being able to trigger player before carousel is ready
Causes an eventual crash.
|
2018-07-09 18:43:20 +09:00 |
|
Dean Herbert
|
09b3375a9d
|
Fix pressing escape too fast causing multiple exit attempts at song select
|
2018-07-09 18:12:23 +09:00 |
|
smoogipoo
|
0a67e5a274
|
Fix some possible null reference exceptions
|
2018-07-09 17:09:17 +09:00 |
|
Dan Balasescu
|
8f3f872182
|
Merge branch 'master' into go-forward
|
2018-07-06 14:29:26 +09:00 |
|
Dean Herbert
|
e28a610757
|
Fix mods not correctly resetting when changing ruleset at song select
|
2018-07-05 13:22:52 +09:00 |
|
Dean Herbert
|
5fc17bacf3
|
Add "Select" action
Allows progressing forwards in the interface
|
2018-07-03 18:39:15 +09:00 |
|
Joehu
|
d476842c44
|
Fix FooterButton clicking area
|
2018-07-02 22:03:17 -07:00 |
|
Dan Balasescu
|
118366303c
|
Merge branch 'master' into fix-leaderboard-placeholder
|
2018-07-02 17:17:40 +09:00 |
|
smoogipoo
|
4070c1a888
|
Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
# osu.Game/Screens/Select/FilterControl.cs
|
2018-07-02 15:05:34 +09:00 |
|
Dean Herbert
|
2c597874bf
|
Fix leaderboard showing placeholder briefly when entering song select
|
2018-07-01 18:17:02 +09:00 |
|
smoogipoo
|
6d6436c8d3
|
Fix ruleset not getting updated if changed
|
2018-06-29 20:50:39 +09:00 |
|
smoogipoo
|
9187eb8626
|
SongSelect needs to recache as IBindable
|
2018-06-29 20:50:30 +09:00 |
|
Dean Herbert
|
06bd3d4815
|
Use IBindable where possible
|
2018-06-29 20:28:28 +09:00 |
|
Dean Herbert
|
9fce4eaccf
|
Merge branch 'master' into di-backed-ruleset
|
2018-06-29 19:33:12 +09:00 |
|
Dean Herbert
|
1c32951d4b
|
Ensure toolbar triggers updates to SongSelect's ruleset
|
2018-06-29 19:32:42 +09:00 |
|
Dean Herbert
|
6d6fcc953b
|
Trim lines
|
2018-06-29 19:25:20 +09:00 |
|
Dean Herbert
|
a377e87bf6
|
Add missing licence headers
|
2018-06-28 17:34:04 +09:00 |
|
Dean Herbert
|
c44a81bdf5
|
Add word wrap support
|
2018-06-28 13:04:39 +09:00 |
|
Joehu
|
8518fce4a9
|
Fix osu!supporter naming
|
2018-06-27 17:57:55 -07:00 |
|
Dean Herbert
|
4bcc05a7fc
|
Remove null checks on ruleset
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
|
2018-06-26 18:24:34 +09:00 |
|
Dean Herbert
|
4dd12cedad
|
Fix review issues
|
2018-06-26 17:01:40 +09:00 |
|
Dean Herbert
|
13480feb4f
|
Remove error logging
Already logged to network.log with ample detail.
|
2018-06-26 16:38:19 +09:00 |
|
Dean Herbert
|
388ca5d572
|
Move leaderboard update scheduling to a more central method
|
2018-06-26 16:33:22 +09:00 |
|
Dean Herbert
|
b0a1b25983
|
Privatise game ruleset and access via DI
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
|
2018-06-26 16:32:32 +09:00 |
|
Dean Herbert
|
96100a2200
|
Remove schedule logic (seems unnecessary)
|
2018-06-20 17:41:48 +09:00 |
|
Dean Herbert
|
475fb06559
|
Use new bind method
|
2018-06-07 16:46:54 +09:00 |
|
smoogipoo
|
e77084bec4
|
Give OsuScreen a mutable BindableBeatmap
|
2018-06-06 20:19:53 +09:00 |
|
smoogipoo
|
72cc53aded
|
Rename GameBeatmap -> BindableBeatmap
|
2018-06-06 20:16:20 +09:00 |
|
smoogipoo
|
4086ff7313
|
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
|
2018-06-06 18:26:51 +09:00 |
|
Dean Herbert
|
d2633a706d
|
Merge branch 'master' into score-component-tooltips
|
2018-06-06 09:06:22 +09:00 |
|
Dean Herbert
|
00c8d2ff11
|
Merge branch 'master' into source-link-colour
|
2018-06-06 08:27:28 +09:00 |
|
Dean Herbert
|
4b604bf055
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-04 10:53:04 +09:00 |
|
DrabWeb
|
a7bab14b30
|
Add tooltip to ScoreComponentLabel.
|
2018-06-03 22:26:30 -03:00 |
|
DrabWeb
|
db4c26e1ab
|
Rewrite ScoreComponentLabel.
|
2018-06-03 22:22:44 -03:00 |
|
Joehu
|
bd7c9cd8bf
|
Set 'Colour' when creating 'textFlow'
|
2018-06-03 17:41:34 -07:00 |
|
Joehu
|
5c713ac2ab
|
Use default colour in MetadataSection
|
2018-06-03 07:51:57 -07:00 |
|
Joehu
|
dc2a004c87
|
Remove link colours for all unlinked text
|
2018-06-02 12:04:58 -07:00 |
|
Dean Herbert
|
5c2a2e394e
|
Fix incorrect async logic in BeatmapInfoWedge
Closes #2653.
Alternative to #2657.
|
2018-06-01 20:31:29 +09:00 |
|
Joehu
|
b4d621a2cb
|
Add link colour to beatmap source
|
2018-05-31 10:21:22 -07:00 |
|
Dan Balasescu
|
76567ae98b
|
Merge branch 'master' into song-selet-enumerable
|
2018-05-31 14:42:58 +09:00 |
|
Dean Herbert
|
a28e71995d
|
Offload database query to task
Allows song select to load a touch faster, in theory.
|
2018-05-30 16:15:57 +09:00 |
|
Dean Herbert
|
54e53f7190
|
Fix player getting loaded when exiting song select
|
2018-05-30 15:48:20 +09:00 |
|
smoogipoo
|
f1ac84d95b
|
Fix base.CreateLocalDependencies sometimes not being called
|
2018-05-24 13:03:25 +09:00 |
|
smoogipoo
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|
Joehu
|
46c6c1d07e
|
Allow drag clicking footer and filter on song select
|
2018-05-20 20:25:39 -07:00 |
|
Dean Herbert
|
d20011ba58
|
Fix an endless feedback loop
|
2018-05-17 17:56:29 +09:00 |
|
Dean Herbert
|
db0470243a
|
Fix nullref when changing ruleset at main menu
|
2018-05-13 12:55:54 +09:00 |
|
smoogipoo
|
fd9796d08c
|
Remove some unnecessary changes
|
2018-05-11 14:13:52 +09:00 |
|
smoogipoo
|
816ad5c426
|
Pass down ruleset to the buffered wedge
|
2018-05-11 14:10:53 +09:00 |
|
smoogipoo
|
fbd7ccc03f
|
Make BeatmapInfoWedge display properly for converts
|
2018-05-07 15:51:08 +09:00 |
|
smoogipoo
|
5489976c20
|
Implement ruleset-specific beatmap statistics
|
2018-05-07 15:51:08 +09:00 |
|
smoogipoo
|
9128e64c9a
|
Rename OriginalBeatmap back to Beatmap
|
2018-05-07 10:29:38 +09:00 |
|
smoogipoo
|
77e661489d
|
Merge branch 'i-beatmap' into beatmap-conversion-rework
|
2018-05-07 10:00:24 +09:00 |
|
smoogipoo
|
1aefd71b65
|
Merge remote-tracking branch 'origin/master' into i-beatmap
|
2018-05-07 09:58:53 +09:00 |
|
Dean Herbert
|
3886e75959
|
Fix potentially missing group headers in beatmap carousel
|
2018-04-24 01:52:25 +09:00 |
|
Dean Herbert
|
2d1cef79d6
|
Fix instability in carousel item sorting
|
2018-04-23 19:01:01 +09:00 |
|
Dean Herbert
|
c77f339444
|
Merge remote-tracking branch 'upstream/master' into show-beatmap-id
|
2018-04-20 12:41:38 +09:00 |
|
smoogipoo
|
03a5df84c6
|
Initial rework of beatmap conversion process
|
2018-04-19 22:04:12 +09:00 |
|
Dean Herbert
|
f7ca6267b1
|
Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability
|
2018-04-19 20:53:06 +09:00 |
|
smoogipoo
|
66b3b295e7
|
Use IBeatmap wherever possible
|
2018-04-19 20:44:38 +09:00 |
|
Dean Herbert
|
e395a47112
|
Changes to naming and text
|
2018-04-18 19:47:13 +09:00 |
|
Dean Herbert
|
bd834dd487
|
Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling
|
2018-04-18 19:46:59 +09:00 |
|
Dean Herbert
|
1728dd6502
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:42:09 +09:00 |
|
Dean Herbert
|
7e5d5a197b
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 16:41:01 +09:00 |
|
Dean Herbert
|
1be2571d33
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:08:45 +09:00 |
|
Dean Herbert
|
f62677222c
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 13:08:53 +09:00 |
|
Dean Herbert
|
188c8ce1e7
|
Remove unnecessary score nulling (already happens in PlaceholderState_Set)
|
2018-04-18 11:58:55 +09:00 |
|
Dean Herbert
|
a27f39a555
|
Add documentation explaining intertwining logic
|
2018-04-18 11:57:06 +09:00 |
|
smoogipoo
|
9af6ef1864
|
Remove extra unneded safety
|
2018-04-16 17:48:49 +09:00 |
|
smoogipoo
|
b9220a1e29
|
Fix leaderboard placeholder sometimes disappearing indefinitely
|
2018-04-16 17:39:55 +09:00 |
|
smoogipoo
|
1b9d54a6ad
|
Fix various data races causing crashes or incorrect leaderboard states
|
2018-04-16 17:39:03 +09:00 |
|
Dean Herbert
|
81f0649e44
|
Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling
|
2018-04-13 19:50:44 +09:00 |
|
tgi74000
|
1a2b1d4c98
|
Use the already existent RightMouseScrollbar field
|
2018-04-13 11:32:33 +02:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
tgi74000
|
e3cd0ef200
|
Add right click scrolling in song select (and its option)
|
2018-04-13 11:09:49 +02:00 |
|
Dean Herbert
|
c33cb9c02e
|
Merge branch 'master' into show-beatmap-id
|
2018-04-10 16:05:32 +09:00 |
|
Endrik
|
c7440201fb
|
Merge branch 'master' into alt-eagerselect
|
2018-04-06 12:37:16 +03:00 |
|
naoey
|
7482d5986a
|
Add a loading state to BeatmapSetOverlay.
- Handle null value in header and info sections
- Add item to context menu for carousel beatmaps to show details
|
2018-04-04 21:46:31 +05:30 |
|
smoogipoo
|
69e2d4fd22
|
Make CarouselRoot a nested class
|
2018-04-02 15:24:08 +09:00 |
|
smoogipoo
|
82a847b820
|
Extract random selection logic into CarouselRoot
|
2018-04-02 15:16:10 +09:00 |
|
Huo Yaoyuan
|
b842f682eb
|
Use Linq.Append and Prepend.
|
2018-04-02 12:06:34 +08:00 |
|
Endrik Tombak
|
7e30375443
|
Use selectNextRandom instead
|
2018-03-30 10:46:46 +03:00 |
|
Endrik Tombak
|
3f65e3a7e3
|
Make selection at random when last was null
|
2018-03-30 00:15:32 +03:00 |
|
smoogipoo
|
097ab66182
|
Fix resharper error
|
2018-03-25 01:54:25 +09:00 |
|
Dean Herbert
|
0e669c9a3f
|
Fix many warnings
|
2018-03-24 18:23:22 +09:00 |
|
smoogipoo
|
c29f7a4333
|
Merge remote-tracking branch 'origin/master' into netstandard
|
2018-03-24 14:49:46 +09:00 |
|
Dean Herbert
|
d4aeb3d00b
|
Fix BeatmapCarousel's flush not correctly applying selection changes
They may have been delayed until the next Update, which is too late in this case.
|
2018-03-23 12:10:13 +09:00 |
|
Dean Herbert
|
62229300c4
|
Fix DummyRuleset getting selected
Resolves #2261.
|
2018-03-22 00:26:48 +09:00 |
|
FreezyLemon
|
95c84ea7fe
|
remove (now) unnecessary line
|
2018-03-12 23:00:06 +01:00 |
|
FreezyLemon
|
ddc1f03a96
|
deselect autoplay button after ctrl-enter play
before, the mod was removed, but the button was still active
|
2018-03-12 22:35:45 +01:00 |
|
Dean Herbert
|
db2a663234
|
Use private instead of protected
|
2018-03-11 01:26:03 +09:00 |
|
naoey
|
2c0488b1f1
|
Invert bool, add test, and handle ruleset change.
|
2018-03-09 19:39:28 +05:30 |
|
naoey
|
d04f47718f
|
Make song select choose random when initial selection fails.
- Revert TestCasePlaySongSelect to master
|
2018-03-09 17:36:55 +05:30 |
|
naoey
|
25fb527cc7
|
Remove previous fix and move filtered logic to carousel.
- Add an optional bool parameter to SelectBeatmap to skip selecting
filtered maps
|
2018-03-09 15:51:00 +05:30 |
|
Dean Herbert
|
81c1ec2005
|
Merge branch 'master' into fix-unplayable-beatmaps
|
2018-03-08 13:02:57 +09:00 |
|
smoogipoo
|
78d73d4c11
|
Additional fixes for flow ordering after framework changes
|
2018-03-06 17:20:58 +09:00 |
|
naoey
|
a57dc154f9
|
More specific tests.
|
2018-03-03 20:34:29 +05:30 |
|
naoey
|
307147a8a3
|
Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps
|
2018-03-03 16:10:22 +05:30 |
|
naoey
|
fb724ca8a7
|
Make song select ensure current beatmap is always playable in the active ruleset.
- Add a to TestCasePlaySongSelect testing this scenario
|
2018-03-03 16:09:24 +05:30 |
|
Dan Balasescu
|
33a64cb497
|
Merge branch 'master' into fix-multiple-tracks-playing
|
2018-02-28 22:53:02 +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 |
|
Dean Herbert
|
08497427fd
|
Merge branch 'master' into fix-multiple-tracks-playing
|
2018-02-28 15:32:16 +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
|
510ecd7c87
|
Ensure selection is finalised before exiting song select
Resolves #2080.
|
2018-02-28 00:07:28 +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
|
f2b3d9a0e8
|
Change some missed instances
|
2018-02-22 14:17:35 +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 |
|
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 |
|
Shane Woolcock
|
d603d032d5
|
Inlined delete beatmap dialog
|
2018-02-13 16:26:05 +10:30 |
|
Shane Woolcock
|
8d313486b3
|
Add a confirmation dialog to the Delete option in the beatmap context menu
|
2018-02-13 00:40:34 +10:30 |
|
smoogipoo
|
b500b76407
|
Merge branch 'master' into update-branch
|
2018-02-08 23:35:48 +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 |
|
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
|
b4e1872322
|
osu!-side changes in-line with framework BDL cache changes
|
2018-01-22 12:56:30 +09:00 |
|
Dean Herbert
|
9b33499fe7
|
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
|
2018-01-16 20:04:34 +09:00 |
|
TocoToucan
|
3c11978cfa
|
Use local functions
|
2018-01-15 21:42:17 +03: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 |
|
TocoToucan
|
ae032cbf23
|
Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties
|
2018-01-07 23:40:00 +03:00 |
|
Aergwyn
|
140a09ba3d
|
fix requests not cancelling properly + formatting
|
2018-01-05 19:13:54 +01:00 |
|
Dean Herbert
|
37d393bca0
|
Update licence headers
|
2018-01-05 20:21:19 +09:00 |
|
smoogipoo
|
af86220dcc
|
Merge remote-tracking branch 'origin/master' into update-branch
|
2018-01-05 12:08:50 +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 |
|
Dean Herbert
|
9bce322682
|
Merge branch 'master' into wedge-unicode
|
2018-01-04 15:09:31 +09: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 |
|
Dan Balasescu
|
2a6068f8e7
|
Merge branch 'master' into fix-play-song-select-tests
|
2018-01-03 14:12:49 +09:00 |
|
Dean Herbert
|
2291053205
|
Merge branch 'master' into wedge-unicode
|
2018-01-03 13:12:42 +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
|
91c49913c9
|
Merge branch 'master' into focused-overlay-improvements
|
2018-01-02 12:44:09 +09:00 |
|
Felix Ang
|
755befdf84
|
Check for supporter before displaying loading spinner
|
2018-01-01 14:30:53 +01:00 |
|
Endrik Tombak
|
5abf93038b
|
Reset only visible sets for more randomized feel
|
2017-12-31 14:47:27 +02: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 |
|
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 |
|
ColdVolcano
|
13900d6130
|
Use LocalisationEngine on BeatmapInfoWedge
|
2017-12-30 14:12:47 -06:00 |
|
Dean Herbert
|
c8bab7d983
|
Merge branch 'master' into fix-push-disabled-crash
|
2017-12-31 01:27:41 +09:00 |
|
Aergwyn
|
f7fe083018
|
add tooltip to country flags
|
2017-12-30 14:59:35 +01:00 |
|
Dean Herbert
|
442a649c63
|
Make all FocusedOverlays hide on clicks outside of themselves
Also allows wheel events to pass through around them.
|
2017-12-30 20:45:41 +09:00 |
|
Dean Herbert
|
ef683a60f5
|
Merge branch 'master' into fix-push-disabled-crash
|
2017-12-30 18:59:59 +09:00 |
|
Dean Herbert
|
0cea018576
|
Use a more suiting (?) icon for import dialog
Closes #1763.
|
2017-12-28 21:24:40 +09:00 |
|