Dean Herbert
|
635046acff
|
Merge branch 'master' into taiko-namespace
|
2019-01-22 10:26:25 +09:00 |
|
Dean Herbert
|
21317806c9
|
Merge remote-tracking branch 'upstream/master' into nwabear-master
|
2019-01-22 10:07:35 +09:00 |
|
Dean Herbert
|
7baff750de
|
Consolidate layout, wording and ordering with VisualSettings
|
2019-01-22 10:06:30 +09:00 |
|
Dean Herbert
|
b373d78143
|
Add slight easing
|
2019-01-22 09:47:51 +09:00 |
|
Dean Herbert
|
25b5bbcd8f
|
Merge branch 'master' into score-panel-layout
|
2019-01-22 09:43:37 +09:00 |
|
Christian Kamphausen
|
86581feb4a
|
Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H
|
2019-01-22 01:29:58 +01:00 |
|
chrisny286
|
d7d2e2fe44
|
trimmed whitespace
|
2019-01-21 19:22:19 +01:00 |
|
chrisny286
|
65fd69c817
|
Update HUDOverlay.cs
separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container
|
2019-01-21 19:10:29 +01:00 |
|
chrisny286
|
fb51578df3
|
Update PlayerSettingsOverlay.cs
Framework renamed this variable so it needs to be renamed here too.
|
2019-01-21 17:19:40 +01:00 |
|
Bear Daniel
|
7cdb823c87
|
Moved "Use beatmap hitsounds" button
|
2019-01-21 08:04:06 -06:00 |
|
Dean Herbert
|
4eb5e67075
|
Fix overlays not being correctly offset by toolbar padding
|
2019-01-21 19:34:35 +09:00 |
|
ekrctb
|
e74f0057bd
|
Automatically layout based on score display width
|
2019-01-21 17:07:56 +09:00 |
|
ekrctb
|
0573c1c923
|
Fix taiko namespace ignored
|
2019-01-21 14:20:37 +09:00 |
|
Dean Herbert
|
5579b52bdf
|
Merge branch 'master' into master
|
2019-01-20 20:16:20 +09:00 |
|
Shane Woolcock
|
fa6dd8c99e
|
Code sanity
|
2019-01-20 19:03:06 +10:30 |
|
Shane Woolcock
|
521b11dfcb
|
Use QuadBatch rather than LinearBatch of quads for LogoVisualisation
GL_QUADS is deprecated, and is not supported at all on OpenGL ES.
This fixes the logo visualisation not drawing on iOS.
|
2019-01-20 18:51:17 +10:30 |
|
Bear Daniel
|
858541bcf4
|
Added "Use beatmap hitsounds" button to volume section of settings
|
2019-01-18 02:33:39 -06:00 |
|
nwabear
|
42fa04beee
|
Update SkinSection.cs
Added "Use beatmap skins" button to general settings
|
2019-01-17 14:40:22 -06:00 |
|
Dean Herbert
|
b904bd9e8f
|
Update framework
|
2019-01-17 22:13:41 +09:00 |
|
Dean Herbert
|
5269ca31be
|
Merge branch 'master' into fix-room-inspector-cover
|
2019-01-17 21:49:25 +09:00 |
|
Dean Herbert
|
1d40d88f82
|
Merge branch 'master' into add-room-null-check
|
2019-01-17 21:34:25 +09:00 |
|
Dan Balasescu
|
b9c3b33e26
|
Merge branch 'master' into fix-room-inspector-cover
|
2019-01-17 20:55:17 +09:00 |
|
Dean Herbert
|
93a08bdb23
|
Remove stray using
|
2019-01-17 20:23:15 +09:00 |
|
Dean Herbert
|
d16f4af92b
|
Use TransferValueOnCommit for mouse sensitivity
|
2019-01-17 19:18:40 +09:00 |
|
Dean Herbert
|
59f7c5a26e
|
Fix room inspector cover not resetting when no room selected
|
2019-01-17 18:44:22 +09:00 |
|
Dean Herbert
|
ba9cdf2ce2
|
Add null check to fix crash on deselecting multiplayer room
|
2019-01-17 18:17:47 +09:00 |
|
Dean Herbert
|
491537b8ba
|
Add fade duration
Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.
|
2019-01-17 18:13:05 +09:00 |
|
Dean Herbert
|
c1f5c0edc9
|
Merge branch 'master' into hide-multiplayer-match-room-tab
|
2019-01-17 18:02:17 +09:00 |
|
Dean Herbert
|
4082c0e8e0
|
Merge branch 'master' into fix-slider-bar-tooltip-not-shown-until-value-is-changed
|
2019-01-17 17:34:04 +09:00 |
|
ekrctb
|
2bc3464802
|
Hide Room tab when Settings tab is active
|
2019-01-17 17:27:34 +09:00 |
|
ekrctb
|
6bfae52305
|
Fix sliders don't show tooltip until first change
|
2019-01-17 17:03:53 +09:00 |
|
ekrctb
|
f982b6da55
|
Don't hide 'hold for menu' even hud is hidden
|
2019-01-17 16:49:04 +09:00 |
|
Dean Herbert
|
99c963c56a
|
Merge branch 'master' into cancel-request-on-disposal
|
2019-01-17 15:29:49 +09:00 |
|
ekrctb
|
b6fb3a5c05
|
Cancel request on disposal for RoomInspector
|
2019-01-17 15:14:30 +09:00 |
|
Dean Herbert
|
2ab0c4632e
|
Merge branch 'master' into menu-background-skinning
|
2019-01-17 14:23:03 +09:00 |
|
Dan Balasescu
|
824fff5c85
|
Merge branch 'master' into fix-sticking-cursor
|
2019-01-17 12:06:00 +09:00 |
|
Dean Herbert
|
7bcf056872
|
Merge branch 'master' into update-framework
|
2019-01-16 19:16:53 +09:00 |
|
Dean Herbert
|
5ff58870b8
|
Update framework
|
2019-01-16 19:05:46 +09:00 |
|
Dean Herbert
|
3abfaea7ac
|
Stop cursor from sticking to edges of scaled game window
|
2019-01-16 17:21:26 +09:00 |
|
Dan Balasescu
|
75113db438
|
Merge branch 'master' into fix-skip-button-scaling
|
2019-01-16 16:37:37 +09:00 |
|
Dean Herbert
|
bfb18b4ffb
|
Update framework and other nuget packages
|
2019-01-16 10:14:37 +09:00 |
|
Dean Herbert
|
7ef127a3bf
|
Merge branch 'master' into update_tab_item_font
|
2019-01-15 18:31:16 +09:00 |
|
Unknown
|
6eff79913b
|
remove blank lines
|
2019-01-11 10:34:56 +01:00 |
|
Dean Herbert
|
e2dd025225
|
Fix scaling of SkipOverlay when UI scale is adjusted
Closes #4040.
|
2019-01-11 16:54:42 +09:00 |
|
Min
|
29e8c21c46
|
Merge branch 'master' into menu-background-skinning
|
2019-01-11 11:36:20 +09:00 |
|
Dean Herbert
|
c1656a7608
|
Update framework
|
2019-01-10 21:22:42 +09:00 |
|
Dean Herbert
|
0a24d188b4
|
Remove TryGetValue as it won't work
|
2019-01-10 19:01:41 +09:00 |
|
Dean Herbert
|
8cd058ed9a
|
Merge branch 'master' into moreOptionsFromSkin.ini
|
2019-01-10 18:38:20 +09:00 |
|
Dean Herbert
|
aa68bbc1d9
|
Merge branch 'master' into fix-match-select-crash
|
2019-01-10 15:40:03 +09:00 |
|
Dean Herbert
|
930d6382c7
|
Merge pull request #4016 from smoogipoo/fix-link-flow
Fix links not working in partially masked text flow
|
2019-01-10 15:19:58 +09:00 |
|
smoogipoo
|
4578d36a67
|
Add comment
|
2019-01-10 14:55:36 +09:00 |
|
Dean Herbert
|
e04da7de1e
|
Merge pull request #4017 from smoogipoo/lounge-leaderboard
Show match participants in the lounge
|
2019-01-10 14:36:26 +09:00 |
|
Dean Herbert
|
a264b67d58
|
Merge branch 'master' into moreOptionsFromSkin.ini
|
2019-01-10 14:33:34 +09:00 |
|
Dan Balasescu
|
bb36f457fe
|
Merge branch 'master' into add-ui-scale
|
2019-01-10 14:25:38 +09:00 |
|
Dan Balasescu
|
e6c2d29a8e
|
Merge branch 'master' into moreOptionsFromSkin.ini
|
2019-01-10 14:01:52 +09:00 |
|
Dean Herbert
|
5e4bea9d99
|
Fix extra newline
|
2019-01-10 12:11:14 +09:00 |
|
Dean Herbert
|
4f5c208672
|
Add UI scale
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
|
2019-01-09 19:01:33 +09:00 |
|
Dean Herbert
|
045ed741b0
|
Fix API getting stuck in eternal failing state if login request fails
|
2019-01-09 15:29:27 +09:00 |
|
Dean Herbert
|
2dc185f249
|
Display avatars rather than full scores
|
2019-01-09 15:27:08 +09:00 |
|
Dean Herbert
|
0bf9e9b86b
|
Merge branch 'master' into lounge-leaderboard
|
2019-01-09 10:28:55 +09:00 |
|
Dean Herbert
|
e4ff36a5bc
|
Merge pull request #4013 from smoogipoo/beatmap-scores-foreignkey
Add explicit beatmap -> scores deletions rather than relying on FK cascades
|
2019-01-08 21:39:15 +09:00 |
|
Dean Herbert
|
415df52c69
|
Update framework
|
2019-01-08 21:26:24 +09:00 |
|
Dean Herbert
|
958840fe17
|
Merge branch 'master' into fix-sliderbar
|
2019-01-08 21:23:34 +09:00 |
|
Dean Herbert
|
6ce08312b2
|
Merge branch 'master' into fix-match-select-crash
|
2019-01-08 20:29:55 +09:00 |
|
Dan Balasescu
|
8214faeacc
|
Merge branch 'master' into fix-over-inclusive-channel-search
|
2019-01-08 19:54:31 +09:00 |
|
smoogipoo
|
2a4c91a6ab
|
Remove unused using
|
2019-01-08 19:26:24 +09:00 |
|
smoogipoo
|
122fc2de58
|
Show room leaderboard instead in the lounge
|
2019-01-08 19:24:55 +09:00 |
|
smoogipoo
|
da98915c0c
|
Fix links not working in partially masked text flow
|
2019-01-08 18:59:01 +09:00 |
|
smoogipoo
|
b17b88d071
|
Fix null beatmap possibly being selected
|
2019-01-08 18:06:46 +09:00 |
|
smoogipoo
|
cf8bcb7ba2
|
Add explicit beatmap -> scores relationship rather than relying on cascades
|
2019-01-08 17:53:43 +09:00 |
|
smoogipoo
|
2c44b928d3
|
Remove unused references
|
2019-01-08 16:38:34 +09:00 |
|
smoogipoo
|
daeba63242
|
Remove more unused code
|
2019-01-08 16:37:18 +09:00 |
|
smoogipoo
|
38a3ccc817
|
Use value where applicable
|
2019-01-08 16:31:44 +09:00 |
|
smoogipoo
|
8692be9de3
|
Fix sliderbar not working correctly with TransferValueOnCommit = true
|
2019-01-08 16:07:54 +09:00 |
|
Dean Herbert
|
a2a7aa708f
|
Use better logic for setting slider bar settings
|
2019-01-08 14:56:42 +09:00 |
|
Dean Herbert
|
01aa4c2a72
|
Use TransferOnCommit
|
2019-01-08 13:48:38 +09:00 |
|
Dean Herbert
|
199b614eba
|
Fix masking being unapplied incorrectly
|
2019-01-08 13:36:07 +09:00 |
|
Dean Herbert
|
440f4703cb
|
Fix toolbar offset not being applied
|
2019-01-08 12:57:31 +09:00 |
|
Dean Herbert
|
dd960e6a89
|
Remove unused variable
|
2019-01-08 12:50:42 +09:00 |
|
Dean Herbert
|
647a30279f
|
Merge branch 'master' into moreOptionsFromSkin.ini
|
2019-01-08 11:46:08 +09:00 |
|
Dean Herbert
|
276014f591
|
Merge branch 'master' into update-framework
|
2019-01-08 11:26:10 +09:00 |
|
Dean Herbert
|
2fc3e77be7
|
Merge branch 'master' into letterboxing
|
2019-01-08 11:26:09 +09:00 |
|
Dean Herbert
|
11861f4cc9
|
Merge branch 'master' into moreOptionsFromSkin.ini
|
2019-01-08 11:26:08 +09:00 |
|
Dean Herbert
|
881b10a18f
|
Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini
|
2019-01-08 11:01:04 +09:00 |
|
Dean Herbert
|
7eed3ffe75
|
Merge branch 'master' into moreOptionsFromSkin.ini
|
2019-01-08 10:02:06 +09:00 |
|
Dean Herbert
|
4cee21f356
|
Make skinning better
|
2019-01-07 20:12:39 +09:00 |
|
Dean Herbert
|
8eedef3e86
|
Move cancellation to safer place
|
2019-01-07 19:31:05 +09:00 |
|
Dean Herbert
|
d72412d24d
|
Fix leaderboard not correctly handling cancellation
|
2019-01-07 19:28:46 +09:00 |
|
Dean Herbert
|
70d644406f
|
Merge remote-tracking branch 'origin/update-framework' into letterboxing
# Conflicts:
# osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
|
2019-01-07 18:53:53 +09:00 |
|
Dean Herbert
|
74539b5e5c
|
Merge remote-tracking branch 'upstream/master' into letterboxing
|
2019-01-07 18:52:48 +09:00 |
|
Dean Herbert
|
49ba4e5a14
|
Merge branch 'master' into update-framework
|
2019-01-07 18:51:54 +09:00 |
|
Dean Herbert
|
ca98caf84b
|
Merge pull request #4001 from UselessToucan/linq_temp
Use Find instead of FirstOrDefault
|
2019-01-07 18:50:59 +09:00 |
|
Dean Herbert
|
f6018294b5
|
Update framework
|
2019-01-07 18:50:27 +09:00 |
|
Dean Herbert
|
13b077c83b
|
Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini
|
2019-01-07 18:11:17 +09:00 |
|
Dean Herbert
|
73c2fcac08
|
Remove broken SettingsLabel class
|
2019-01-07 17:03:59 +09:00 |
|
Roman Kapustin
|
4b5fc85875
|
Use Find instead of FirstOrDefault
|
2019-01-05 19:35:33 +03:00 |
|
Dean Herbert
|
4a7c6fb19d
|
Fix PP not display on profile overlay
|
2019-01-04 16:33:35 +09:00 |
|
Dean Herbert
|
7d1163a7d2
|
Remove unnecessary null check
|
2019-01-04 15:49:23 +09:00 |
|
Dean Herbert
|
f2ccf70d1b
|
Backdate license header for now
|
2019-01-04 15:37:27 +09:00 |
|
Dean Herbert
|
c528a3896d
|
Formatting and naming
|
2019-01-04 15:34:32 +09:00 |
|