h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-06 23:37:20 +08:00
Code Issues Releases Wiki Activity
17,537 Commits 4 Branches 679 Tags
Commit Graph

3793 Commits

Author SHA1 Message Date
Paul Teng
b351aae93f Reduce height of song progress handle 2018-10-18 07:02:18 -04:00
smoogipoo
72d48aa7f5 Add xmldocs to IPlacementHandler 2018-10-18 16:46:30 +09:00
smoogipoo
0e841628b6 Implement hitobject deletion 2018-10-18 16:36:06 +09:00
smoogipoo
969477dadd Remove placement events, make everything pass top-down 2018-10-17 17:43:16 +09:00
smoogipoo
62635c5ab8 Add container to handle placement mask 2018-10-17 16:17:49 +09:00
smoogipoo
4ea4ec0d25 Move placement handling events to a higher level 2018-10-17 15:46:30 +09:00
smoogipoo
70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement 
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
#	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
 2018-10-16 17:28:16 +09:00
Dean Herbert
eaa5ef5168
Merge branch 'master' into return_to_large_logo_after_idle 2018-10-12 22:14:23 +09:00
Dean Herbert
2babdc079c
Merge pull request #3568 from smoogipoo/fix-beatmap-details 
Fix beatmap details not displaying
 2018-10-10 20:14:58 +09:00
Dean Herbert
d28b9860ff Don't use "beatmapset" terminology 2018-10-10 19:26:35 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
Dean Herbert
3be50c2941
Merge branch 'master' into return_to_large_logo_after_idle 2018-10-09 18:02:36 +09:00
smoogipoo
6d24bde72b Fix beatmap details not displaying 2018-10-09 17:39:27 +09:00
smoogipoo
934b687965 Fix selection masks not being added for new objects 2018-10-03 16:49:59 +09:00
smoogipoo
4cdb6dcea5 Rename HitObjectMask -> SelectionMask 2018-10-03 13:28:00 +09:00
ekrctb
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
ekrctb
b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
Dean Herbert
6841d5c2ec Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework 2018-09-28 18:32:59 +09:00
Roman Kapustin
baf9e028c3 Fix possible idleTracker nullref 2018-09-26 19:44:01 +03:00
Dean Herbert
a4bf21268b Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-26 19:59:18 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Roman Kapustin
bdba22a576 Override Handle(UIEvent e) in IdleTracker 2018-09-25 20:11:10 +03:00
Roman Kapustin
c7b3fa51d5 Inject IdleTracker into ButtonSystem 2018-09-25 19:58:50 +03:00
UselessToucan
3c0b77658c
Merge branch 'master' into return_to_large_logo_after_idle 2018-09-25 19:48:38 +03:00
smoogipoo
cb500e80e4 Make BeatmapInfoWedge present until info is not null 2018-09-25 14:45:26 +09:00
Roman Kapustin
5c741eaa89 Fix possible game nullref 2018-09-21 17:07:46 +03:00
Paul Teng
ed0ea3ad41
Merge branch 'master' into patch-1 2018-09-21 06:31:15 -04:00
smoogipoo
4380ef15bf Fix potential exception during async load callback 2018-09-21 16:31:09 +09:00
Paul Teng
654345f380 Remove duplicate condition test 2018-09-20 22:32:24 -04:00
Paul Teng
1644719893 Update SongSelect.cs 2018-09-20 22:29:37 -04:00
Paul Teng
49fbe8443a Test if there are beatmaps when click on delete btn 2018-09-20 22:00:20 -04:00
Dean Herbert
83bf38f4bc Make menu background blurrable 
Not actually blurring yet, needs further testing.
 2018-09-21 03:13:34 +09:00
Dean Herbert
78d78b5510 Fade menu background a bit when menu is active 2018-09-21 03:13:15 +09:00
Dean Herbert
07a1c39fe5 Use random default background on starting the game 2018-09-21 03:12:20 +09:00
Dean Herbert
37f3035437 Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-20 18:39:48 +09:00
smoogipoo
62135c39aa Cleanup 2018-09-20 12:56:39 +09:00
smoogipoo
7b8094d731 Move text size/padding out of constructor 2018-09-20 12:53:45 +09:00
Dean Herbert
ae4c371bec Merge branch 'update-framework-event-handling' into update-framework 2018-09-20 00:29:42 +09:00
Dean Herbert
b2cf636ab5 Merge branch 'localisation-changes' into update-framework 2018-09-20 00:29:31 +09:00
smoogipoo
38a3c2a820 Fix song select wedge sometimes not updating when localisation changes 2018-09-19 14:57:32 +09:00
smoogipoo
28f31540c4 Apply changes in-line with framework localisation changes 2018-09-19 14:07:46 +09:00
ekrctb
b790e16217 Use Click instead of now removed TriggerOnClick 2018-09-19 11:42:32 +09:00
ekrctb
a3e6973b41 Replace usage of now removed TriggerKeyPress and similar methods. 2018-09-19 11:36:55 +09:00
Dan Balasescu
d3bb78d139
Merge branch 'master' into add-rank-status 2018-09-18 14:10:42 +09:00
Joehu
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
Dean Herbert
41be757a11
Merge branch 'master' into fix-logo-overhead 2018-09-15 18:33:22 +09:00
Dean Herbert
79b56cb35c Make saveState private 2018-09-15 16:34:08 +09:00
Dean Herbert
65b2bceef2 Simplify implementation 2018-09-15 14:51:04 +09:00