1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 02:59:48 +08:00
Commit Graph

15959 Commits

Author SHA1 Message Date
Dan Balasescu
48502eba7f
Merge branch 'master' into difficulty-tooltip-unused-var 2020-01-08 14:40:40 +09:00
Bartłomiej Dach
e0cfc2f405
Merge branch 'master' into prev-button-revamp 2020-01-07 21:49:53 +01:00
Lucas A
7f92cefe10 Apply review suggestions 2020-01-07 19:06:47 +01:00
Ganendra Afrasya
0fb27ef153 Merge remote-tracking branch 'upstream/master' into difficulty-tooltip-unused-var 2020-01-07 17:59:10 +07:00
Dean Herbert
e33de0c2e4 Fix ScrollContainer crashes 2020-01-07 15:14:09 +08:00
Dean Herbert
be19bb8a27 Merge remote-tracking branch 'upstream/master' into set_user_agent_on_web_request_level 2020-01-07 15:01:09 +08:00
Dean Herbert
fadd53106c Merge remote-tracking branch 'upstream/master' into medals-fix 2020-01-07 13:39:42 +09:00
Dean Herbert
fd925526e2 Fix medal overlay display 2020-01-07 13:39:30 +09:00
Dean Herbert
b3a7b02e3b Merge remote-tracking branch 'upstream/master' into fix-cancelling-request-not-correct 2020-01-07 11:43:01 +09:00
Dean Herbert
cb43020118 Merge remote-tracking branch 'upstream/master' into triangles-color 2020-01-07 10:00:10 +09:00
Sebastian Krajewski
0b9cc8ed1b Revert "Move colour generation to TriangleParticle"
This reverts commit de4c62788c.
2020-01-07 09:58:37 +09:00
Andrei Zavatski
7716a96b28 Allow scrolling through DimmedLoadingLayer 2020-01-06 23:07:58 +03:00
Andrei Zavatski
031bed15da Fix comments async loading wasn't really async 2020-01-06 20:56:32 +03:00
Sebastian Krajewski
de4c62788c Move colour generation to TriangleParticle 2020-01-06 12:51:38 +01:00
Ganendra Afrasya
e433e8b78f Remove unused variable 2020-01-06 17:12:10 +07:00
smoogipoo
28510674ac Shorten body text 2020-01-06 17:48:29 +09:00
smoogipoo
61c269b17b Leaderboard should not change the model 2020-01-06 17:32:24 +09:00
smoogipoo
4a7f5f98df Cleanup methods/events 2020-01-06 17:20:09 +09:00
Joehu
d188d33f18 Fix osu!direct global action not being bound to a key 2020-01-05 18:59:06 -08:00
Sebastian Krajewski
d1f3cb3dbd Premature checks to avoid unnecessary updates 2020-01-06 01:53:29 +01:00
Sebastian Krajewski
f70f25098b Change visible triangles colour when dark or light colour is changed 2020-01-06 00:32:13 +01:00
Lucas A
21e6351c53 Allow DI for LoginOverlay to resolve to null in non-graphical environments (fix tests) 2020-01-05 14:33:44 +01:00
Lucas A
3d747835dc Fix CI issues 2020-01-04 21:09:40 +01:00
Lucas A
5fd5665467 Use implementation on song select leaderboards. 2020-01-04 19:59:25 +01:00
Lucas A
474b8fc8fd Add LoginPlaceholder 2020-01-04 19:56:42 +01:00
Lucas A
3bd3ebad49 Move placeholders to a dedicated namespace 2020-01-04 19:56:34 +01:00
Andrei Zavatski
9fb29cc7a7 Move medal loading to LoadComplete 2020-01-04 18:45:34 +03:00
Andrei Zavatski
0a9d14826c Merge remote-tracking branch 'refs/remotes/ppy/master' into medals-fix 2020-01-04 18:28:17 +03:00
Dean Herbert
a756d5d95d Fix new account registration attempting to login with email 2020-01-04 14:52:07 +09:00
Craftplacer
cd91cc860d Resolve "Redundant lambda signature parentheses" 2020-01-04 01:06:38 +01:00
Craftplacer
7cc388b5ab Mark channel up to last message as read when switching channels 2020-01-04 00:50:12 +01:00
Craftplacer
4f36bc0fd3 Add error log message for debugging 2020-01-04 00:49:35 +01:00
Craftplacer
8dbddfab55 Add HTTP method 2020-01-04 00:45:51 +01:00
Craftplacer
9b95ce1045 Change wrong values used to form target URL
Dumb mistake by me, C# used ToString() on these objects.
2020-01-04 00:45:02 +01:00
Willy Tu
e23c71be80 Update Resolved and Cached attribute issues 2020-01-03 11:34:26 -08:00
Willy Tu
0a4e180ce7 Merge branch 'master' of github.com:ppy/osu into #7146 2020-01-03 11:32:06 -08:00
Albie Spriddell
d4888c39de cleanup 2020-01-03 15:22:33 +00:00
Albie Spriddell
23ed64c5fd Merge branch 'rpc' of https://github.com/aspriddell/osu into rpc 2020-01-03 13:08:06 +00:00
Albie Spriddell
71a3db7cd6 remove from rulesetinfo 2020-01-03 13:08:01 +00:00
Albie
b500ee44fb
Update osu.Game/Rulesets/Ruleset.cs
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2020-01-03 13:00:57 +00:00
Albie Spriddell
5940851519 remove database dependency 2020-01-03 12:17:01 +00:00
Albie Spriddell
3a903339d6 add playingverb and database migrations 2020-01-03 11:39:15 +00:00
Dan Balasescu
c07cfce3b3
Merge branch 'master' into resource-assembly 2020-01-03 17:56:25 +09:00
Dean Herbert
e9b57de76f Update framework 2020-01-03 17:23:17 +09:00
Dean Herbert
78e9ab912d Merge remote-tracking branch 'upstream/master' into set_user_agent_on_web_request_level 2020-01-03 17:23:11 +09:00
Dean Herbert
7d79edf335 Merge remote-tracking branch 'upstream/master' into overlay-headers-update-three 2020-01-03 15:35:33 +09:00
Dean Herbert
fe581bf27e Remove unnecessarily exposed value 2020-01-03 15:35:18 +09:00
Dean Herbert
e8567414c6 Refactor into some kind of sanity 2020-01-03 15:01:42 +09:00
smoogipoo
b54491cc82 Make sure an exception is thrown 2020-01-03 14:16:38 +09:00
Craftplacer
51556a809d Fix variables not being used inside target string 2020-01-02 17:20:33 +01:00
Craftplacer
7b71e56817 Initial commit 2020-01-02 17:07:28 +01:00
Dean Herbert
132b420aaa Fix changelog overlay hard crashing on no internet connection 2020-01-02 19:19:42 +09:00
Andrei Zavatski
a5c23e7cf7 Remove underline from breadcrumb display 2020-01-02 11:09:47 +03:00
Andrei Zavatski
0f331e81f6 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-headers-update-three 2020-01-02 10:59:31 +03:00
smoogipoo
878e9f182e Add storyboard sample test scene 2020-01-02 15:23:41 +09:00
smoogipoo
0f8a76afde Remove manual hitobject sample namespacing 2020-01-02 14:27:27 +09:00
Dean Herbert
d1d19c2cd9 Move chevron size implementation 2020-01-02 14:26:40 +09:00
Dean Herbert
546f64f951 Method to property 2020-01-02 14:19:31 +09:00
smoogipoo
09cd66adb0 Fix storyboard samples not loading from subfolders 2020-01-02 14:07:22 +09:00
Dean Herbert
f09f9eb07d Merge branch 'master' into general-editor-beatmap 2020-01-01 23:27:08 +09:00
Dean Herbert
6a992b340d Remove generic editor beatmap (#7398)
Remove generic editor beatmap

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-01-01 23:24:24 +09:00
Dean Herbert
4f2fa2626a Centralise calls to mutable hitobjects list 2020-01-01 21:24:00 +09:00
Dean Herbert
ca90f708f1 Merge remote-tracking branch 'upstream/master' into remove-editor-beatmap-generics 2020-01-01 21:03:31 +09:00
Andrei Zavatski
19e7867aba Make OverlayHeader non-generic 2019-12-31 18:12:03 +03:00
Andrei Zavatski
3a71abe8ff Add xmldoc and better parameter naming 2019-12-31 17:52:41 +03:00
Dean Herbert
ddbdb02aa4
Merge branch 'master' into overlay-headers-update-three 2019-12-31 22:54:16 +09:00
Joehu
a292d235d6 Separate statement with newline 2019-12-30 09:49:34 -08:00
Joehu
25be3fd799 Move shift-delete handling to switch 2019-12-30 09:38:22 -08:00
Joehu
32e4d4a563 Fix search textboxes absorbing home/end input on scroll containers 2019-12-30 09:29:46 -08:00
dependabot-preview[bot]
8ae4cfaa52
Bump ppy.osu.Game.Resources from 2019.1227.0 to 2019.1230.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.1227.0 to 2019.1230.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.1227.0...2019.1230.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-30 07:33:49 +00:00
smoogipoo
8c378dc625 Move EditorBeatmap construction/conversion to Editor 2019-12-30 14:51:14 +09:00
Andrei Zavatski
5748b60a06 Make item chevron size virtual 2019-12-30 08:26:49 +03:00
Dean Herbert
9d5d61a64d
Merge branch 'master' into overlay-headers-update-three 2019-12-30 13:42:23 +09:00
Dean Herbert
0eccfc79cc Remove unused field 2019-12-30 11:51:33 +09:00
Dean Herbert
a03a637728
Merge branch 'master' into add-context-menu-direct-panel 2019-12-30 11:37:02 +09:00
Joehu
bcf7156882 Add context menu on direct panels 2019-12-29 11:19:46 -08:00
Joehu
39d77386a8 Fix context menus not showing on social panels 2019-12-29 10:49:28 -08:00
Andrei Zavatski
cb2b89a2c9 Fix crashing TextSceneMedalOverlay 2019-12-29 03:01:14 +03:00
Roman Kapustin
e8bcb52612 Set UserAgent for API requests 2019-12-28 18:07:55 +03:00
Huo Yaoyuan
1b33581667 Construct DllResourceStore with assemblies 2019-12-28 21:13:18 +08:00
Andrei Zavatski
7af622426a Make field readonly 2019-12-28 05:11:28 +03:00
Andrei Zavatski
ac2280c4ef Implement BreadcrumbControlOverlayHeader 2019-12-28 04:57:41 +03:00
Andrei Zavatski
f2ff57d6b7 Update design of OverlayHeaderTabControl 2019-12-28 02:50:52 +03:00
Bartłomiej Dach
3621362a48 Merge branch 'master' into scrolling-container-origin-adjust 2019-12-27 16:52:21 +01:00
Dan Balasescu
bba89fc57b
Merge branch 'master' into lock-difficulty-adjust 2019-12-27 23:17:04 +09:00
Dean Herbert
5efb7e8015 Always update default value 2019-12-27 23:01:52 +09:00
Dan Balasescu
3836567992
Merge branch 'master' into fix-replay-import 2019-12-27 22:52:27 +09:00
Dean Herbert
651abd2e11 Update framework 2019-12-27 21:51:18 +09:00
smoogipoo
6069d98ced Remove generic editor beatmap 2019-12-27 19:39:30 +09:00
Dean Herbert
ca862124a5 Fix replay import from main menu causing a hard crash 2019-12-27 19:36:48 +09:00
Dean Herbert
2c8879f0fb Lock user adjusted difficulty settings when changing beatmap 2019-12-27 19:05:17 +09:00
Dan Balasescu
199c0bca02
Merge branch 'master' into fix-mod-read-setting 2019-12-27 17:45:24 +09:00
Dan Balasescu
ecfe1d361b
Merge branch 'master' into fix-mod-read-setting 2019-12-27 17:29:13 +09:00
Dean Herbert
b330aec03e Drain starting at the first hitobject, not gameplay start 2019-12-27 16:16:30 +09:00
Dean Herbert
aa97487f8e
Merge branch 'master' into hp-drain 2019-12-27 14:58:22 +09:00
Dean Herbert
6bff5cfb9e Merge remote-tracking branch 'upstream/master' into avoid-duplicate-empty-archives 2019-12-27 14:07:34 +09:00
Dean Herbert
ea52bbea35 Update framework 2019-12-27 14:05:48 +09:00
Dean Herbert
9478fe5ec3 Revert to using empty container, not null 2019-12-27 13:15:55 +09:00
smoogipoo
c22744de2c Better define minimum health targets 2019-12-27 12:46:35 +09:00
smoogipoo
fbbd16b4f0 Remove healthIncreases nullability 2019-12-27 12:39:25 +09:00