|
|
456e6a6601
|
Merge branch 'master' into remember-fps-display-state
|
2019-05-14 18:54:04 +09:00 |
|
|
|
4c221e43a9
|
Apply minimal changes to make framework compile
|
2019-05-14 18:39:56 +09:00 |
|
|
|
f2e5beec11
|
Update framework
|
2019-05-14 18:35:35 +09:00 |
|
|
|
5308a68103
|
Merge remote-tracking branch 'upstream/master' into remember-fps-display-state
|
2019-05-14 18:35:19 +09:00 |
|
|
|
ec5b024fa6
|
Define toolbarElements
|
2019-05-14 18:34:25 +09:00 |
|
|
|
a0c03d7fc3
|
Merge remote-tracking branch 'upstream/master' into exit-hide-music-controller
|
2019-05-14 18:14:57 +09:00 |
|
|
|
d3d20773ee
|
Merge branch 'master' into fullscreen-overlay
|
2019-05-14 17:40:20 +09:00 |
|
|
|
bffde7de08
|
Merge branch 'master' into exit-hide-music-controller
|
2019-05-14 17:36:38 +09:00 |
|
|
|
fad9e73999
|
Add null check in disposal clause
|
2019-05-14 17:08:54 +09:00 |
|
|
|
d040fe9635
|
Merge branch 'master' into tidy-osu-game
|
2019-05-14 16:52:56 +09:00 |
|
|
|
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 |
|
|
|
f1c9073338
|
Fix commented line check not working with whitespace
|
2019-05-14 16:16:55 +09:00 |
|
|
|
9aef4abf75
|
Merge pull request #4783 from smoogipoo/remove-unnecessary-allocations
Reduce unnecessary allocations
|
2019-05-14 16:03:04 +09:00 |
|
|
|
c312a2e53c
|
Merge branch 'master' into fullscreen-overlay
|
2019-05-14 15:22:23 +09:00 |
|
|
|
e893925417
|
Move shadow fade logic
|
2019-05-14 15:19:23 +09:00 |
|
|
|
29bdc97ab7
|
Remove unnecessary DI
|
2019-05-14 15:07:18 +09:00 |
|
|
|
cb2b14e501
|
Centralise fullscreen overlay logic
|
2019-05-14 14:20:53 +09:00 |
|
|
|
4abe987e11
|
Add new colour palette
|
2019-05-14 13:28:16 +09:00 |
|
|
|
0d57cf6599
|
Remember FPS display state after changing via Ctrl+F11 hotkey
|
2019-05-14 13:13:51 +09:00 |
|
|
|
93b26cd026
|
Reduce unnecessary allocations
|
2019-05-14 13:04:49 +09:00 |
|
|
|
7553e2da25
|
Fix incorrect DI reference and update naming of SettingsOverlay classes
|
2019-05-14 10:45:05 +09:00 |
|
|
|
4b508915f6
|
Centralise caching of components at OsuGame level
|
2019-05-13 17:10:25 +09:00 |
|
|
|
5ea87d9467
|
Merge remote-tracking branch 'upstream/master' into use-volumemute-icon
|
2019-05-13 07:24:39 +09:00 |
|
|
|
8110d6768c
|
Inherit OsuButton
|
2019-05-13 07:24:34 +09:00 |
|
|
|
c119a6a135
|
Use VolumeMute icon for mute button
|
2019-05-12 09:30:43 -07:00 |
|
|
|
f14690e3b8
|
Swap profile play styles and last visit positions
|
2019-05-12 09:04:11 -07:00 |
|
|
|
da2338581b
|
Merge branch 'master' into dev
|
2019-05-12 23:13:46 +09:00 |
|
|
|
487a56549e
|
Fix CI issues
|
2019-05-12 22:53:12 +09:00 |
|
|
|
41e13aef23
|
Use more standard parsing method
|
2019-05-12 22:53:03 +09:00 |
|
|
|
65097fddc1
|
Hide music controller when exiting via Alt-F4
Closes #4764.
|
2019-05-12 22:34:58 +09:00 |
|
|
|
1c3b768266
|
Use Precision.AlmostBigger
|
2019-05-12 09:02:22 -04:00 |
|
|
|
ce0e4c506e
|
Merge branch 'master' into dev
|
2019-05-12 21:45:52 +09:00 |
|
|
|
1a6c8e91a5
|
Compare Health with small value
|
2019-05-12 08:44:20 -04:00 |
|
|
|
82599127fd
|
Merge branch 'master' into patch-1
|
2019-05-12 20:30:25 +09:00 |
|
|
|
7adaa09263
|
Move tab channel class into tab item class
|
2019-05-12 06:31:11 -04:00 |
|
|
|
8957ad5a7e
|
Instantiate channel in tab item
|
2019-05-12 06:26:03 -04:00 |
|
|
|
d53fb9a5c8
|
Check against type instead of channel name
|
2019-05-12 06:11:16 -04:00 |
|
|
|
496a9dd41d
|
Create separate type for Join-Channel button
|
2019-05-12 06:02:21 -04:00 |
|
|
|
038e49701e
|
Move conditional to within BreakPeriod
|
2019-05-12 16:25:25 +09:00 |
|
|
|
1391aa342c
|
Merge branch 'master' into break-pause
|
2019-05-12 16:15:24 +09:00 |
|
|
|
3566da73cc
|
Merge branch 'master' into fix-more-pause-cases
|
2019-05-12 15:57:45 +09:00 |
|
|
|
9add2562f9
|
Close beatmap options when suspending (#4761)
Close beatmap options when suspending
|
2019-05-12 15:50:10 +09:00 |
|
|
|
790700d8bf
|
Use more correct calculation
|
2019-05-12 15:40:58 +09:00 |
|
|
|
175daac16a
|
Close beatmap options when suspending
|
2019-05-11 21:26:42 -07:00 |
|
|
|
29cec54b3c
|
Fix beatmap carousel overlapping beatmap info wedge
|
2019-05-11 20:08:45 -07:00 |
|
|
|
c508b8ed6b
|
Trim whitespace
|
2019-05-11 19:21:12 -04:00 |
|
|
|
3971a49549
|
Ignore Add-channel button
|
2019-05-11 19:16:15 -04:00 |
|
|
|
6cf1ca288f
|
Do not try to join the Add-channel button
|
2019-05-11 19:13:48 -04:00 |
|
|
|
bde2d552b6
|
Merge remote-tracking branch 'origin/master' into fix-more-pause-cases
# Conflicts:
# osu.Game.Tests/Visual/Gameplay/TestCasePause.cs
|
2019-05-10 22:16:59 +09:00 |
|
|
|
01eb1a34a9
|
Remove unused variable
|
2019-05-10 22:15:33 +09:00 |
|
