smoogipoo
|
b27b6c7eb7
|
Merge branch 'master' into cursor-trail
|
2018-03-16 14:43:27 +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 |
|
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
|
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
|
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 |
|
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 |
|
Dean Herbert
|
bd510e5356
|
Merge remote-tracking branch 'upstream/master' into clock-fixes
|
2018-03-02 21:01:53 +09:00 |
|
Dean Herbert
|
bda673e6fe
|
Merge branch 'master' into player-reduced-parallax
|
2018-02-28 23:15:25 +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 |
|
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
|
f64afc738d
|
Fix incorrect exit block conditional
Resolves #2130.
|
2018-02-27 23:59:34 +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
|
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 |
|
TocoToucan
|
c57e8785e2
|
Move all storyboard loading to Player itself
|
2018-02-15 23:57:53 +03: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 |
|
TocoToucan
|
4535e09607
|
Add missing license header
|
2018-02-09 00:36:31 +03:00 |
|