h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 10:27:35 +08:00
Code Issues Releases Wiki Activity
15,824 Commits 3 Branches 654 Tags 364 MiB
2d19436456
Commit Graph

15824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
a54951b72d
Merge pull request #3889 from peppy/add-alt-select-support 
Add ability to select chat tabs with alt-1-9
 2018-12-21 15:02:52 +09:00
smoogipoo
fe6c369e07 Fix incorrect channel 2018-12-21 14:37:05 +09:00
Dean Herbert
6bca344e56
Merge branch 'master' into add-alt-select-support 2018-12-21 14:32:24 +09:00
smoogipoo
1df4826a1d Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-21 14:14:17 +09:00
Dean Herbert
1e39a4e09a
Merge pull request #3892 from smoogipoo/standalone-chat-fixes 
Various standalone chat display fixes
 2018-12-21 14:12:37 +09:00
smoogipoo
6a9b0a0ba3 Fix initial messages not being received 2018-12-21 14:02:36 +09:00
smoogipoo
6b6629e9fd Fix not posting to the correct channel 2018-12-21 14:02:29 +09:00
smoogipoo
fa2bc16140 Remove participants, add match chat 2018-12-21 14:01:11 +09:00
Dean Herbert
59452800ed Update framework 2018-12-21 13:33:06 +09:00
smoogipoo
14879acd83 Fix possible nullref 2018-12-21 13:26:50 +09:00
smoogipoo
e27b7b0c0d Cleanup 2018-12-21 13:06:11 +09:00
smoogipoo
5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip 
# Conflicts:
#	osu.Game.Tests/Visual/TestCasePollingComponent.cs
#	osu.Game/Online/API/APIRequest.cs
#	osu.Game/osu.Game.csproj
 2018-12-21 12:51:31 +09:00
Dan Balasescu
e8a03a94d1
Merge pull request #3887 from peppy/standalone-chat 
Add a stand-alone chat display component
 2018-12-21 12:47:01 +09:00
Dan Balasescu
3d4edd9121
Merge branch 'master' into standalone-chat 2018-12-21 12:31:33 +09:00
Dan Balasescu
a18b28388d
Merge pull request #3890 from peppy/netcoreapp22-target 
Fix targeting netcoreapp2.1 in many places
 2018-12-21 12:20:22 +09:00
Dean Herbert
e26958f901 Fix targeting netcoreapp2.1 in many places 2018-12-21 10:24:32 +09:00
Dean Herbert
aaac45ab8c Add ability to select chat tabs with alt-1-9 2018-12-20 21:50:47 +09:00
smoogipoo
822225577b Add joining/parting room requests 2018-12-20 20:58:34 +09:00
Dean Herbert
f195d6cb23
Merge pull request #3180 from WebFreak001/mod-fl2 
Add "Blinds" mod
 2018-12-20 20:25:26 +09:00
smoogipoo
9031896484 Fix create room button showing in song select 2018-12-20 20:09:17 +09:00
smoogipoo
104a3c8ffc Add click to avatar 2018-12-20 20:08:22 +09:00
smoogipoo
6a76e335c7 Linkify everything 2018-12-20 20:03:45 +09:00
smoogipoo
f8d25a1b6c Add method to add arbitrary drawables as links 2018-12-20 20:01:58 +09:00
Dean Herbert
ce414ed7d0
Merge branch 'master' into mod-fl2 2018-12-20 19:56:25 +09:00
Dean Herbert
abad9b8721
Merge pull request #3888 from plankp/patch-1 
Update README about SDK version
 2018-12-20 19:50:52 +09:00
Paul Teng
36f57a7abb
Update README.md 2018-12-20 05:49:05 -05:00
Dean Herbert
ef9d93ff6b Remove mod multipliers 
We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.
 2018-12-20 19:46:39 +09:00
Dean Herbert
d3368df94d Simplify changes to RulesetContainer 2018-12-20 19:35:32 +09:00
Dean Herbert
bc8b0485d8 Add textbox/posting support 2018-12-20 18:49:03 +09:00
smoogipoo
deaf4ab4a1 Cleanup 2018-12-20 18:21:55 +09:00
smoogipoo
8db3ac0a9f Make user links clickable 2018-12-20 18:04:39 +09:00
smoogipoo
1701af61d6 Add host avatar+username to match screen 2018-12-20 18:04:22 +09:00
Dean Herbert
65447d6f4a Add optional parameters to target messages at a specific channel 2018-12-20 17:01:08 +09:00
Dean Herbert
3a13899ce1 Add stand-alone chat component 2018-12-20 16:54:49 +09:00
Dean Herbert
9177a45587
Merge branch 'master' into mod-fl2 2018-12-20 15:50:18 +09:00
Dean Herbert
bb850da200 Remove skinnability for now 
Not sure if we want this going forward.
 2018-12-20 15:48:45 +09:00
Dean Herbert
07f8b8e334 Update resources 2018-12-20 15:47:26 +09:00
smoogipoo
2e28f378de Move beatmap + mod info to header 2018-12-20 15:17:33 +09:00
smoogipoo
72016a416b Deselect match if ended 2018-12-20 15:17:08 +09:00
smoogipoo
03546c9d0d Implement primary filter routes 2018-12-20 15:16:46 +09:00
Dean Herbert
e15ff98915
Merge branch 'master' into improve-text-search 2018-12-19 20:45:00 +09:00
Dean Herbert
997a0ece55
Merge pull request #3872 from peppy/simplify-api-requests 
Remove all retry logic and simplify overall handling of API requests
 2018-12-19 20:33:16 +09:00
Dean Herbert
8d458b0b6e Update framework version 2018-12-19 19:45:50 +09:00
smoogipoo
36f6b4fc3f Hook up participated filter 
Very early stages, implementation will change.
 2018-12-19 18:02:05 +09:00
smoogipoo
c86d9533bd Add PollImmediately() 2018-12-19 18:01:21 +09:00
smoogipoo
673082445e Rework filtering 2018-12-19 16:56:51 +09:00
smoogipoo
c544a5b9f0 Add end date to the drawable room too 2018-12-19 15:20:23 +09:00
smoogipoo
9d8170efa0 Only go into failing state if previously online 2018-12-19 14:32:43 +09:00
Dan Balasescu
02b95d3175
Merge branch 'master' into simplify-api-requests 2018-12-19 14:17:48 +09:00
Dean Herbert
4545661347
Merge pull request #3875 from UselessToucan/do_not_delete_replay_on_import 
Do not delete file on import failure
 2018-12-19 14:12:04 +09:00