h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 12:12:54 +08:00
Code Issues Releases Wiki Activity
24,930 Commits 3 Branches 657 Tags 357 MiB
2e3a66cb6e
Commit Graph

24930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Viktor Rosvall
2e3a66cb6e
Merge branch 'master' into mod_content_centering 2019-12-30 17:36:36 +01:00
Dean Herbert
d8b96a679d
Bump ppy.osu.Game.Resources from 2019.1227.0 to 2019.1230.0 (#7400) 
Bump ppy.osu.Game.Resources from 2019.1227.0 to 2019.1230.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-12-30 23:20:38 +09: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
Dean Herbert
2836eb40cc
Add context menu on direct panels (#7394) 
Add context menu on direct panels

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-12-30 12:11:34 +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
Dean Herbert
f91377e9bb
Fix context menus not showing on social panels (#7393) 
Fix context menus not showing on social panels

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-12-30 11:28:12 +09:00
Dean Herbert
727e64b885
Merge branch 'master' into fix-context-menus-of-social-panels 2019-12-30 11:13:42 +09:00
Dean Herbert
5df90997cb
Move mania stage hint to its own class (#7381) 
Move mania stage hint to its own class
 2019-12-30 11:11:53 +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
mcendu
20c5748342 Use hitTarget in place of stageHint 2019-12-29 23:37:28 +08:00
mcendu
51000765dd remove override 2019-12-29 23:29:00 +08:00
mcendu
61fb9f5613 Remove class StageHint and usage 2019-12-29 23:18:50 +08:00
Viktor Rosvall
e85910c4e4 removed unnecessary test code 2019-12-29 09:18:27 +01:00
Viktor Rosvall
595b260782 Merge branch 'mod_content_centering' of https://github.com/vruss/osu into mod_content_centering 2019-12-29 09:15:23 +01:00
Viktor Rosvall
875a25c529 adjusted the margin values 2019-12-29 09:00:59 +01:00
Viktor Rosvall
bf463fe5e0 adjusted the margin values 2019-12-29 08:57:14 +01:00
mcendu
cdfbe96e9b Make AccentColour of StageHint virtual 2019-12-29 14:52:51 +08:00
Viktor Rosvall
b3d32710df Centered button mods by adding padding to FillFlowContainer 2019-12-29 00:19:51 +01:00
mcendu
5d2b5cc950 correct type of field stageHint 2019-12-28 14:05:46 +08:00
mcendu
bf162f148e Move mania stage hint to its own class 2019-12-28 13:48:10 +08:00
Dean Herbert
6cb1a638b6
Merge pull request #7367 from bdach/scrolling-container-origin-adjust 
Adjust scrolling container object lifetime to account for origin choice
 2019-12-28 13:17:14 +09:00
Bartłomiej Dach
d828b31ae4 Schedule child mutation in test setup 2019-12-27 17:16:43 +01:00
Bartłomiej Dach
3621362a48 Merge branch 'master' into scrolling-container-origin-adjust 2019-12-27 16:52:21 +01:00
Bartłomiej Dach
e2a55b79ca Refactor scrolling hit object scene 
To better demonstrate the desired effect of the fix introduced in
193e41f, refactor TestSceneScrollingHitObjects to contain two tests,
one of which contains the pre-existing controls to test scroll
algorithms, and the other aims to showcase the fix by setting scroll
parameters appropriately.
 2019-12-27 16:52:07 +01:00
Dan Balasescu
965b57dbb5
Merge pull request #7371 from peppy/lock-difficulty-adjust 
Lock user adjusted difficulty settings when changing beatmap
 2019-12-27 23:33:30 +09:00
Dan Balasescu
bba89fc57b
Merge branch 'master' into lock-difficulty-adjust 2019-12-27 23:17:04 +09:00
Dan Balasescu
6c5e25a13a
Merge pull request #7372 from peppy/fix-replay-import 
Fix replay import from main menu causing a hard crash
 2019-12-27 23:10:23 +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
b916a636a9
Fix mania hold notes not handling input correctly (#7329) 
Fix mania hold notes not handling input correctly
 2019-12-27 22:32:56 +09:00
Dean Herbert
388d991ba9
Update framework (#7373) 
Update framework
 2019-12-27 22:10:50 +09:00
Dean Herbert
651abd2e11 Update framework 2019-12-27 21:51:18 +09:00
Dean Herbert
3a5015d013
Merge branch 'master' into fix-hold-note-input 2019-12-27 21:48:38 +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
2df57918b1
Merge pull request #7357 from peppy/fix-mod-read-setting 
Fix difficulty adjust mod not correctly reading settings while leaderboard visible
 2019-12-27 17:45:50 +09:00
Dan Balasescu
199c0bca02
Merge branch 'master' into fix-mod-read-setting 2019-12-27 17:45:24 +09:00
Dean Herbert
750b0746cd
Implement HP drain (#7361) 
Implement HP drain

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-12-27 17:44:51 +09:00
Dan Balasescu
ecfe1d361b
Merge branch 'master' into fix-mod-read-setting 2019-12-27 17:29:13 +09:00
smoogipoo
7507fee9f9 Add test for HP rewind 2019-12-27 16:55:46 +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
df7714a3e8
Give empty archives a hash based on archive name to avoid dupli… (#7363) 
Give empty archives a hash based on archive name to avoid duplicate imports
 2019-12-27 14:55:58 +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
ebbd32fb28
Merge pull request #7366 from EVAST9919/overlay-headers-update-two 
Update overlay headers layout in line with the new web design
 2019-12-27 13:53:48 +09:00
Dan Balasescu
8eef636e6c
Merge branch 'master' into overlay-headers-update-two 2019-12-27 13:28:51 +09:00
Dean Herbert
84c10728d8
Use mania-specific judgement sprites for mania (#7365) 
Use mania-specific judgement sprites for mania

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-12-27 13:22:40 +09:00