1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 00:52:59 +08:00
Commit Graph

15958 Commits

Author SHA1 Message Date
Dean Herbert
dd960e6a89 Remove unused variable 2019-01-08 12:50:42 +09:00
Dean Herbert
4276805b5a
Merge branch 'master' into letterboxing 2019-01-08 11:41:44 +09:00
Dean Herbert
7bb4a06122
Merge pull request #4006 from peppy/update-framework
Update framework
2019-01-08 11:40:36 +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
Dan Balasescu
74ada4f3a3
Merge pull request #4007 from peppy/fix-leaderboard-nullrefs
Fix leaderboard not correctly handling cancellation
2019-01-08 11:25:42 +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
115caa928c
Merge pull request #4005 from smoogipoo/stacking-indices
Implement stacking by indices
2019-01-07 18:43:08 +09:00
smoogipoo
b57c1af084 Only update stacking if there are hitobjects 2019-01-07 18:15:44 +09:00
smoogipoo
c6c22b352f More verbose exceptions 2019-01-07 18:13:40 +09:00
Dean Herbert
a5f9ae86a8
Merge pull request #4004 from peppy/remove-settings-label
Remove broken SettingsLabel class
2019-01-07 18:07:52 +09:00
smoogipoo
351ab6e9bd Shortcut O(n^2) calculation 2019-01-07 18:01:44 +09:00
smoogipoo
1c5ab6a906 Implement stacking by index 2019-01-07 18:00:59 +09:00
Dean Herbert
73c2fcac08 Remove broken SettingsLabel class 2019-01-07 17:03:59 +09:00
Dean Herbert
5e87a3a7e2
Merge pull request #3998 from peppy/fix-pp-display
Fix PP not display on profile overlay
2019-01-06 22:18:08 +09:00
Roman Kapustin
469a64a7cd The code must not contain multiple blank lines in a row 2019-01-05 21:03:03 +03: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
e596d4fc10
Merge pull request #3813 from UselessToucan/do_not_use_local_user_for_autoplay_score
Handle ModAutoplay during score construction in the Player
2019-01-04 15:56:20 +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
2fc10cb2bd
Merge pull request #3994 from smoogipoo/limit-slider-length
Add a maximum length for slider ticks to be generated
2019-01-03 19:38:02 +09:00
smoogipoo
3fa5a33fb1 Inline const 2019-01-03 18:58:07 +09:00
smoogipoo
273b14b19c Add a maximum length for slider ticks to be generated 2019-01-03 18:51:47 +09:00
Dean Herbert
6156359ff1
Merge pull request #3993 from smoogipoo/endposition-cache
Cache Slider's end position
2019-01-03 17:53:26 +09:00
smoogipoo
c56d8b75c1 Cache slider's endposition 2019-01-03 17:43:10 +09:00
Dan Balasescu
975fc47a2b
Merge pull request #3985 from peppy/longer-multiplayer-rooms
Add back options for 3 and 7 day long rooms
2019-01-02 17:04:09 +09:00
Dean Herbert
2d405bfc43 Add back options for 3 and 7 day long rooms 2019-01-02 16:33:52 +09:00
Dean Herbert
223bffe873
Merge pull request #3975 from FreezyLemon/fix-profileheader-text
Fix incorrect newlines in ProfileHeader.
2018-12-31 13:58:12 +09:00
FreezyLemon
0047f29ec8 move missing newline to front of "Plays with..." 2018-12-30 22:40:17 +01:00
Dean Herbert
1b35eae1ba
Merge pull request #3945 from smoogipoo/fix-room-ordering
Sort rooms based on their API position
2018-12-28 14:22:25 +09:00
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