1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 11:07:25 +08:00
Commit Graph

37904 Commits

Author SHA1 Message Date
Dean Herbert
0f7be8f632
Merge pull request #11853 from FamousPig/scale-breaking-bounds 2021-03-30 14:56:03 +09:00
Dan Balasescu
d2ef0ba644
Merge branch 'master' into add-editor-nudging-support 2021-03-30 14:34:43 +09:00
Dean Herbert
89bea2868a Move bool one level down 2021-03-30 14:33:55 +09:00
Dean Herbert
88035f73e0 Fix incorrect wait logic in IPC location test
Not really willing to put more effort into fixing this one. Should do the job.
2021-03-30 14:23:49 +09:00
Dean Herbert
b82247aabe Add inline comments and use Vector2.Zero 2021-03-30 14:13:16 +09:00
Dean Herbert
eda45e0e28 Merge branch 'master' into scale-breaking-bounds 2021-03-30 14:05:19 +09:00
Dean Herbert
d51f4e108e
Merge pull request #12213 from MiraiSubject/ipc-directory-regression 2021-03-30 13:15:18 +09:00
Dean Herbert
1dfd08eded Add tablet rotation configuration 2021-03-30 13:01:48 +09:00
Dean Herbert
8dfff999f9 Add rotation slider 2021-03-30 12:40:50 +09:00
Dean Herbert
8a0fcf20ed Move offset settings up for more logical ordering 2021-03-30 12:32:42 +09:00
Dan Balasescu
ff43983c0a
Merge pull request #12214 from peppy/update-framework
Update framework and dependencies
2021-03-30 09:48:26 +09:00
smoogipoo
69db0a5593 Countries should not be null (internal game resource) 2021-03-30 09:03:34 +09:00
smoogipoo
804ffe9f48 Fix inspections 2021-03-30 09:00:09 +09:00
Shivam
2d344ae6ff wait for IPC to be populated in the test
Did not see this when locally running test until after a couple of subsequent runs.
2021-03-29 16:16:50 +02:00
Dean Herbert
6f01070408 Add weird android package requirements 2021-03-29 23:11:24 +09:00
Shivam
6c5a10a744 Add missing license header 2021-03-29 15:27:25 +02:00
Dean Herbert
d84c9251e6 Update nuget packages 2021-03-29 22:17:24 +09:00
Dean Herbert
36364a4492 Update framework 2021-03-29 22:17:17 +09:00
Shivam
c110c24924 Merge branch 'master' of https://github.com/ppy/osu into ipc-directory-regression 2021-03-29 15:03:24 +02:00
Shivam
badf5ee4a2 Fix stable.json file directory location due to the change of how TournamentStorage works 2021-03-29 15:03:10 +02:00
Dan Balasescu
e6e29259c7
Merge pull request #12194 from peppy/fix-timeline-depth-ordering
Fix timeline not visually ordering hitobjects in a stable way
2021-03-29 21:31:56 +09:00
Leon Gebler
17b16d4f89 Clarify purpose of getClampedScale() 2021-03-29 14:17:30 +02:00
Leon Gebler
1d99a63f17 Limit minimum size for single slider scaling 2021-03-29 14:16:27 +02:00
Dan Balasescu
1bb9f018a0
Merge branch 'master' into fix-timeline-depth-ordering 2021-03-29 20:47:47 +09:00
Dan Balasescu
3cf6a3f56d
Merge pull request #12076 from peppy/add-timeline-stacking-support
Implement editor timeline stacking support
2021-03-29 20:44:52 +09:00
Dan Balasescu
633a0f4a40
Merge pull request #12208 from peppy/fix-chat-scroll-stickiness
Fix chat scroll sticking visually when scrolling beyond bottom extent
2021-03-29 20:44:44 +09:00
Dean Herbert
690debe507
Merge pull request #12030 from LeNitrous/editor-platform-clipboard-copy 2021-03-29 19:31:16 +09:00
Dean Herbert
3909eda095 Avoid using a StringBuilder 2021-03-29 18:51:28 +09:00
Dean Herbert
90ab765cf5 Reorder methods and surround with region 2021-03-29 18:46:32 +09:00
Dan Balasescu
4a5fc82388
Merge branch 'master' into add-timeline-stacking-support 2021-03-29 18:42:59 +09:00
Nathan Alo
cdb779f764 move copy logic inside ComposeScreen 2021-03-29 17:30:23 +08:00
Nathan Alo
9a02f3868c return a string instead 2021-03-29 17:29:05 +08:00
Dean Herbert
699a317b44 Fix chat scroll sticking visually when scrolling beyond bottom extent 2021-03-29 18:07:47 +09:00
smoogipoo
ecb66ad2e2 Fix up xmldoc 2021-03-29 15:33:54 +09:00
Bartłomiej Dach
b9b0623c83
Merge pull request #12181 from peppy/fix-accuracy-formatting 2021-03-27 15:19:00 +01:00
Bartłomiej Dach
ccd2d5d2a9
Merge branch 'master' into fix-accuracy-formatting 2021-03-27 14:42:13 +01:00
Dean Herbert
16e184e531
Merge pull request #12183 from frenzibyte/legacy-sprite-text-fonts
Improve code quality of constructing legacy sprite texts
2021-03-27 20:39:33 +09:00
Samuel Cattini-Schultz
068f00d8a0 Add EndTime to DifficultyHitObject for future convenience 2021-03-27 18:38:43 +11:00
Samuel Cattini-Schultz
010db8968f Adjust wording of xmldoc 2021-03-27 18:38:23 +11:00
Nathan Alo
21398e25b5 null check composer and ensure the correct start time from selected hit objects 2021-03-27 10:02:21 +08:00
Bartłomiej Dach
e9289853fc
Merge branch 'master' into fix-accuracy-formatting 2021-03-26 21:24:04 +01:00
Leon Gebler
a50c4be8ab Add missing space 2021-03-26 17:41:36 +01:00
Leon Gebler
305c2e31cf Clarify todo comment 2021-03-26 16:53:17 +01:00
Leon Gebler
25ea60cb92 Remove return values from HandleScale submethods 2021-03-26 16:40:10 +01:00
Leon Gebler
5d272bef97 Remember ContolPoint positions instead of recalculating them 2021-03-26 16:31:04 +01:00
Dan Balasescu
49d6bf066a
Merge pull request #12193 from peppy/fix-multiplayer-crash-on-enter-twice
Fix crash on attempting to join lobby using key press during a pending join
2021-03-26 19:27:17 +09:00
Nathan Alo
c96321206a fix appveyor complaints 2021-03-26 16:17:24 +08:00
Salman Ahmed
1b6e08b3eb Fix incorrect default font overlap for score and combo 2021-03-26 10:35:46 +03:00
Nathan Alo
71a0616861 remove extra semi colons 2021-03-26 15:34:45 +08:00
Nathan Alo
374f8c5e22 move to compose namespace and add license header 2021-03-26 15:33:28 +08:00