h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 13:17:26 +08:00
Code Issues Releases Wiki Activity
24,954 Commits 3 Branches 653 Tags 368 MiB
0f331e81f6
Commit Graph

15821 Commits

Author SHA1 Message Date
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
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
Andrei Zavatski
04a4821a9f Make CreateContent a method again 2019-12-27 06:36:41 +03:00
Andrei Zavatski
2d167a5161 Some little size adjustments 2019-12-27 05:53:31 +03:00
Andrei Zavatski
3feaaa3e4d Use FillMode.Fit for icons 2019-12-27 05:37:06 +03:00
Andrei Zavatski
dc720dd653 Bump ppy.osu.Game.Resources from 2019.1215.0 to 2019.1227.0 2019-12-27 05:27:36 +03:00
Andrei Zavatski
3ae0564db7 Merge master with conflicts resolved 2019-12-27 05:17:53 +03:00
Dean Herbert
183307d636 Use circle instead of CircularContainer 2019-12-27 10:53:20 +09:00