smoogipoo
|
d68b4bb8e7
|
Remove custom action from DrawableRoom
|
2018-12-07 14:28:43 +09:00 |
|
smoogipoo
|
10b526504a
|
Move ModOverlay to SongSelect
|
2018-12-06 19:29:18 +09:00 |
|
smoogipoo
|
c02150a19b
|
Make match header not fade when beatmap changes
|
2018-12-06 18:31:12 +09:00 |
|
smoogipoo
|
42817b98f9
|
Hide max participants box
|
2018-12-06 18:16:17 +09:00 |
|
smoogipoo
|
eadbe4c470
|
Make beatmap selection work
|
2018-12-06 12:21:30 +09:00 |
|
Dean Herbert
|
94045413ce
|
Change statistics to be int for now
|
2018-12-05 19:44:01 +09:00 |
|
smoogipoo
|
e7d7e00516
|
Better disabling of various controls
|
2018-12-05 17:01:14 +09:00 |
|
Dean Herbert
|
4f5028bbc1
|
Merge branch 'master' into fix-hudoverlay-presence
|
2018-12-04 22:14:54 +09:00 |
|
smoogipoo
|
ca91dfa091
|
Make hudoverlay always present
|
2018-12-04 19:20:32 +09:00 |
|
smoogipoo
|
ec83790734
|
Add timeshift game type
|
2018-12-04 18:58:45 +09:00 |
|
smoogipoo
|
c469d12d63
|
Set room host when the room is refreshed
|
2018-12-04 18:18:17 +09:00 |
|
smoogipoo
|
a7ac544e12
|
Add interface for the multiplayer screen short title
|
2018-12-04 17:43:44 +09:00 |
|
smoogipoo
|
b251129c59
|
Block going into multiplayer while logged out
|
2018-12-04 17:43:27 +09:00 |
|
smoogipoo
|
f2a57ce270
|
Fix room host not being set
|
2018-12-04 17:23:58 +09:00 |
|
smoogipoo
|
6e5716c3f3
|
Adjust transition
|
2018-12-04 15:32:12 +09:00 |
|
smoogipoo
|
a02e025f06
|
Fix selections not working anymore
|
2018-12-04 15:26:06 +09:00 |
|
smoogipoo
|
d8739d9dee
|
Fix creating a new room re-using the existing model
|
2018-12-04 15:25:48 +09:00 |
|
smoogipoo
|
e22cefc27d
|
Immediately select newly-created rooms
|
2018-12-04 12:49:22 +09:00 |
|
Dean Herbert
|
415349e6ef
|
Add missing return
|
2018-12-04 12:14:26 +09:00 |
|
Dean Herbert
|
a33865efce
|
Fix home button being cancelled by mod select
|
2018-12-04 12:06:05 +09:00 |
|
smoogipoo
|
6a28e8c696
|
Add settings to lounge
|
2018-12-03 18:30:26 +09:00 |
|
smoogipoo
|
53a54f8634
|
Renamespace room settings
|
2018-12-03 17:54:10 +09:00 |
|
smoogipoo
|
20b843e63c
|
Add create tab
|
2018-12-03 17:50:56 +09:00 |
|
smoogipoo
|
51c16867d5
|
Remove type conversion from LoungeTab to RoomAvailability
|
2018-12-03 17:50:39 +09:00 |
|
smoogipoo
|
b1c5b43767
|
Fix post-rebase errors
|
2018-11-30 18:46:47 +09:00 |
|
smoogipoo
|
10ed09521c
|
Add leaderboard display for local scores
|
2018-11-30 18:40:53 +09:00 |
|
smoogipoo
|
795933d1a1
|
CreateScoreInfo -> CreateScore
|
2018-11-30 18:32:08 +09:00 |
|
smoogipoo
|
a6b0e35b2d
|
Fix post-rebase issues
|
2018-11-30 18:31:54 +09:00 |
|
smoogipoo
|
a8ad7d4670
|
Add silent import parameter
|
2018-11-30 18:27:13 +09:00 |
|
smoogipoo
|
d07a724970
|
Only allow replay screen changes in menu + songselect
|
2018-11-30 18:25:54 +09:00 |
|
smoogipoo
|
4c1abdcd8c
|
Save score upon map completion
|
2018-11-30 18:25:14 +09:00 |
|
smoogipoo
|
8eff49bccd
|
Remove User from Replay
|
2018-11-30 18:25:14 +09:00 |
|
Dean Herbert
|
aa7a665317
|
Merge remote-tracking branch 'upstream/master' into scoredatabase
|
2018-11-30 17:20:23 +09:00 |
|
Dean Herbert
|
3727955911
|
Refactors/renames
|
2018-11-30 16:35:45 +09:00 |
|
smoogipoo
|
bc3fcb87b7
|
Use input events rather than scene graph traversals
|
2018-11-30 15:47:55 +09:00 |
|
Dean Herbert
|
831cd3ed59
|
ScoreInfo scoreInfo -> ScoreInfo score
|
2018-11-30 15:18:52 +09:00 |
|
Dan Balasescu
|
e83f6707bf
|
Merge branch 'master' into editor-keyboard-seek
|
2018-11-30 15:17:06 +09:00 |
|
Dean Herbert
|
271dcded3c
|
Merge branch 'master' into scoredatabase
|
2018-11-30 14:59:58 +09:00 |
|
Dean Herbert
|
ab621bd873
|
Toggle pause in editor with spacebar
|
2018-11-30 14:58:09 +09:00 |
|
Dean Herbert
|
0ee5a5bdb4
|
Add support for keyboard seeking in the editor
|
2018-11-30 14:57:25 +09:00 |
|
Dean Herbert
|
5254b07680
|
Merge remote-tracking branch 'upstream/master' into inter-column-movements
|
2018-11-30 11:57:53 +09:00 |
|
smoogipoo
|
a88b69ec43
|
Notify of existing imports
|
2018-11-28 20:19:35 +09:00 |
|
smoogipoo
|
219929eb47
|
Score -> ScoreInfo
|
2018-11-28 18:33:01 +09:00 |
|
smoogipoo
|
5b409a5ae5
|
Fix missed renames
|
2018-11-28 17:27:22 +09:00 |
|
smoogipoo
|
ed02847752
|
Beatmap -> BeatmapInfo + add foreign key
|
2018-11-28 17:26:39 +09:00 |
|
smoogipoo
|
2ee181daf7
|
Re-namespace replay-related classes
|
2018-11-28 17:20:37 +09:00 |
|
smoogipoo
|
09b79d736b
|
Remove unused usings
|
2018-11-28 16:33:42 +09:00 |
|
smoogipoo
|
5fd6e6ca77
|
Re-namespacing
|
2018-11-28 16:12:57 +09:00 |
|
Dean Herbert
|
da79292250
|
Merge branch 'master' into fix_idle_tracker
|
2018-11-26 17:41:45 +09:00 |
|
Dean Herbert
|
32b36f2883
|
Use IBindable<>
|
2018-11-26 17:07:30 +09:00 |
|
Dean Herbert
|
626048038c
|
Handle the null case
|
2018-11-26 16:50:41 +09:00 |
|
Dean Herbert
|
8d65d49126
|
Use bindable flow for checking idle time
|
2018-11-26 16:32:59 +09:00 |
|
smoogipoo
|
dea387c31e
|
Fix post-merge issues
|
2018-11-26 16:29:56 +09:00 |
|
smoogipoo
|
dcf740e5d3
|
Merge remote-tracking branch 'origin/master' into multiplayer-room-settings
|
2018-11-26 16:27:22 +09:00 |
|
smoogipoo
|
f9f300b215
|
Fix drag breaking if scrolling while dragging
|
2018-11-26 16:08:56 +09:00 |
|
Dean Herbert
|
fe5b043a59
|
Merge branch 'master' into fix_idle_tracker
|
2018-11-26 15:24:44 +09:00 |
|
smoogipoo
|
56032a4522
|
Merge branch 'mania-selection-movement' into inter-column-movements
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
# osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
|
2018-11-26 11:45:48 +09:00 |
|
Dan Balasescu
|
b446a73c0c
|
Add brackets
Co-Authored-By: peppy <pe@ppy.sh>
|
2018-11-23 10:06:06 +09:00 |
|
Dean Herbert
|
1b76e2faf5
|
Merge branch 'master' into fix-editor-precise-scroll
|
2018-11-23 09:57:35 +09:00 |
|
Dean Herbert
|
10047e6815
|
Adjust tick-based wheel control to be more correct
|
2018-11-22 20:13:40 +09:00 |
|
Dean Herbert
|
a48c26d999
|
Fix precision scroll events being handled incorrectly by editor
|
2018-11-22 19:40:44 +09:00 |
|
Dean Herbert
|
6cd69b794d
|
Fix leaderboard accessing drawables in a possibly invalid state
|
2018-11-22 19:08:46 +09:00 |
|
smoogipoo
|
f27bd3ef3e
|
OpenTK -> osuTK
|
2018-11-20 17:14:59 +09:00 |
|
Roman Kapustin
|
3c0ce2b615
|
Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle""
This reverts commit bcdaee7d39 .
|
2018-11-19 20:48:59 +03:00 |
|
smoogipoo
|
bcdaee7d39
|
Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"
This reverts commit 3e2e2a7000 , reversing
changes made to d94801b6c6 .
|
2018-11-19 17:52:31 +09:00 |
|
smoogipoo
|
55edeb095d
|
SelectionBox -> SelectionHandler
|
2018-11-19 16:58:11 +09:00 |
|
Dean Herbert
|
970ea928ae
|
Fix hold for menu button occasionally disappearing
|
2018-11-19 12:06:47 +09:00 |
|
Roman Kapustin
|
ecf8a89f26
|
Set AccentColour and GlowColour in StandardHealthDisplay
|
2018-11-16 19:30:58 +03:00 |
|
smoogipoo
|
4cbda97b1e
|
Move positional adjustment to SelectionBox
|
2018-11-16 17:12:24 +09:00 |
|
Roman Kapustin
|
37b19f78ae
|
Set AccentColour in concrete counters
|
2018-11-15 23:37:21 +03:00 |
|
smoogipoo
|
df7515b66f
|
Pass all selected hitobjects to the selection blueprints
|
2018-11-15 21:01:09 +09:00 |
|
Dan Balasescu
|
e8f34ddff0
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-11-15 15:16:10 +09:00 |
|
Dean Herbert
|
30547ac064
|
Merge remote-tracking branch 'upstream/master' into dropdown-updates
|
2018-11-14 20:03:45 +09:00 |
|
Dan Balasescu
|
81a3170e3b
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 19:13:07 +09:00 |
|
smoogipoo
|
c963fc7cd2
|
Reduce chaining
|
2018-11-14 18:34:13 +09:00 |
|
Dan Balasescu
|
e9b47c6233
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 18:22:34 +09:00 |
|
smoogipoo
|
aff5fa6169
|
Update with osu!-side dropdown changes
|
2018-11-14 18:02:38 +09:00 |
|
smoogipoo
|
6d43baf4bf
|
Make show/hide only invoked once each
|
2018-11-13 13:12:11 +09:00 |
|
smoogipoo
|
fbc20d2d4d
|
Hide placement when cursor is not in the playfield
|
2018-11-13 12:52:04 +09:00 |
|
smoogipoo
|
5d51719572
|
Make selection blueprints handle position adjustments
|
2018-11-07 16:21:32 +09:00 |
|
smoogipoo
|
e9e50f41fb
|
Use Name/NameScreen format
|
2018-11-07 13:04:17 +09:00 |
|
Dean Herbert
|
7f73fc2d39
|
Require holding back button to quit gameplay
Avoids accidental presses and streamlines logic with on-screen element.
|
2018-11-07 01:49:21 +09:00 |
|
smoogipoo
|
52f4923c8e
|
Remove intermediate Screens namespace
|
2018-11-06 18:28:22 +09:00 |
|
smoogipoo
|
ac25718c5a
|
Renamespace compose-mode components
|
2018-11-06 18:14:46 +09:00 |
|
smoogipoo
|
27d82052f4
|
BorderLayer -> EditorPlayfieldBorder
|
2018-11-06 18:10:46 +09:00 |
|
smoogipoo
|
85f96ad62f
|
Fix a few missed renames
|
2018-11-06 18:07:53 +09:00 |
|
smoogipoo
|
bd775af274
|
PlacementMask -> PlacementBlueprint
|
2018-11-06 18:04:03 +09:00 |
|
smoogipoo
|
11be820efe
|
CreateMaskFor -> CreateBlueprintFor
|
2018-11-06 18:03:21 +09:00 |
|
smoogipoo
|
90c813618a
|
Merge PlacementContainer into BlueprintContainer
|
2018-11-06 18:02:55 +09:00 |
|
smoogipoo
|
f2a5f28ea2
|
SelectionMask -> SelectionBlueprint
|
2018-11-06 17:56:04 +09:00 |
|
smoogipoo
|
ad2836a61e
|
MaskSelection -> SelectionBox
|
2018-11-06 17:52:47 +09:00 |
|
smoogipoo
|
65bb91dcf7
|
Merge MaskContainer into BlueprintContainer
|
2018-11-06 17:51:26 +09:00 |
|
smoogipoo
|
26c9390c16
|
HitObjectMaskLayer -> BlueprintContainer
|
2018-11-06 17:36:10 +09:00 |
|
smoogipoo
|
faab744cbd
|
DragLayer -> DragBox
|
2018-11-06 17:24:57 +09:00 |
|
smoogipoo
|
171700cb91
|
Debounce editor summary timeline seeks
|
2018-11-05 15:59:40 +09:00 |
|
Dean Herbert
|
0a0023920f
|
Fix not being able to drag control points mid-snake
|
2018-11-02 04:09:33 +09:00 |
|
Dean Herbert
|
d7f3e51050
|
Merge branch 'master' into editor-mask-placement
|
2018-10-31 15:00:38 +09:00 |
|
Kyle Chang
|
214ed43b81
|
Check if SongSelect is current screen before playing selected song
|
2018-10-30 23:47:54 -04:00 |
|
Dean Herbert
|
5eaf80ab76
|
Add missing newline
|
2018-10-31 12:07:06 +09:00 |
|
Dean Herbert
|
b28c0cd128
|
Merge branch 'master' into editor-mask-placement
|
2018-10-31 06:46:48 +09:00 |
|
Dean Herbert
|
5f5e30c378
|
Merge branch 'master' into mask-separation
|
2018-10-31 05:59:07 +09:00 |
|
Dean Herbert
|
6f1ef3243d
|
Proportionally adjust width in line with change
|
2018-10-31 02:56:25 +09:00 |
|
Dean Herbert
|
4502fa39e9
|
Merge remote-tracking branch 'upstream/master' into reduce-handle-height
|
2018-10-31 02:55:38 +09:00 |
|
Paul Teng
|
4bc9161cd1
|
Leave bigger gap if replaying
|
2018-10-30 08:32:12 -04:00 |
|
smoogipoo
|
5712a52817
|
Merge remote-tracking branch 'origin/master' into mask-separation
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-30 16:46:13 +09:00 |
|
smoogipoo
|
619a0dfd59
|
Merge branch 'separate-slider-body' into editor-mask-placement
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-29 15:24:15 +09:00 |
|
Kyle Chang
|
c7e950af7f
|
Remove EditSelected in favor in inlining beatmapNoDebounce in Edit
|
2018-10-29 00:04:51 -04:00 |
|
Kyle Chang
|
886dd0f0d4
|
Remove unneeded using directive
|
2018-10-28 13:21:12 -04:00 |
|
Kyle Chang
|
2b736c3cd6
|
Make beatmap edit button reload beatmap without mods
|
2018-10-28 13:04:45 -04:00 |
|
Kyle Chang
|
f8a8c7cb6b
|
Stop transferring track when editing
|
2018-10-28 12:43:19 -04:00 |
|
HoLLy
|
cf3b4447eb
|
Fade only textContainer instead of entire MetadataSection
|
2018-10-26 13:35:51 +02:00 |
|
smoogipoo
|
8703db5cc1
|
Rename HitObjectMask -> SelectionMask
|
2018-10-26 13:31:23 +09:00 |
|
HoLLy
|
88aca46500
|
Fade MetadataSection back in if non-null Text is set
|
2018-10-24 18:53:22 +02:00 |
|
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 |
|