Commit Graph

6259 Commits

Author SHA1 Message Date
6a28e8c696 Add settings to lounge 2018-12-03 18:30:26 +09:00
53a54f8634 Renamespace room settings 2018-12-03 17:54:10 +09:00
20b843e63c Add create tab 2018-12-03 17:50:56 +09:00
51c16867d5 Remove type conversion from LoungeTab to RoomAvailability 2018-12-03 17:50:39 +09:00
03e416cda9 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-12-01 10:03:31 +09:00
b1c5b43767 Fix post-rebase errors 2018-11-30 18:46:47 +09:00
10ed09521c Add leaderboard display for local scores 2018-11-30 18:40:53 +09:00
795933d1a1 CreateScoreInfo -> CreateScore 2018-11-30 18:32:08 +09:00
a6b0e35b2d Fix post-rebase issues 2018-11-30 18:31:54 +09:00
a8ad7d4670 Add silent import parameter 2018-11-30 18:27:13 +09:00
d07a724970 Only allow replay screen changes in menu + songselect 2018-11-30 18:25:54 +09:00
4c1abdcd8c Save score upon map completion 2018-11-30 18:25:14 +09:00
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
aa7a665317 Merge remote-tracking branch 'upstream/master' into scoredatabase 2018-11-30 17:20:23 +09:00
3727955911 Refactors/renames 2018-11-30 16:35:45 +09:00
bc3fcb87b7 Use input events rather than scene graph traversals 2018-11-30 15:47:55 +09:00
831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
e83f6707bf Merge branch 'master' into editor-keyboard-seek 2018-11-30 15:17:06 +09:00
271dcded3c Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
ab621bd873 Toggle pause in editor with spacebar 2018-11-30 14:58:09 +09:00
0ee5a5bdb4 Add support for keyboard seeking in the editor 2018-11-30 14:57:25 +09:00
5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
a88b69ec43 Notify of existing imports 2018-11-28 20:19:35 +09:00
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
5b409a5ae5 Fix missed renames 2018-11-28 17:27:22 +09:00
ed02847752 Beatmap -> BeatmapInfo + add foreign key 2018-11-28 17:26:39 +09:00
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
09b79d736b Remove unused usings 2018-11-28 16:33:42 +09:00
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
da79292250 Merge branch 'master' into fix_idle_tracker 2018-11-26 17:41:45 +09:00
32b36f2883 Use IBindable<> 2018-11-26 17:07:30 +09:00
626048038c Handle the null case 2018-11-26 16:50:41 +09:00
8d65d49126 Use bindable flow for checking idle time 2018-11-26 16:32:59 +09:00
dea387c31e Fix post-merge issues 2018-11-26 16:29:56 +09:00
dcf740e5d3 Merge remote-tracking branch 'origin/master' into multiplayer-room-settings 2018-11-26 16:27:22 +09:00
f9f300b215 Fix drag breaking if scrolling while dragging 2018-11-26 16:08:56 +09:00
fe5b043a59 Merge branch 'master' into fix_idle_tracker 2018-11-26 15:24:44 +09:00
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
0bc4a01a6b Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-24 20:03:25 +09:00
b446a73c0c Add brackets
Co-Authored-By: peppy <pe@ppy.sh>
2018-11-23 10:06:06 +09:00
1b76e2faf5 Merge branch 'master' into fix-editor-precise-scroll 2018-11-23 09:57:35 +09:00
10047e6815 Adjust tick-based wheel control to be more correct 2018-11-22 20:13:40 +09:00
a48c26d999 Fix precision scroll events being handled incorrectly by editor 2018-11-22 19:40:44 +09:00
6cd69b794d Fix leaderboard accessing drawables in a possibly invalid state 2018-11-22 19:08:46 +09:00
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
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
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
55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
970ea928ae Fix hold for menu button occasionally disappearing 2018-11-19 12:06:47 +09:00