Commit Graph

18323 Commits

Author SHA1 Message Date
Dean Herbert
ec5b024fa6 Define toolbarElements 2019-05-14 18:34:25 +09:00
Dean Herbert
a0c03d7fc3 Merge remote-tracking branch 'upstream/master' into exit-hide-music-controller 2019-05-14 18:14:57 +09:00
Dan Balasescu
c9e5d30744
Merge pull request #4786 from peppy/fullscreen-overlay
Centralise full screen overlay logic into a base class
2019-05-14 17:59:24 +09:00
Dan Balasescu
d3d20773ee
Merge branch 'master' into fullscreen-overlay 2019-05-14 17:40:20 +09:00
Dan Balasescu
bffde7de08
Merge branch 'master' into exit-hide-music-controller 2019-05-14 17:36:38 +09:00
Dean Herbert
fad9e73999 Add null check in disposal clause 2019-05-14 17:08:54 +09:00
Dan Balasescu
b2fe9dd1a0
Merge pull request #4774 from peppy/tidy-osu-game
Centralise caching of components at OsuGame level
2019-05-14 17:02:48 +09:00
Dan Balasescu
d040fe9635
Merge branch 'master' into tidy-osu-game 2019-05-14 16:52:56 +09:00
Dean Herbert
a52690ed9a
Fix commented line check not working with whitespace (#4788)
Fix commented line check not working with whitespace
2019-05-14 16:47:46 +09:00
smoogipoo
f1c9073338 Fix commented line check not working with whitespace 2019-05-14 16:16:55 +09:00
Dean Herbert
9aef4abf75
Merge pull request #4783 from smoogipoo/remove-unnecessary-allocations
Reduce unnecessary allocations
2019-05-14 16:03:04 +09:00
Dean Herbert
c312a2e53c
Merge branch 'master' into fullscreen-overlay 2019-05-14 15:22:23 +09:00
Dean Herbert
e893925417 Move shadow fade logic 2019-05-14 15:19:23 +09:00
Dean Herbert
a765f2502d Add simple test case for FullscreenOverlay 2019-05-14 15:14:00 +09:00
Dean Herbert
29bdc97ab7 Remove unnecessary DI 2019-05-14 15:07:18 +09:00
Dean Herbert
ca2662e941 Rename incorrectly named test cases 2019-05-14 14:58:36 +09:00
Dean Herbert
cb2b14e501 Centralise fullscreen overlay logic 2019-05-14 14:20:53 +09:00
Dan Balasescu
3d30ecc440
Merge pull request #4785 from peppy/add-new-colours
Add new colour palette
2019-05-14 13:38:04 +09:00
Dean Herbert
4abe987e11 Add new colour palette 2019-05-14 13:28:16 +09:00
smoogipoo
93b26cd026 Reduce unnecessary allocations 2019-05-14 13:04:49 +09:00
Dan Balasescu
157ba01d60
Merge branch 'master' into tidy-osu-game 2019-05-14 12:19:39 +09:00
Dean Herbert
ebfcc8b3ec
Add smoothing to flashlight movement (#4771)
Add smoothing to flashlight movement

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-05-14 11:28:40 +09:00
Dean Herbert
be6da833f8 Move constant local (and break line) 2019-05-14 11:11:57 +09:00
Dean Herbert
a98accb4d4 Add tests for cached types in OsuGame and OsuGameBase 2019-05-14 11:05:53 +09:00
Dean Herbert
7553e2da25 Fix incorrect DI reference and update naming of SettingsOverlay classes 2019-05-14 10:45:05 +09:00
Dan Balasescu
8c07f6b8ff
Merge branch 'master' into flashlight_movement_delay 2019-05-14 10:36:04 +09:00
Dean Herbert
94b9504145
Fix iOS app entry for raw keyboard input (#4780)
Fix iOS app entry for raw keyboard input
2019-05-14 08:59:35 +09:00
Xie Yi
647e2c297c Fix iOS app entry for raw keyboard input 2019-05-14 02:45:12 +08:00
Dan Balasescu
ce5bd71f2d
Merge pull request #4776 from peppy/fix-pause-test-failures
Attempt to fix pause test failures by reducing steps
2019-05-13 22:14:57 +09:00
Dean Herbert
d18504bfe0 Attempt to fix pause test failures by reducing steps 2019-05-13 19:23:38 +09:00
HoLLy
1809c996bb Use Interpolation.ValueAt instead of manually interpolating FL position. 2019-05-13 12:09:19 +02:00
Dean Herbert
3066e32d80
Merge pull request #4775 from peppy/remove-weird-test
Remove unused test case
2019-05-13 17:38:55 +09:00
Dean Herbert
4b8a9bae34 Remove unused test case 2019-05-13 17:17:20 +09:00
Dean Herbert
4b508915f6 Centralise caching of components at OsuGame level 2019-05-13 17:10:25 +09:00
Dan Balasescu
6e0fbaa96d
Merge pull request #4770 from HoLLy-HaCKeR/fix-ctb-2b-diffcalc
Fix order of nested hitobjects on 2B Catch maps
2019-05-13 14:40:37 +09:00
Dan Balasescu
173a543853
Merge branch 'master' into fix-ctb-2b-diffcalc 2019-05-13 14:25:46 +09:00
Dean Herbert
79e86071bc
Merge pull request #4768 from Joehuu/use-volumemute-icon
Use VolumeMute icon for mute button
2019-05-13 09:30:50 +09:00
HoLLy
f7806bc205 Add smoothing to flashlight movement 2019-05-13 01:33:41 +02:00
Dean Herbert
5ea87d9467 Merge remote-tracking branch 'upstream/master' into use-volumemute-icon 2019-05-13 07:24:39 +09:00
Dean Herbert
8110d6768c Inherit OsuButton 2019-05-13 07:24:34 +09:00
Dean Herbert
bcabc9d61f
Swap profile "play styles" and "last visit" positions to match web (#4767)
Swap profile "play styles" and "last visit" positions to match web
2019-05-13 06:54:53 +09:00
HoLLy
b2cdfceafb
Merge branch 'master' into fix-ctb-2b-diffcalc 2019-05-12 22:09:55 +02:00
HoLLy
cb664dd183 Change OfType<> to Cast<> to be more clear 2019-05-12 22:08:47 +02:00
HoLLy
3981cf55fa Fix order of nested hitobjects on 2B Catch maps 2019-05-12 21:31:16 +02:00
Joehu
c119a6a135 Use VolumeMute icon for mute button 2019-05-12 09:30:43 -07:00
Joehu
f14690e3b8 Swap profile play styles and last visit positions 2019-05-12 09:04:11 -07:00
Dean Herbert
dc486579fb
Implement skinning for slider border thickness (#4471)
Implement skinning for slider border thickness

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-05-13 00:02:04 +09:00
Dean Herbert
da2338581b
Merge branch 'master' into dev 2019-05-12 23:13:46 +09:00
Dean Herbert
fbb7338ea3
Fix game not always failing when minimum HP is hit (#4763)
Fix game not always failing when minimum HP is hit
2019-05-12 23:13:26 +09:00
Dean Herbert
daa2786dbd Use a constant for the default value 2019-05-12 23:08:42 +09:00