1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-27 21:12:55 +08:00
Commit Graph

18372 Commits

Author SHA1 Message Date
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
Dean Herbert
8914585021 Fix implementation of conditional cursor expanding 2019-01-07 18:28:26 +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
13b077c83b Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini 2019-01-07 18:11:17 +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
e73845172c
Merge branch 'master' into fix-replay-import-statistics 2019-01-07 13:44:01 +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
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
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
jorolf
8bab87c072 update resources and remove unused usings 2019-01-04 23:09:21 +01:00
jorolf
52994c7ee8 Merge branch 'profile-header-update' of github.com:Jorolf/osu into profile-header-update 2019-01-04 22:52:29 +01:00
jorolf
a33a1458a5 update design and make play styles an enum 2019-01-04 22:52:00 +01:00
Matthias Coenraerds
715d5c3a3c Merge branch 'master' of https://github.com/m2307/osu 2019-01-04 20:40:21 +01:00
Matthias Coenraerds
a93c26ccfd Filename does not match contained type 2019-01-04 20:40:07 +01:00
Matthias Coenraerds
6d44672bfa Filename does not match contained type 2019-01-04 20:32:52 +01:00
Matthias Coenraerds
cd5b7dfd8d License header missing 2019-01-04 20:27:02 +01:00
Matthias Coenraerds
3879348ee4 Implement clear scores on beatmap 2019-01-04 20:23:06 +01:00
Matthias Coenraerds
ab462a232f Implement clear scores on beatmap 2019-01-04 20:13:32 +01:00
smoogipoo
722210d8bb Merge remote-tracking branch 'origin/master' into xexxar-angles 2019-01-04 23:52:23 +09:00
Dean Herbert
01f6199c49
Merge branch 'master' into profile-header-update 2019-01-04 16:38:42 +09: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
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
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
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