h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-10-01 17:17:25 +08:00
Code Issues Releases Wiki Activity
24,464 Commits 3 Branches 647 Tags 353 MiB
02f9fc89f6
Commit Graph

24464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craftplacer
02f9fc89f6
Merge branch 'master' into chat-mention 2019-12-17 06:59:49 +01:00
Craftplacer
b6c31e7764 Remove ignore list, move code to MessageNotifier and add it to DI 
This also adds countable private message notifications.
 2019-12-17 06:59:27 +01:00
Craftplacer
02dc70be02 Make it possible to retrieve loaded channel drawables in ChatOverlay 2019-12-17 06:56:05 +01:00
Craftplacer
bea34e3aab Make it possible to retrieve notifications from NotificationOverlay 2019-12-17 06:55:48 +01:00
Dean Herbert
c92332d2e4
Merge pull request #7214 from Joehuu/default-placeholder-channel-search 
Use default placeholder text on chat channel search box
 2019-12-17 14:38:56 +09:00
Dean Herbert
735b7a8455
Merge pull request #6940 from aspriddell/cinema-mod 
Add "Cinema" mod
 2019-12-17 14:33:12 +09:00
Dean Herbert
fb82e97e5d
Add minimal old skin to osu! ruleset tests (#7173) 
Add minimal old skin to osu! ruleset tests

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-12-17 14:14:49 +09:00
Dean Herbert
5079feaad1 Remove unnecessary string interpolation 2019-12-17 14:04:03 +09:00
Dean Herbert
6e1f10ad8d Merge remote-tracking branch 'upstream/master' into add-old-skin-to-osu-tests 2019-12-17 13:56:01 +09:00
Dean Herbert
9875fcea99 Add numbers to old skin for better identification 2019-12-17 13:54:25 +09:00
Dean Herbert
f8ffa67693 Add test and isolate ignore bindable from EnableUserDim 2019-12-17 13:21:23 +09:00
Dean Herbert
5761d763ec
Allow changing volume using alt when hovering scroll containers (#7213) 
Allow changing volume using alt when hovering scroll containers

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-12-17 13:20:31 +09:00
Dean Herbert
b5db927d93 Merge branch 'master' into cinema-mod 2019-12-17 12:56:06 +09:00
Dean Herbert
a85653ebec Add comment 2019-12-17 12:24:59 +09:00
Dean Herbert
a82b2a6c34
Merge pull request #7233 from smoogipoo/fix-cursortrail-texture 
Fix cursortrail texture not being bound
 2019-12-16 19:46:24 +09:00
Dean Herbert
eed2984bef
Update sdk and InspectCode version (#7208) 
Update sdk and InspectCode version
 2019-12-16 19:46:12 +09:00
Dan Balasescu
267d832ecc
Merge pull request #7168 from peppy/improve-hud-hiding 
Improve HUD hiding
 2019-12-16 19:09:46 +09:00
smoogipoo
6cf318c34b Merge remote-tracking branch 'refs/remotes/origin/master' into improve-hud-hiding 2019-12-16 18:41:21 +09:00
smoogipoo
a276643a4b Reorder health display and score elements 2019-12-16 18:41:14 +09:00
smoogipoo
83f77d9c35 Make the layout faster 2019-12-16 18:41:02 +09:00
smoogipoo
add04e98e1 Fix cursortrail texture not being bound 2019-12-16 18:10:44 +09:00
Dean Herbert
6ad792d2e0
Merge pull request #7232 from ppy/dependabot/nuget/ppy.osu.Game.Resources-2019.1215.0 
Bump ppy.osu.Game.Resources from 2019.1010.0 to 2019.1215.0
 2019-12-16 16:36:55 +09:00
dependabot-preview[bot]
fef1877095
Bump ppy.osu.Game.Resources from 2019.1010.0 to 2019.1215.0 
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.1010.0 to 2019.1215.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.1010.0...2019.1215.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-16 07:36:30 +00:00
Dean Herbert
520924a5ef
Don't reuse the same control point references for sliders (#7230) 
Don't reuse the same control point references for sliders
 2019-12-16 16:03:37 +09:00
Dean Herbert
00853f350a
Optimise cursortrail with custom vertex logic (#7229) 
Optimise cursortrail with custom vertex logic
 2019-12-16 16:02:15 +09:00
Dan Balasescu
c3c0356963
Merge pull request #7228 from peppy/fix-skin-crash 
Fix crashes on custom skins due to extension-less file lookups
 2019-12-16 15:34:29 +09:00
smoogipoo
a554ca728b Don't reuse the same control point references 2019-12-16 15:27:54 +09:00
smoogipoo
db3dc4f375 Optimise cursortrail with custom vertex logic 2019-12-16 15:15:26 +09:00
Dean Herbert
befb78f83b Simplify LegacySkinResourceStore by deriving from ResourceStore 2019-12-16 14:01:08 +09:00
Dean Herbert
9062fe1935 Fix crashes on custom skins due to extension-less file lookups 2019-12-16 13:32:53 +09:00
Dean Herbert
f4ce703490
Separate path connections from control points (#7136) 
Separate path connections from control points

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-12-16 11:37:11 +09:00
Craftplacer
1a1253a4aa Add null check to ScrollToAndHighlightMessage 2019-12-16 03:27:19 +01:00
Craftplacer
997b51b1f8 Make messageRemoved use helper method 2019-12-16 03:26:30 +01:00
Craftplacer
0225372e83 Rename method to ScrollToAndHighlightMessage 2019-12-16 03:24:07 +01:00
Craftplacer
eb3f851ce2 Split Notification class into three separate ones 2019-12-16 03:22:55 +01:00
Craftplacer
81d994abed Change ChatMessageNotification's LabelText 2019-12-16 03:22:14 +01:00
Dean Herbert
5e98f65b52
Merge branch 'master' into separate-path-connection 2019-12-16 11:16:00 +09:00
Craftplacer
8b14090c95 Remove unused field 2019-12-16 02:13:26 +01:00
Craftplacer
20670730b9 Resolve code formatting 2019-12-16 01:57:07 +01:00
Craftplacer
28d1fb181f Add missing license header for InGameChatSettings.cs 
My unit tests fail at a solution filter, let's hope AppVeyor says yes.
 2019-12-16 01:14:51 +01:00
Craftplacer
15c25c571d Merge remote-tracking branch 'upstream/master' into chat-mention 2019-12-16 00:59:06 +01:00
Craftplacer
8dfc8929f1 Add chat and notification logic to DrawableChannel 
with alongside multiple helper methods
 2019-12-16 00:48:22 +01:00
Craftplacer
e8180ab153 Add ToString() method to message for better debugging 2019-12-16 00:45:55 +01:00
Craftplacer
6e812ebd56 Reimplement chat settings from stable 2019-12-16 00:45:33 +01:00
Huo Yaoyuan
c457571da6 Use index and range expressions 2019-12-15 20:17:35 +08:00
Huo Yaoyuan
cea3a66d4a Use static local method fixed for roslyn 3.4 2019-12-15 20:07:56 +08:00
Huo Yaoyuan
8b57023349 Require 3.1.100 SDK in global.json 2019-12-15 20:07:56 +08:00
Huo Yaoyuan
ab70abe8bd Turn off unexpected new warnings. 2019-12-15 20:07:56 +08:00
Huo Yaoyuan
19a3c95992 Update InspectCode to 2019.3 2019-12-15 20:07:56 +08:00
Dean Herbert
ef4718dfaf
Fix depth of cursor middle being incorrect compared other curso… (#7205) 
Fix depth of cursor middle being incorrect compared other cursor elements
 2019-12-15 14:43:56 +09:00