smoogipoo
0693ab8e7d
Merge remote-tracking branch 'origin/master' into osu-fontusage
...
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb
Adjust sprite texts in-line with framework changes
2019-02-20 15:03:20 +09:00
Dan Balasescu
f6d70e687b
Use correct local variable
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-20 12:27:25 +09:00
Dean Herbert
a6e055b1f8
Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock
2019-02-20 12:08:37 +09:00
Dean Herbert
b4bb87fee3
Make TrackVirtualTracking more accurate on seeks/stops
2019-02-20 12:08:30 +09:00
Dan Balasescu
96590156cd
Merge branch 'master' into add-button-tooltip
2019-02-20 11:37:55 +09:00
Dean Herbert
f2ad2931c7
Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock
2019-02-20 11:37:33 +09:00
smoogipoo
49eadcb575
Update active state immediately + fix potential nullref
2019-02-19 19:44:09 +09:00
smoogipoo
703df77000
Update in-line with framework IsActive changes
2019-02-19 19:16:03 +09:00
smoogipoo
b7b1f0ef0c
Merge branch 'remove-populateattributes' into new-diffcalc-mania
2019-02-19 17:55:56 +09:00
smoogipoo
4dcf39846d
Pass beatmap to CreateSkills()
2019-02-19 17:52:59 +09:00
smoogipoo
1efc5179aa
Merge branch 'remove-populateattributes' into new-diffcalc-mania
2019-02-19 17:46:52 +09:00
smoogipoo
ca8b7f24b4
Remove PopulateAttributes()
2019-02-19 17:36:33 +09:00
smoogipoo
8104c45c25
Merge remote-tracking branch 'origin/master' into new-diffcalc-mania
...
# Conflicts:
# osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyDifficultyCalculator.cs
2019-02-19 16:30:05 +09:00
Dean Herbert
151388dfad
Merge branch 'master' into diffcalc-merging-2
2019-02-19 15:42:15 +09:00
smoogipoo
7ed461aa8c
XMLDoc DifficultyHitObject
2019-02-19 14:30:59 +09:00
smoogipoo
93b7b51d0a
timeRate -> clockRate
2019-02-19 14:29:23 +09:00
smoogipoo
3784b673ae
History -> LimitedCapacityStack + re-xmldoc
2019-02-19 13:51:19 +09:00
smoogipoo
af0bb4d5e8
Remove mods from constructor
2019-02-19 13:40:39 +09:00
Dean Herbert
87dd7bcf6b
Fix one more test regression
2019-02-19 13:02:33 +09:00
Dean Herbert
0fce23a36b
Fix test regression
2019-02-19 12:38:45 +09:00
Dean Herbert
62fe5ad481
Nest class
2019-02-19 12:35:52 +09:00
Dean Herbert
f8033a3b35
Give TestWorkingBeatmap a reference clock
2019-02-19 12:27:30 +09:00
Dean Herbert
133c002d02
Fix test dlls being loaded as actual rulesets (and failing)
2019-02-19 12:13:55 +09:00
David Zhao
af049004dd
Add test cases for transitioning into pause overlay and into results
2019-02-18 19:53:55 +09:00
David Zhao
4e07aba548
Make it so visual tests only load the osu ruleset
2019-02-18 18:12:45 +09:00
David Zhao
1d80674fbd
Fix fadecontainer being added to multiple containers
2019-02-18 17:11:38 +09:00
David Zhao
af30aefe77
Merge branch 'master' into UserDimLogic
2019-02-18 16:56:16 +09:00
David Zhao
80800f2931
Match up fade behavior with current master
2019-02-18 16:34:11 +09:00
David Zhao
9be25c3758
Fix unit tests
2019-02-18 16:00:59 +09:00
David Zhao
f241d67e5f
Use conditional operator isntead of if
2019-02-18 15:23:03 +09:00
Dan Balasescu
c9c8cccd68
Merge branch 'master' into use-lifetime-optimization
2019-02-18 15:22:34 +09:00
smoogipoo
9cce9ce97c
Consider aggregate peaks
2019-02-18 15:00:32 +09:00
smoogipoo
a8faa942a6
Implement new difficulty calculator structure
2019-02-18 14:49:43 +09:00
David Zhao
df148f8787
Fix background dim not being disabled on playerloader exit
2019-02-18 12:55:42 +09:00
Dean Herbert
0a265c6d35
Update osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
...
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-18 11:54:25 +09:00
ThePyrotechnic
7bb56a198a
Merge branch 'master' into MissingSource
2019-02-17 19:54:43 +00:00
Dean Herbert
42dc7644f2
Merge branch 'master' into diffcalc-testcases
2019-02-17 21:06:42 +09:00
smoogipoo
134840f118
Fix nullref
2019-02-16 11:18:17 +09:00
Dean Herbert
4777fd1334
Merge remote-tracking branch 'upstream/master' into fix-screen-tests
2019-02-15 21:29:44 +09:00
Dean Herbert
c607b8c979
Update framework
2019-02-15 21:28:59 +09:00
Dean Herbert
bd4e8e132b
Merge pull request #4264 from nekodex/legacy-hitcircleoverlap-support
...
Add support for the HitCircleOverlap property of legacy skins
2019-02-15 21:27:56 +09:00
Dean Herbert
90e462309f
Add newline
2019-02-15 21:16:54 +09:00
Dean Herbert
89981c02a2
Merge branch 'master' into fix-cursor-on-startup
2019-02-15 21:15:23 +09:00
Jamie Taylor
38cf5a1ea4
Add support for the HitCircleOverlap property in legacy skins
2019-02-15 21:03:06 +09:00
David Zhao
df7acc1d31
Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic
2019-02-15 17:22:04 +09:00
David Zhao
fcc3cf3b7e
Remove extra comma
2019-02-15 17:21:47 +09:00
David Zhao
8693d6a76b
Merge branch 'master' into UserDimLogic
2019-02-15 17:11:21 +09:00
Dean Herbert
5d502250d8
Fix account creation overlay not working
...
Regressed with screen stack changes.
2019-02-15 17:01:51 +09:00
Dean Herbert
65721a01ab
Fix regressed screen test cases
2019-02-15 17:01:06 +09:00
David Zhao
53b7fdd834
Clean up test code and unused includes
2019-02-15 16:57:53 +09:00
Jamie Taylor
3ea13b1ade
Fix mouse cursor appearing prematurely during startup
2019-02-15 16:55:39 +09:00
David Zhao
0a60f6dacd
Documentation for tests and changes
2019-02-15 16:50:37 +09:00
David Zhao
6da9f94ae3
Fix regression with background dim
2019-02-15 16:17:01 +09:00
smoogipoo
280081d589
Fix beatmap ruleset not being set
2019-02-15 14:42:42 +09:00
Dean Herbert
490d48fa5e
Fix MultiplayerTestCase not being abstract
2019-02-15 13:48:14 +09:00
Dean Herbert
1550908edb
Add tooltip to key configuration button
2019-02-15 11:56:33 +09:00
Poyo
66de451b53
Update difficulty color bracket thresholds
2019-02-14 02:19:41 -08:00
David Zhao
3a74ad678a
clean up unused includes
2019-02-14 18:41:10 +09:00
David Zhao
a09e0790e1
Fix storyboards not dimming
2019-02-14 18:07:28 +09:00
David Zhao
e2a312a663
Move user dimming logic into its own container
2019-02-14 17:47:53 +09:00
Dean Herbert
777a606b2d
Don't revert beatmap on exiting leased state
2019-02-14 17:14:58 +09:00
Dean Herbert
813b36e98e
Merge pull request #4191 from peppy/leased-bindables-dont-work
...
Add screen leased bindables via DependencyContainer
2019-02-14 17:05:39 +09:00
Dan Balasescu
9a0859464d
Merge branch 'master' into leased-bindables-dont-work
2019-02-14 16:24:10 +09:00
smoogipoo
f50a0be29d
Add osu! difficulty calculator test
2019-02-14 16:22:14 +09:00
Dean Herbert
3c16b03c60
Merge remote-tracking branch 'upstream/master' into download_button_should_observe_beatmaps_availability
2019-02-14 16:21:06 +09:00
Dean Herbert
a5f1f9830b
Fix potential schedule race case and regression in enum setting
2019-02-14 16:21:01 +09:00
Dean Herbert
503219b528
Merge branch 'master' into dont-log-passwords
2019-02-14 15:52:04 +09:00
Dean Herbert
cf66fc6924
Update framework
2019-02-14 13:29:07 +09:00
Dean Herbert
94ceb1e32b
Move screen change allowance to local usage
2019-02-14 13:28:21 +09:00
Roman Kapustin
a289cb7c6a
Handle beatmapset removal in DownloadTrackingComposite
2019-02-13 22:11:46 +03:00
Roman Kapustin
99046f16e8
Revert "Update direct download button state on beatmap import and removal"
...
This reverts commit 11234d3c60
2019-02-13 22:04:49 +03:00
Dean Herbert
5318de29b4
Fix import logic again
2019-02-13 19:57:54 +09:00
Dean Herbert
e604806398
Fix regression in screen change allowance logic
2019-02-13 19:43:01 +09:00
Dean Herbert
3ec94e4ab3
Remove disable setting
2019-02-13 15:14:34 +09:00
Dean Herbert
43843ac558
Remove explicit dispose
2019-02-13 14:58:40 +09:00
Dean Herbert
1373e0fad0
Fix BeatmapTitle not always displaying
2019-02-13 14:57:40 +09:00
Dean Herbert
166cdab2e8
Remove unnecessary null check
2019-02-13 14:14:57 +09:00
Dean Herbert
ab3adafafd
Fix crashes after entering player
2019-02-13 14:13:54 +09:00
Dan Balasescu
c3ae4d7b14
Improve comment
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-13 11:34:48 +09:00
Dean Herbert
19bef01dd0
Attempt to maybe fix tests
2019-02-13 11:05:02 +09:00
Michael Manis
5fbdbcf209
removed 'unknown source' line
2019-02-12 15:30:42 -05:00
Roman Kapustin
11234d3c60
Update direct download button state on beatmap import and removal
2019-02-12 21:20:49 +03:00
Dean Herbert
f08d5f058c
Merge branch 'master' into notify_track_completion_failure
2019-02-13 01:34:18 +09:00
Dean Herbert
b967b93b88
Fix regressions in tests
2019-02-12 19:53:08 +09:00
Dean Herbert
2ea839c475
Fix crashes on beatmap not being set correctly in player
2019-02-12 19:18:22 +09:00
Dean Herbert
a28689ff4c
Update framework
2019-02-12 17:58:36 +09:00
Dean Herbert
d5cce850a8
Revert some unnecessary complications in logo logic
2019-02-12 13:29:41 +09:00
Dean Herbert
272584eb79
Improve file layouts
2019-02-12 13:02:33 +09:00
Dean Herbert
78b47f9fe3
Fix starting matches not working
2019-02-12 11:19:42 +09:00
Dean Herbert
e57409fe41
Remove unnecessary bindable properties on mod lists
2019-02-12 10:51:39 +09:00
Dean Herbert
e4422167b6
Fix starting gameplay
2019-02-11 19:13:57 +09:00
Dean Herbert
88ffc78103
Restructure
2019-02-11 19:11:34 +09:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work
2019-02-11 16:30:12 +09:00
ThePyrotechnic
450fa0075f
Merge branch 'master' into MissingSource
2019-02-10 23:44:47 +00:00
Michael Manis
cfe14dcdb1
Options for handing unknown beatmap source
2019-02-10 18:31:39 -05:00
Roman Kapustin
d3721707fb
Update framework
2019-02-08 19:48:56 +03:00
UselessToucan
b5e04f6161
Merge branch 'master' into notify_track_completion_failure
2019-02-08 19:37:23 +03:00
Dean Herbert
a30d3739cf
Merge remote-tracking branch 'upstream/master' into cmc-rooms
2019-02-08 18:45:39 +09:00
Dean Herbert
f52cac966b
Fix multiple blank lines
2019-02-08 18:45:32 +09:00
Dean Herbert
6c4d289901
Pass item rather than ID
2019-02-08 18:33:49 +09:00
Dan Balasescu
7ec0b4ba77
Fix nullref during room creation ( #4228 )
2019-02-08 17:53:01 +09:00
Dean Herbert
e8aed6b686
Update framework
2019-02-08 17:38:18 +09:00
Dan Balasescu
959b1ac845
Fix potential nullref when exiting multiplayer ( #4227 )
...
Fixes https://github.com/ppy/osu/issues/3954
2019-02-08 17:28:00 +09:00
smoogipoo
7aca0f4a1d
Fix failing test cases
2019-02-08 16:08:23 +09:00
smoogipoo
febcd7d7c0
Remove currentRoom from RoomManager
2019-02-08 15:46:16 +09:00
smoogipoo
fdd37dbc4b
Merge remote-tracking branch 'origin/master' into cmc-rooms
2019-02-08 15:44:33 +09:00
smoogipoo
b5cc0ec8db
Update framework
2019-02-08 15:44:11 +09:00
smoogipoo
5643dc2e99
Remove redundant qualifiers
2019-02-08 15:44:05 +09:00
smoogipoo
6fe1f57236
Fix crash when start button is repeatedly pressed
2019-02-08 15:39:11 +09:00
smoogipoo
99a7ccc01a
Slight cleanup in multiplayer
2019-02-08 15:38:05 +09:00
smoogipoo
43240ea85e
Fix playlist issues with room creation
2019-02-08 15:23:03 +09:00
smoogipoo
42cd55e0d7
Move current room to multiplayer
2019-02-08 14:57:51 +09:00
smoogipoo
7f13e3c5f7
Directly resolve the filter bindable
2019-02-08 13:02:17 +09:00
smoogipoo
990bd44ca2
Combine roommanager and roompollingcomponent
2019-02-08 13:01:10 +09:00
smoogipoo
17fdfc15d9
Fix room title in the breadcrumbs
2019-02-07 20:09:49 +09:00
smoogipoo
1c2450a95a
Fix up room inspector status
2019-02-07 17:59:14 +09:00
smoogipoo
1e0135af6f
Move StatusColouredContainer into a more public location
2019-02-07 17:52:40 +09:00
smoogipoo
2d61548251
Fix room name being coloured
2019-02-07 16:45:36 +09:00
smoogipoo
4f86fe92ea
Fix match settings not showing
2019-02-06 18:50:43 +09:00
ProgrammaticNajel
9f8e724a76
Fix background being cut off at the top of the screen ( #4207 )
...
Fix background being cut off at the top of the screen
2019-02-06 18:14:33 +09:00
smoogipoo
3207983a1c
Fix current room being set to null when parted
2019-02-06 15:12:40 +09:00
smoogipoo
a9aa22c97b
Remove ShadowModel requirement
2019-02-06 13:52:48 +09:00
smoogipoo
594dffba41
Fix a few cases of missed instant invocation
2019-02-05 19:11:20 +09:00
smoogipoo
aac371ba6e
Use CMC for all of multiplayer
2019-02-05 19:00:08 +09:00
Dean Herbert
2f8f4fac64
Fix combo colour fallbacks when skin is not providing any
2019-02-05 17:54:14 +09:00
smoogipoo
be51ee4ed5
Implement MultiplayerComposite, replaces RoomBindings
2019-02-05 16:14:37 +09:00
smoogipoo
d9537017c8
Use CMC in the Multiplayer screen
2019-02-05 16:03:05 +09:00
smoogipoo
37c1f5a824
Split polling logic from RoomManager, now a container
2019-02-05 15:38:19 +09:00
Dan Balasescu
84ab16c7c8
Merge branch 'master' into keybindings-settings-groups
2019-02-05 11:42:53 +09:00
Dean Herbert
216030fe64
Merge branch 'master' into fix-background-fade-2
2019-02-04 22:32:50 +09:00
smoogipoo
065b0c9076
Fix background not being faded correctly
2019-02-04 17:04:52 +09:00
Dan Balasescu
779477959f
Merge branch 'master' into fix_song_rearranging_in_music_controller_playlist
2019-02-04 15:39:29 +09:00
Dean Herbert
91d875db0d
Remove unused local
2019-02-04 12:56:55 +09:00
Dean Herbert
cd92dddd46
Add per-ruleset mappings
2019-02-04 12:31:05 +09:00
Dean Herbert
2d7c23dd9f
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-02-04 12:15:53 +09:00
EVAST9919
d6d5bb5ecf
remove useless nullcheck
2019-02-03 17:20:35 +03:00
EVAST9919
eeecbfcbe0
Fix warnings
2019-02-03 17:09:04 +03:00
Roman Kapustin
71efbcf603
Merge remote-tracking branch 'ppy/master' into notify_track_completion_failure
2019-02-03 16:14:04 +03:00
EVAST9919
4b17ca0857
Fix wrong icons
2019-02-03 14:50:03 +03:00
Unknown
ead28e7102
stop logging keyboard events from password textbox
2019-02-03 12:34:38 +01:00
EVAST9919
3b529b7bda
Enable the sidebar and move "back" button to the key binding overlay
2019-02-03 14:34:04 +03:00
Dean Herbert
e01f342ab0
wip
2019-02-02 17:11:25 +09:00
Roman Kapustin
4c866e7940
Add PlaylistItemHandle.HandlePositionalInput override
2019-02-01 22:37:27 +03:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
Dean Herbert
499e06797a
Merge pull request #4114 from peppy/fix-replay-multiplier-text
...
Fix replay playback speed not being displayed initially
2019-01-31 22:24:42 +09:00
Dan Balasescu
9968bdc0e4
Merge branch 'master' into download-tracking-component
2019-01-31 21:18:03 +09:00
Dean Herbert
3da851d93e
Merge branch 'master' into fix-replay-multiplier-text
2019-01-31 21:17:40 +09:00
Dean Herbert
7ce9a915b7
Merge branch 'master' into fix-osu-logo
2019-01-31 21:08:49 +09:00
Dan Balasescu
b85e119bae
Merge branch 'master' into reg-screen-focus-fix
2019-01-31 21:08:12 +09:00
Dean Herbert
cea82708ee
Merge branch 'master' into use-lifetime-optimization
2019-01-31 20:20:40 +09:00
Dean Herbert
d1c8ee65a5
Fix osu! logo potentially appearing during game load in a weird place
2019-01-31 19:22:29 +09:00
Dean Herbert
e191609067
Merge remote-tracking branch 'upstream/master' into download-tracking-component
2019-01-31 19:17:48 +09:00
Dean Herbert
c7cf3ef1cd
Update licence headers
2019-01-31 19:17:42 +09:00
Dean Herbert
7c6512118e
Fix importing progress bar not displaying
2019-01-31 19:15:17 +09:00
Dean Herbert
0b8bd520ab
Shake in all cases
2019-01-31 19:15:04 +09:00
Dean Herbert
b89694a969
Fix "importing" state display
2019-01-31 19:09:04 +09:00
Dean Herbert
041e3bf823
Handle unbinding better
2019-01-31 19:08:54 +09:00
Dean Herbert
b69a19f810
Attach progress immediately
2019-01-31 19:08:45 +09:00
Dean Herbert
c54a515b3e
Change where BindValueChange is immediately run
2019-01-31 18:49:54 +09:00
Dean Herbert
7f2fdac50e
Update signatures
2019-01-31 18:47:30 +09:00
Dean Herbert
327a34f12a
Merge remote-tracking branch 'upstream/master' into download-tracking-component
...
# Conflicts:
# osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
2019-01-31 18:45:09 +09:00
Dean Herbert
09056fd0d8
Merge branch 'master' into resources-via-nuget
2019-01-31 18:40:45 +09:00
Dean Herbert
ba6176fd03
Fix major regression in scaling behaviour
2019-01-31 18:28:46 +09:00
Dean Herbert
f85518b175
Don't expose padding
2019-01-31 18:16:28 +09:00
Dean Herbert
b48bb5b792
Move parallax logic out of BackgroundScreenStack
2019-01-31 18:10:33 +09:00
smoogipoo
bdaff27575
Fix nullref due to screens now being removed from parent
2019-01-31 15:02:07 +09:00
smoogipoo
b90207fa54
Give ScreenTestCase a background stack
2019-01-31 14:55:48 +09:00
smoogipoo
255b4a30e0
Allow logo to be null
2019-01-31 13:50:37 +09:00
smoogipoo
58d744e5dc
Remove manual overlay/toolbar logic from multiplayer
2019-01-31 13:38:21 +09:00
Dean Herbert
aac921c298
Update framework again
2019-01-31 13:33:21 +09:00
Dean Herbert
e8c39b9c37
Fix test screen loading
2019-01-31 11:00:44 +09:00
Dean Herbert
beab367e6d
Add null checks/allowances
2019-01-31 11:00:33 +09:00
Dean Herbert
d34aa50613
Merge branch 'master' into iscreen
2019-01-31 01:08:06 +09:00
smoogipoo
ac0bc53c4b
Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"
...
This reverts commit cc8793a45e94276c8abb
2019-01-31 00:02:05 +09:00
smoogipoo
a8a34f8f20
Update framework
2019-01-30 23:56:14 +09:00
smoogipoo
5e78f51e24
Fix multiplayer crashing when exiting from lounge
2019-01-30 23:56:03 +09:00
Aergwyn
c2297b0c3b
Fix incorrect param doc
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-01-29 23:04:48 +09:00
smoogipoo
82dc7f39a3
Update licenses
2019-01-29 21:48:35 +09:00
smoogipoo
b5d187c4af
Fix post-merge errors
2019-01-29 21:27:32 +09:00
smoogipoo
91302ea0bc
Merge remote-tracking branch 'origin/master' into iscreen
...
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
2019-01-29 21:21:36 +09:00
Dean Herbert
baea9691cc
Fix baetmap downloads using too much memory
2019-01-29 18:34:10 +09:00
Dean Herbert
23d0399e51
Allow deselection of textboxes on registration screen on mobile devices
2019-01-29 17:23:23 +09:00
ekrctb
8955d5de04
Update hit object result when lifetime is end
2019-01-29 15:25:27 +09:00
Dean Herbert
bbc24bbfdd
Merge remote-tracking branch 'upstream/master' into resources-via-nuget
...
# Conflicts:
# osu-resources
# osu.sln
2019-01-29 12:19:35 +09:00
ekrctb
504e79b968
Merge branch 'master' into use-lifetime-optimization
2019-01-29 12:15:02 +09:00
Nitrous
ea4e79751e
Merge branch 'master' into mod-wind
2019-01-28 17:48:57 +08:00
Dean Herbert
628b3e1119
Move osu-resources to nuget
2019-01-28 18:33:39 +09:00
smoogipoo
7b1c1f3728
Move toolbar showing and overlay activation to OsuGame
...
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
Dean Herbert
354a99f5e1
Merge branch 'master' into samah-ios
2019-01-28 15:34:46 +09:00
Dean Herbert
8118b649d8
Merge branch 'master' into show-mods-on-loader
2019-01-28 14:11:54 +09:00
Dan Balasescu
47f35c423b
Merge branch 'master' into carousel-wedge-level
2019-01-28 13:49:12 +09:00
Dan Balasescu
610c2df2d4
Merge branch 'master' into dont-always-focus-textboxes
2019-01-28 13:40:08 +09:00
Dean Herbert
a208874e74
Fix incorrect handling of download failures
2019-01-28 11:59:25 +09:00
LeNitrous
03e57d0423
fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp
2019-01-26 20:15:19 +08:00
LeNitrous
a1ce7e9a95
add ModDisplay on PlayerLoader
2019-01-26 17:14:45 +08:00
LeNitrous
d920ee67ee
forgot last whitespace
2019-01-26 13:47:33 +08:00
LeNitrous
73dbf5712d
add license headers
2019-01-26 13:43:27 +08:00
LeNitrous
39072376dd
revert WorkingBeatmap back to protected
2019-01-26 13:40:41 +08:00
LeNitrous
d76681aa82
use IApplicableToBeatmap instead of IApplicableToRulesetContainer
2019-01-26 13:39:23 +08:00
LeNitrous
c6e26a92ec
add wind up and wind down mods
2019-01-26 12:15:45 +08:00
Shane Woolcock
a14ad4f53f
Merge branch 'master' into samah-ios
2019-01-25 22:43:21 +10:30
smoogipoo
117703374e
Fix logo animations
2019-01-25 21:02:35 +09:00
smoogipoo
60cc2314ef
Fix ruleset + beatmap being changeable in match
2019-01-25 21:02:30 +09:00
phosphene47
5c70be07ab
Display carousel over beatmap info wedge
2019-01-25 22:58:55 +11:00
smoogipoo
b3403c78da
Fix a few potential crashes
2019-01-25 20:47:37 +09:00
smoogipoo
e2891ab1e9
Fix anchors + origins
2019-01-25 20:47:31 +09:00
smoogipoo
95e6785968
Make Multiplayer not an OsuScreen
2019-01-25 20:25:55 +09:00
Dean Herbert
28f529ca19
Rename to host
2019-01-25 20:24:32 +09:00
Dean Herbert
0b587baab8
Merge remote-tracking branch 'upstream/master' into fix-texture-loader-stores
2019-01-25 20:23:51 +09:00
Dean Herbert
4d032af26d
Merge pull request #3919 from peppy/fix-idle-weirdness
...
Fix global idle state being entered when overlays are visible
2019-01-25 20:18:33 +09:00
Dean Herbert
a110569f56
Merge pull request #4151 from peppy/fix-sensitivity-tooltip
...
Fix cursor sensitivity tooltip not updating instantly
2019-01-25 20:17:56 +09:00
Dean Herbert
4d982adf69
Merge branch 'master' into fix-idle-weirdness
2019-01-25 19:48:52 +09:00
Aergwyn
c8c375636f
Use lambda
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-01-25 19:34:25 +09:00
smoogipoo
e1e7759e0f
Re-implement MultiplayerSubScreen
2019-01-25 19:32:37 +09:00
smoogipoo
3fb17ead06
Fix breadcrumbs crash when last screen exits
2019-01-25 19:31:58 +09:00
Dean Herbert
49051a359f
Merge branch 'dont-always-focus-textboxes' into samah-ios
2019-01-25 19:22:26 +09:00
Unknown
77763fde8b
revert accidentally renamed variables
2019-01-25 11:22:05 +01:00
Dean Herbert
260034a80e
Don't auto-focus textboxes when on screen keyboard would cause inconvenience
2019-01-25 19:20:29 +09:00
Dean Herbert
82d944dc89
Fix textbox colours not always being set corrrectly
2019-01-25 19:20:29 +09:00
Unknown
4a916b2dee
replace license headers with new ones
2019-01-25 11:17:48 +01:00
Unknown
8ddff673b7
revert previous rename and rename ruleset specific classes instead
2019-01-25 11:14:37 +01:00
Dean Herbert
9e8347413b
Merge remote-tracking branch 'origin/fix-texture-loader-stores' into samah-ios
...
# Conflicts:
# osu.Game/Beatmaps/BeatmapManager.cs
2019-01-25 18:59:22 +09:00
Unknown
5446c99f22
Merge branch 'master' into move-osu-settings
2019-01-25 10:57:04 +01:00
Dean Herbert
159ac7359e
Merge branch 'update-framework' into samah-ios
2019-01-25 18:52:17 +09:00
Dean Herbert
144533706e
Update framework
2019-01-25 18:51:29 +09:00
Dean Herbert
e3fde56780
Merge remote-tracking branch 'origin/fix-idle-weirdness' into samah-ios
2019-01-25 18:49:41 +09:00
Dean Herbert
f4729d41f3
Merge branch 'master' into samah-ios
2019-01-25 18:49:08 +09:00
smoogipoo
da135346b2
Fix screen titles
2019-01-25 18:38:48 +09:00
smoogipoo
15100632f1
Remove MultiplayerSubScreen and fix multiplayer crashes
2019-01-25 18:26:04 +09:00
Dean Herbert
4a59ccb81d
Merge branch 'master' into fix-idle-weirdness
2019-01-25 17:52:59 +09:00
Dean Herbert
a5f1aa644b
Fix cursor sensitivity tooltip not updating instantly
2019-01-25 17:30:35 +09:00
smoogipoo
f0e0088f43
Create a custom background stack to fix various background issues
2019-01-25 15:36:22 +09:00
Dean Herbert
a25dce53cd
Fix logical regression
2019-01-25 15:03:32 +09:00
Dean Herbert
e88d36ed38
Merge branch 'master' into fix-multiplayer-parallax-overflow
2019-01-25 14:55:28 +09:00
Dean Herbert
7ed215c521
Make InternalPadding a bit simpler
2019-01-25 14:46:45 +09:00
Dean Herbert
787d4da153
Combine constant
2019-01-25 14:10:59 +09:00
Dean Herbert
99d349c865
Merge branch 'master' into fix-texture-loader-stores
2019-01-25 12:39:02 +09:00
Dean Herbert
2b250aa47b
Merge branch 'master' into fix-tracked-config-disposal
2019-01-25 12:14:58 +09:00
Dean Herbert
c3b73d2d53
ALlow null host
2019-01-25 12:08:31 +09:00
Dean Herbert
014ea972d9
Merge remote-tracking branch 'origin/master' into samah-ios
2019-01-25 11:51:44 +09:00
Dean Herbert
bda5a90252
Readonly variable
2019-01-25 11:50:52 +09:00
Dean Herbert
6b3d53750c
Fix remaining cases of not using host-created TextureLoaderStore
2019-01-25 11:48:28 +09:00
Unknown
f07ac8ebd8
remove osu! specific settings from global config again
2019-01-24 16:11:55 +01:00
Unknown
2bbaa2ac60
silently return instead of throwing
2019-01-24 16:02:47 +01:00
ProgrammaticNajel
4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow
2019-01-24 20:41:10 +08:00
ProgrammaticNajel
593e0b36f5
Add overflow padding in other multiplayer screen components
...
Added padding to Room Creation and Beatmap Selection in Multiplayer.
2019-01-24 19:42:35 +08:00
smoogipoo
a7e281469b
Fix game exiting instantly on pressing close button
2019-01-24 20:13:29 +09:00
smoogipoo
50a384e19c
Fix game not exiting
2019-01-24 20:13:19 +09:00
smoogipoo
28f5c950ec
Fix player never completing load
2019-01-24 19:55:42 +09:00
smoogipoo
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
ProgrammaticNajel
9fcefa7d69
Typo fix
2019-01-24 18:18:32 +08:00
ProgrammaticNajel
e4084b7d5d
Add overflow padding in other multiplayer screen components
...
Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)
2019-01-24 17:40:48 +08:00
Dean Herbert
a580c17949
Fix codefactor issue
2019-01-24 17:46:09 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
ProgrammaticNajel
7ac20c3545
Add overflow padding to account for parallax shifting
...
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
2019-01-24 16:11:24 +08:00
Unknown
4a9bcf4937
rename OsuConfigManager to GameConfigManager
...
also OsuSetting to GameSetting
2019-01-23 13:17:29 +01:00
Unknown
93c9037394
fix crash when config doesn't have tracked settings
2019-01-23 13:09:03 +01:00
Shane Woolcock
728c744e4d
Merge branch 'master' into samah-ios
2019-01-23 22:19:49 +10:30
Dean Herbert
7415a6e764
Cache input manager
2019-01-23 20:37:56 +09:00
Dean Herbert
484268f1f2
Expose CalculateAccuracy for performance tools
2019-01-23 20:30:32 +09:00
Dean Herbert
4c8e7a26dc
Merge branch 'master' into fix-idle-weirdness
2019-01-23 18:53:52 +09:00
Dean Herbert
1730ad143f
Merge branch 'master' into fix-key-counter
2019-01-23 18:22:08 +09:00
Dan Balasescu
067f290e6e
Merge branch 'master' into fix-key-counter
2019-01-23 17:49:21 +09:00
Christian Kamphausen
512e75982f
Merge branch 'master' into fix-transparent-background-on-screen-scale-modes
2019-01-23 09:49:19 +01:00
chrisny286
76700ad20f
Merge branch 'fix-transparent-background-on-screen-scale-modes' of https://github.com/chrisny286/osu into fix-transparent-background-on-screen-scale-modes
2019-01-23 09:40:44 +01:00
chrisny286
03e3247baf
replace FadeTo in PlayerLoader
...
didnt notice that interaction yet. yes this makes it neccessary.
2019-01-23 09:40:38 +01:00
Dean Herbert
1025c51e0d
Allow filtering settings matching based on dropdown content
2019-01-23 17:30:05 +09:00
Dean Herbert
4180ca75bc
Fix typo in comment
2019-01-23 17:14:08 +09:00
chrisny286
bb56c4a1a7
use Color4.Black and White + using osuTK.Graphics
2019-01-23 09:08:34 +01:00
chrisny286
5d2b2ecf06
Merge remote-tracking branch 'upstream/master' into fix-transparent-background-on-screen-scale-modes
2019-01-23 08:52:46 +01:00
chrisny286
f4ebab2d3a
Fix backgrounds being transparent in some scaling modes
...
by replacing `.FadeTo` at the necessary places with `.FadeColour`.
restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.
2019-01-23 08:52:25 +01:00
Dean Herbert
c18ce2c23a
Formatting fixes
2019-01-23 14:51:25 +09:00
Dean Herbert
49633b3394
Fix key counter receptor getting overwritten by async load drawables
2019-01-23 14:51:25 +09:00
Dean Herbert
f107a922b4
Add tests for key counter inside player heirarchy
2019-01-23 14:51:25 +09:00
Christian Kamphausen
5e31db275d
Merge branch 'master' into Fix-OsuSliderBar-tooltip-not-updating-in-special-case
2019-01-23 04:14:59 +01:00
chrisny286
260011fc13
remove manual update
...
misunderstood that earlier
2019-01-23 04:05:03 +01:00
chrisny286
fe5d34a657
replace as requested
2019-01-23 03:25:56 +01:00
chrisny286
47181cf5d7
add back update in onUserChange
2019-01-23 03:21:09 +01:00
Dean Herbert
e4007fcf23
Merge branch 'master' into download-tracking-component
2019-01-23 11:12:57 +09:00
Dean Herbert
7d6d7cf457
Merge remote-tracking branch 'upstream/master' into download-tracking-component
...
# Conflicts:
# osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
2019-01-23 11:06:29 +09:00
chrisny286
13ba9d64d0
revert empty line
2019-01-23 02:56:00 +01:00
chrisny286
12503b4d07
revert and make VisibilityContainer not AlwaysPresent
2019-01-23 02:37:17 +01:00
chrisny286
f01ba17d1f
add check if replay is loaded before allowseeking can be overwitten
2019-01-23 02:12:40 +01:00
chrisny286
cabcfffdeb
Fix autoplay rewind/skip usable when UI hidden
2019-01-23 01:16:37 +01:00
chrisny286
3f96231b2f
convert to method group
2019-01-22 19:34:26 +01:00
chrisny286
09a2b287f9
Fix Tooltip not updating in special case
...
When the Bindvalue of the Sliderbar gets changed by a line like "Bindable.Value = ..." the sliderbar will only update the nubs but wont run any methods which contain the updateToolTipText(T value) function.
Example scenario:
Two interlinked sliderbars which change the value of each other in certain cases.
2019-01-22 18:29:30 +01:00
Dean Herbert
09553550a3
Remove remaining supporter check
2019-01-23 00:19:39 +09:00
Dean Herbert
f33f91dadb
Merge pull request #4108 from peppy/fix-toolbar-padding-regression
...
Fix overlays not being correctly offset by toolbar padding
2019-01-22 21:29:36 +09:00
Shane Woolcock
59eb33684d
Merge branch 'master' into samah-ios
2019-01-22 22:07:15 +10:30
Shane Woolcock
0c56942761
Code sanity
2019-01-22 21:32:23 +10:30
Shane Woolcock
fe86b14659
Update framework
2019-01-22 21:14:13 +10:30
Dean Herbert
863756a252
Merge pull request #4115 from peppy/allow-download-no-supporter
...
Allow full osu!direct usage regardless of supporter status
2019-01-22 19:26:30 +09:00
Dan Balasescu
e35b0093f3
Merge branch 'master' into fix-toolbar-padding-regression
2019-01-22 19:18:02 +09:00
Dean Herbert
828b9451e5
Update framework
2019-01-22 16:48:32 +09:00
ekrctb
fe2b83279e
Correct wrong logic
...
`OnlineBeatmapSetID == null` was the problem
2019-01-22 16:40:32 +09:00
ekrctb
0095521fc2
Use both OnlineBeatmapSetID and Hash
2019-01-22 16:10:04 +09:00
ekrctb
1d5f5865aa
Fix PresentBeatmap not working for unsubmitted beatmap set
2019-01-22 15:19:42 +09:00
Dean Herbert
5ea6e8e247
Allow full osu!direct usage regardless of supporter status for now
2019-01-22 14:22:38 +09:00
Dean Herbert
c58fe4f4ff
Fix nullref
2019-01-22 13:18:01 +09:00
Dean Herbert
cebeb0a219
Fix replay playback speed not being displayed initially
2019-01-22 11:40:57 +09:00
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
8160162cde
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-01-21 20:58:17 +09: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
Joehu
33735b15ae
Update osu!direct beatmap sections sorting
2019-01-20 09:39:07 -08:00
Shane Woolcock
25c3304766
Update framework
2019-01-20 22:07:59 +10:30
Shane Woolcock
0baa96fa4c
Merge branch 'master' into samah-ios
2019-01-20 21:48:08 +10:30
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
Shane Woolcock
10b91e18bd
Merge branch 'master' into samah-ios
...
# Conflicts:
# osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
Shane Woolcock
f26a551e95
Revert audio changes
2019-01-19 17:40:37 +10:30
Shane Woolcock
63c61d3e27
Convert to PackageReference
2019-01-19 14:13:46 +10:30
Bear Daniel
858541bcf4
Added "Use beatmap hitsounds" button to volume section of settings
2019-01-18 02:33:39 -06:00
Dean Herbert
f489718e25
Fix non-matching filename
2019-01-18 14:35:32 +09:00
Dean Herbert
21e79f51b1
Remove necessity of BeatmapSetDownloader
2019-01-18 14:28:06 +09:00
Dean Herbert
8848fa8b1b
Improve UX of download buttons on beatmap set overlay
2019-01-18 12:04:49 +09:00
Dean Herbert
b62630ecd2
Centralise download tracking logic so we can show it in multiple scenarios
2019-01-18 11:28:10 +09: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
Shane Woolcock
6c35393d1a
Fix TrackManager usage
2019-01-13 23:10:16 +10:30
Shane Woolcock
f70cb81a3f
Update framework
2019-01-13 23:07:35 +10:30
Shane Woolcock
d80138d20d
Ensure beatmap textures are loaded via CreateTextureLoaderStore
2019-01-12 23:05:49 +10:30
Shane Woolcock
8f2ce6d048
Update framework
2019-01-12 15:55:03 +10:30
Shane Woolcock
a6c54a9675
Merge branch 'master' into samah-ios
2019-01-12 00:16:09 +10:30
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
1ff9203f9e
Merge branch 'master' into fix-idle-weirdness
2019-01-10 18:38:48 +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
Microgolf
097062caf7
Addresses requested changes
2019-01-08 17:57:03 +01:00
m2307
42ba690809
Merge branch 'master' into master
2019-01-08 17:53:58 +01: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
Shane Woolcock
d74aa52e69
Revert to old behaviour if no TrackManager available
2019-01-08 18:35:23 +10:30
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
Shane Woolcock
19693c3e51
Use TrackManager CreateWaveform to fix editor crashes
2019-01-08 17:10:31 +10:30
Shane Woolcock
a267a1a085
Merge branch 'master' into samah-ios
2019-01-08 17:09:26 +10:30
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
8edec10e5f
Merge branch 'master' into fix-replay-import-statistics
2019-01-08 11:26:12 +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
Dean Herbert
e73845172c
Merge branch 'master' into fix-replay-import-statistics
2019-01-07 13:44:01 +09:00
Matthias Coenraerds
562c9e56fb
Fix naming
2019-01-06 13:38:43 +01:00
Matthias Coenraerds
472325b885
Verify leaderboard scope to be local
2019-01-06 13:37:30 +01:00
Roman Kapustin
4b5fc85875
Use Find instead of FirstOrDefault
2019-01-05 19:35:33 +03:00
Matthias Coenraerds
a93c26ccfd
Filename does not match contained type
2019-01-04 20:40:07 +01:00
Matthias Coenraerds
3879348ee4
Implement clear scores on beatmap
2019-01-04 20:23:06 +01:00
Dean Herbert
4a7c6fb19d
Fix PP not display on profile overlay
2019-01-04 16:33:35 +09:00
Dean Herbert
4c2c7bd937
Fix global idle state being entered when overlays are visible
2019-01-04 16:26:10 +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
Dean Herbert
4c3310ca80
Remove unnecessary tracked settings (for now)
2019-01-04 15:28:48 +09:00
Dean Herbert
3a10dd47d5
Add preview for gameplay region
2019-01-04 15:28:35 +09:00
Dean Herbert
9c7830d83b
Size -> scale
2019-01-04 14:58:44 +09:00
Dean Herbert
35a6257642
Delay updates when changes would affect mouse position
2019-01-04 14:55:59 +09:00
Dean Herbert
5a807f2143
Add OSD support
2019-01-04 14:18:29 +09:00
Dean Herbert
3953f829c8
Add letterbox/screen scaling support
2019-01-04 13:36:02 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score
2019-01-04 13:11:17 +09:00
Dean Herbert
aec3753863
Fix imported replays having excess statistics
2019-01-03 14:01:20 +09:00
Dean Herbert
8b25e4c9ee
Fix searching for "channel" matching all channels
2019-01-03 12:04:36 +09:00
Dean Herbert
2d405bfc43
Add back options for 3 and 7 day long rooms
2019-01-02 16:33:52 +09:00
FreezyLemon
0047f29ec8
move missing newline to front of "Plays with..."
2018-12-30 22:40:17 +01:00
Roman Kapustin
850a7aa327
Update tab text font on activation/deactivation
2018-12-29 17:43:19 +03:00
Shane Woolcock
32ffcb9865
Merge branch 'master' into samah-ios
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-29 20:09:00 +10:30
Shane Woolcock
ff4b41b35f
Add basic visual tests
2018-12-29 18:47:35 +10:30
Dean Herbert
1f2d340914
Merge branch 'master' into fix-room-ordering
2018-12-28 14:07:11 +09:00
Dean Herbert
e6ccf209c7
Merge pull request #3957 from peppy/fix-excessive-cover-loading
...
Fix covers being loaded even when off-screen
2018-12-28 14:07:01 +09:00
Dean Herbert
0908309232
Merge branch 'master' into fix-room-ordering
2018-12-28 13:35:56 +09:00
Dean Herbert
8c62157d7a
Merge pull request #3943 from smoogipoo/fix-results
...
Fix ScoreProcessor's population
2018-12-28 13:32:40 +09:00
Dean Herbert
55607634b4
Fix covers being loaded even when off-screen
2018-12-28 13:30:05 +09:00
smoogipoo
72482aff8d
Whoops
2018-12-28 01:48:13 +09:00
