Dean Herbert
|
4b83278cf4
|
Merge branch 'master' into fix-editor-clocks
|
2018-03-16 23:32:54 +09:00 |
|
Dean Herbert
|
4411758ff7
|
Merge branch 'master' into fix-autoplay-button-deselect
|
2018-03-16 17:31:14 +09:00 |
|
smoogipoo
|
b27b6c7eb7
|
Merge branch 'master' into cursor-trail
|
2018-03-16 14:43:27 +09:00 |
|
smoogipoo
|
d05947ef48
|
Pass adjustable clocks to components, rather than relying on the track
|
2018-03-15 18:19:28 +09:00 |
|
smoogipoo
|
c8f6a6980b
|
Move clock construction to Editor
|
2018-03-15 17:27:37 +09:00 |
|
smoogipoo
|
5e742eb466
|
Move editor constructions to BDL load
|
2018-03-15 17:10:08 +09:00 |
|
Dean Herbert
|
cdf435aedd
|
Merge branch 'master' into DoNotMoveToPlayerWhileDragging
|
2018-03-15 11:14:30 +09:00 |
|
Dean Herbert
|
8d433cb4bf
|
Merge branch 'master' into cursor-trail
|
2018-03-15 11:14:21 +09:00 |
|
Dean Herbert
|
551b67ac16
|
Merge branch 'master' into fix-autoplay-button-deselect
|
2018-03-14 21:46:19 +09:00 |
|
Dean Herbert
|
a0691168cb
|
Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement
|
2018-03-14 15:35:24 +09:00 |
|
Dean Herbert
|
81f82d98a1
|
Rework a lot of naming and structure
|
2018-03-14 15:18:21 +09:00 |
|
Dean Herbert
|
ea649f9650
|
Avoid scheduling during non-current screen
|
2018-03-14 12:09:19 +09:00 |
|
Dean Herbert
|
ef8d595914
|
Apply formatting changes
|
2018-03-14 11:44:19 +09:00 |
|
Dean Herbert
|
c3a3d76b88
|
Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging
|
2018-03-14 11:43:33 +09:00 |
|
Dean Herbert
|
13f64a1d12
|
Merge branch 'master' into cursor-trail
|
2018-03-14 11:42:40 +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 |
|
smoogipoo
|
33c721bcbb
|
Fix post-merge errors
|
2018-03-12 09:51:32 +09:00 |
|
smoogipoo
|
6e51b74890
|
Merge remote-tracking branch 'origin/master' into rewrite-break-overlay
|
2018-03-12 09:47:05 +09:00 |
|
Dean Herbert
|
487a03d0d7
|
Merge branch 'master' into cursor-trail
|
2018-03-11 02:07:05 +09:00 |
|
Dean Herbert
|
db2a663234
|
Use private instead of protected
|
2018-03-11 01:26:03 +09:00 |
|
naoey
|
56730247e3
|
Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps
|
2018-03-09 19:40:00 +05:30 |
|
naoey
|
2c0488b1f1
|
Invert bool, add test, and handle ruleset change.
|
2018-03-09 19:39:28 +05:30 |
|
Dean Herbert
|
9ad9fc5aa9
|
Merge branch 'master' into fix-unplayable-beatmaps
|
2018-03-09 21:39:48 +09:00 |
|
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
|
6d91889ca6
|
Move player-specific configuration bindables back to player
|
2018-03-08 22:16:47 +09:00 |
|
Dean Herbert
|
94ed4ab01b
|
Add debouncing to player loading
Allows the mouse to temporarily exit and re-enter overlay elements without triggering a load
|
2018-03-08 20:28:55 +09:00 |
|
Dean Herbert
|
d3e91024a7
|
Block player enter when a drag initiates from an overlaying container
|
2018-03-08 18:16:23 +09:00 |
|
TocoToucan
|
2cb197d0c4
|
Replace ConfigureBackgroundUpdate with OnEntering
|
2018-03-08 11:35:00 +03:00 |
|
Dean Herbert
|
8f3f886805
|
Merge branch 'master' into PlayerBase
|
2018-03-08 16:12:12 +09:00 |
|
Dean Herbert
|
81c1ec2005
|
Merge branch 'master' into fix-unplayable-beatmaps
|
2018-03-08 13:02:57 +09:00 |
|
Dean Herbert
|
91c984ed97
|
Merge branch 'master' into rewrite-break-overlay
|
2018-03-08 09:31:59 +09:00 |
|
Dean Herbert
|
81b778fdcf
|
Merge branch 'master' into cursor-trail
|
2018-03-08 09:31:42 +09:00 |
|
pdrapoport
|
3731cbe5eb
|
Removing "mouse wheel disabled" checkbox from visual settings gameplay menu
|
2018-03-07 14:20:59 +01:00 |
|
Dean Herbert
|
6a768e378a
|
Merge branch 'master' into rewrite-break-overlay
|
2018-03-07 17:00:34 +09:00 |
|
smoogipoo
|
78d73d4c11
|
Additional fixes for flow ordering after framework changes
|
2018-03-06 17:20:58 +09:00 |
|
smoogipoo
|
148551afa2
|
osu!-side changes in-line with framework layout changes
|
2018-03-06 14:12:37 +09:00 |
|
TocoToucan
|
697ad63d72
|
Resolve merge conflicts
|
2018-03-05 22:24:25 +03:00 |
|
Dean Herbert
|
4aafc2228e
|
Improve skip button behaviour when mouse buttons are down
|
2018-03-06 00:53:40 +09:00 |
|
Dean Herbert
|
d115c56742
|
Avoid using input blocking
|
2018-03-06 00:27:55 +09:00 |
|
Dean Herbert
|
792a3ac469
|
SkipButton -> SkipOverlay
|
2018-03-06 00:10:53 +09:00 |
|
Dean Herbert
|
53edfedfc8
|
Remove unneeded HighFrequencyMousePosition from GameplayMenuOverlay
|
2018-03-05 19:43:57 +09:00 |
|
Dean Herbert
|
7d11e55d06
|
Only block mouse input when the shaded portion of the SkipButton is hovered
|
2018-03-05 19:43:33 +09:00 |
|
Dean Herbert
|
c6c55c40ed
|
Rewrite BreakOverlay
No longer relies on Schedule calls (could not be rewound).
Also no longer sucks.
|
2018-03-04 00:51:24 +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 |
|
Dean Herbert
|
bd510e5356
|
Merge remote-tracking branch 'upstream/master' into clock-fixes
|
2018-03-02 21:01:53 +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 |
|
Dean Herbert
|
bda673e6fe
|
Merge branch 'master' into player-reduced-parallax
|
2018-02-28 23:15:25 +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 |
|
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 |
|
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
|
c0d983bbdf
|
Merge branch 'master' into PlayerBase
|
2018-02-23 13:51:11 +09:00 |
|
Dean Herbert
|
f2b3d9a0e8
|
Change some missed instances
|
2018-02-22 14:17:35 +09:00 |
|
Dan Balasescu
|
34f76a4136
|
Merge branch 'master' into storyboard-improvements
|
2018-02-19 15:40:09 +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
|
e0faf14a3e
|
Actually consume ReplacesBackground
|
2018-02-19 12:33:07 +09:00 |
|
Dean Herbert
|
29adedfa96
|
Collapse visual settings by default in player
|
2018-02-16 12:47:32 +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
|
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
|
6f29cd35af
|
Merge branch 'master' into PlayerResumeHotfix
|
2018-02-13 20:21:45 +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 |
|
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 |
|
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
|
b500b76407
|
Merge branch 'master' into update-branch
|
2018-02-08 23:35:48 +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
|
647cc4bdad
|
Remove in-between properties
|
2018-02-07 18:04:32 +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 |
|
Dean Herbert
|
9bfec9b233
|
Tidy up state change logic
|
2018-02-06 14:30:01 +09:00 |
|
Dean Herbert
|
dd8955cd90
|
Fix skip button not receiving screen-wide input
|
2018-02-06 14:29:03 +09:00 |
|
tgi74000
|
b0fbae9dfc
|
Fix PlayerSettingsOverlay not reappearing when Hidden
|
2018-02-01 16:07:49 +01:00 |
|
Dan Balasescu
|
c1d5a68e4d
|
Merge branch 'master' into VisualSettingsOverlay
|
2018-02-01 16:37:04 +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 |
|
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 |
|
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 |
|
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
|
8d11596b2f
|
Minor cleanups
|
2018-01-24 17:48:42 +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 |
|
Dan Balasescu
|
fcea12f83d
|
Merge branch 'master' into allow-quick-retry-key
|
2018-01-23 14:59:15 +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 |
|
Michael Manis
|
794ae5380a
|
Intverted conditionals.
|
2018-01-22 01:06:27 -05: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 |
|
smoogipoo
|
a05032779f
|
Remove unneeded event binding
|
2018-01-18 00:04:33 +09:00 |
|
smoogipoo
|
c79603290d
|
Move TriggerChange to LoadComplete()
|
2018-01-17 21:52:57 +09:00 |
|
Dan Balasescu
|
be225eff90
|
Merge branch 'master' into fix-replays
|
2018-01-17 18:01:41 +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
|
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 |
|
Dean Herbert
|
9b33499fe7
|
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
|
2018-01-16 20:04:34 +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 |
|
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 |
|
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 |
|
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 |
|
smoogipoo
|
d0b177e233
|
Proxying isn't needed anymore
|
2018-01-12 19:50:09 +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
|
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 |
|
smoogipoo
|
512e4d2c9f
|
Rewrite the way that cursor overrides are done game-wide
|
2018-01-12 18:13:17 +09:00 |
|
james58899
|
f83c84a0a6
|
keep BlurTo
|
2018-01-12 14:24:42 +08: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 |
|
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 |
|
TocoToucan
|
98851e4a78
|
Stop time whenever visual settings are expanded
|
2018-01-11 01:24:34 +03: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 |
|
smoogipoo
|
17e7f75aca
|
More osu!-side bindable fixes
|
2018-01-10 15:41:13 +09:00 |
|
Dean Herbert
|
9ec8f130a6
|
Ensure changes are only applied when we are the current screen
|
2018-01-10 13:24:26 +09:00 |
|
TocoToucan
|
c48c7b085c
|
Visual settings initial commit
|
2018-01-10 02:24:51 +03: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
|
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 |
|
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 |
|
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
|
a1d94d7adf
|
Merge branch 'master' into sliderbar-tooltip-precision
|
2018-01-05 20:48:30 +09:00 |
|
Dean Herbert
|
37d393bca0
|
Update licence headers
|
2018-01-05 20:21:19 +09:00 |
|
smoogipoo
|
1571c10c42
|
Fix up replay settings sliderbar formatting
|
2018-01-05 14:37:32 +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 |
|
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
|
2291053205
|
Merge branch 'master' into wedge-unicode
|
2018-01-03 13:12:42 +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
|
c0dd812a4c
|
Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods
|
2018-01-02 15:33:08 +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
|
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 |
|
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 |
|
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
|
d9a80dae5d
|
Male NoFail use an applicable interface
|
2017-12-31 04:10:29 +09:00 |
|
Aergwyn
|
1ef4ff6776
|
order statistics before adding to resultpage
|
2017-12-30 18:07:53 +01:00 |
|
Aergwyn
|
138d78309f
|
add HitCount enum and replace string usage with enum
|
2017-12-30 18:07:30 +01: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 |
|
ColdVolcano
|
df62ca14b7
|
Don't unbind when not necessary
|
2017-12-29 23:41:36 -06:00 |
|
ColdVolcano
|
3845c7ac7d
|
Remove bluring of storyboard
|
2017-12-28 14:31:34 -06:00 |
|
Dean Herbert
|
0cea018576
|
Use a more suiting (?) icon for import dialog
Closes #1763.
|
2017-12-28 21:24:40 +09:00 |
|
Dean Herbert
|
e0f23a056a
|
Fix crash from being able to perform selection after entering play mode
Closes #1757
|
2017-12-28 21:07:19 +09:00 |
|
Dean Herbert
|
e77dc368ba
|
Merge branch 'master' into fix-pause-overlay-selection
|
2017-12-28 14:01:36 +09:00 |
|
Dean Herbert
|
e4a8402d3c
|
Use better logic
We need to still perform selection if selectedBeatmap itself is null
|
2017-12-28 12:38:40 +09:00 |
|
FreezyLemon
|
33480b85c8
|
fix for Drawables being empty crashing
|
2017-12-28 03:35:53 +01:00 |
|
FreezyLemon
|
998f9c090d
|
select pause buttons after mouse move only
|
2017-12-28 01:56:10 +01:00 |
|
Dan Balasescu
|
dcd994e65b
|
Merge branch 'master' into better-notification-delays
|
2017-12-27 23:58:04 +09:00 |
|
Dan Balasescu
|
3bfa6bd9fd
|
Merge branch 'master' into better-notification-delays
|
2017-12-27 23:26:57 +09:00 |
|
Dan Balasescu
|
3a2dadc9d3
|
Fix spelling error
|
2017-12-27 23:14:48 +09:00 |
|
Dean Herbert
|
07e0c423f5
|
Merge branch 'master' into fix-beatmap-wedge-appear
|
2017-12-27 22:58:50 +09:00 |
|
smoogipoo
|
7a793eaded
|
Merge master into netstandard
|
2017-12-27 20:48:53 +09:00 |
|
Dean Herbert
|
324a7d6377
|
Merge remote-tracking branch 'upstream/master' into better-testcase-player
|
2017-12-27 20:26:38 +09:00 |
|
Dan Balasescu
|
1af7f71c97
|
Merge branch 'master' into notification-verbosity
|
2017-12-27 15:01:28 +09:00 |
|
Dean Herbert
|
18d2be75d5
|
Fix random selection happening more than once on quick imports
|
2017-12-27 13:04:50 +09:00 |
|
Dean Herbert
|
cf9a9762f7
|
Fix beatmap wedge appearing with incorrect info on entering song select
Closes #1762
|
2017-12-27 13:02:21 +09:00 |
|
Dean Herbert
|
ae9f08f387
|
Fix crash in editor when trying to seek on a virtual track
|
2017-12-27 11:47:04 +09:00 |
|
Dean Herbert
|
d17f6cb564
|
Fix crash when starting play mode with no beatmap
Closes #1767
|
2017-12-27 11:46:44 +09:00 |
|
Dean Herbert
|
94449ed597
|
Merge branch 'master' into notification-verbosity
|
2017-12-26 20:48:59 +09:00 |
|
Dean Herbert
|
35ae5173cd
|
Merge branch 'master' into better-notification-delays
|
2017-12-26 20:48:41 +09:00 |
|
Dean Herbert
|
3182c22c7d
|
Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info
|
2017-12-26 20:36:22 +09:00 |
|
Dean Herbert
|
7504cd589d
|
Move alpha handling to state
|
2017-12-26 20:18:47 +09:00 |
|
Dean Herbert
|
ee67e7119d
|
Merge remote-tracking branch 'upstream/master' into fix-info-wedge
|
2017-12-26 19:44:28 +09:00 |
|
Aergwyn
|
44fbe7859a
|
move anchor and origin so metadata doesn't move if it's partially empty
|
2017-12-26 11:34:26 +01:00 |
|
Dan Balasescu
|
11542b697c
|
Merge branch 'master' into improve-screen-offset
|
2017-12-26 17:53:13 +09:00 |
|
Dean Herbert
|
ab6c93fba4
|
Merge branch 'master' into notification-verbosity
|
2017-12-26 16:14:24 +09:00 |
|
Dean Herbert
|
3524ad3dc2
|
Merge remote-tracking branch 'upstream/master' into better-notification-delays
|
2017-12-26 16:10:57 +09:00 |
|
Dan Balasescu
|
f7a54a203b
|
Merge branch 'master' into beatmap-import-prompt
|
2017-12-26 16:00:37 +09:00 |
|
Dan Balasescu
|
d089e27cad
|
Merge branch 'master' into osu-prefixed-text
|
2017-12-26 15:40:29 +09:00 |
|
Dean Herbert
|
9ccc49c9b5
|
Make selection triggering more liberal
|
2017-12-26 15:32:39 +09:00 |
|