smoogipoo
|
8d11596b2f
|
Minor cleanups
|
2018-01-24 17:48:42 +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 |
|
smoogipoo
|
b4e1872322
|
osu!-side changes in-line with framework BDL cache changes
|
2018-01-22 12:56:30 +09: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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
Dean Herbert
|
9bce322682
|
Merge branch 'master' into wedge-unicode
|
2018-01-04 15:09:31 +09:00 |
|