RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,786 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

385 Commits

Author SHA1 Message Date
Dean Herbert f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
Dean Herbert de47e0a8e8 Merge remote-tracking branch 'upstream/master' into screen-title-class 2019-03-29 14:01:08 +09:00
Dean Herbert 2f5668f4e7 Fix remaining framework changes 2019-03-29 00:29:14 +09:00
Dean Herbert de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert 9a6576c0a1 Merge remote-tracking branch 'upstream/master' into multi-background-stack 2019-03-25 12:40:31 +09:00
Dean Herbert 9a11a08acc Update textbox usages 2019-03-23 02:00:27 +09:00
jorolf 7873022a8b Merge branch 'master' of git://github.com/ppy/osu into screen-title-class 2019-03-21 22:18:59 +01:00
jorolf 454c82c49e Don't go outside of the container bounds 2019-03-21 22:18:45 +01:00
Dean Herbert acbcca4462
Merge branch 'master' into multi-background-stack 2019-03-20 19:11:27 +09:00
Dean Herbert baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert 392a0a1d74
Merge branch 'master' into update-framework 2019-03-18 11:34:59 +09:00
Dean Herbert c496f6e56b Fix usages of OnLoadComplete 2019-03-17 13:44:20 +09:00
Dean Herbert f0114d776d Use interface to access API 
Allows for better testability.
 2019-03-13 12:58:18 +09:00
jorolf f91e4a1fdd make ScreenTitle abstract and properties protected 2019-03-11 19:10:37 +01:00
jorolf f3ab5070b9 apply suggestions 2019-03-11 18:37:36 +01:00
David Zhao 63b9fa58ef Cleanup 2019-03-11 19:52:28 +09:00
David Zhao 6a1e600099 Create new OsuScreenStack for use in Multiplayer 2019-03-11 19:48:07 +09:00
David Zhao aeae6143c1 Remove unnecessary variable 2019-03-11 17:47:03 +09:00
David Zhao 0b64af5e02 Put multiplayer background inside a parallax container 2019-03-11 16:51:43 +09:00
David Zhao 0d95511222
Merge branch 'master' into multi-background-stack 2019-03-11 11:19:08 +09:00
David Zhao 2df57c3a29 Give Multiplayer its own background stack 2019-03-11 11:08:04 +09:00
Joehu 0fc6fa7245 Fix file naming on ParticipantCountDisplay 2019-03-09 20:29:56 -08:00
jorolf af1c54d995 add ScreenTitle class 2019-03-08 23:44:01 +01:00
Jamie Taylor c34e110a2c
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel 2019-03-07 17:01:24 +09:00
Jamie Taylor 50c1b3a576
Move room resetting logic from MatchSubScreen to LoungeSubScreen 2019-03-07 16:49:48 +09:00
Jamie Taylor ee076bbbe3
Fix chat channel ids not being updated on room creation 2019-03-07 15:35:57 +09:00
Jamie Taylor 6e5ea78ca2
Fix some nullref crashes when escaping out of new room creation 2019-03-06 20:03:37 +09:00
Jamie Taylor 5de6e29294
Reset currentRoom state when cancelling room creation 2019-03-06 20:03:37 +09:00
David Zhao 89987210c3 Merge remote-tracking branch 'upstream/master' into LobbyList 2019-03-05 18:59:38 +09:00
David Zhao 34b2553b95 Remove redundant boolean 2019-03-05 18:59:25 +09:00
Dan Balasescu fd147dae21
Merge branch 'master' into fix-disabled-set-crash 2019-03-05 17:25:13 +09:00
David Zhao 166a8c8bbb Add back fallback behavior for match creation 2019-03-05 16:41:59 +09:00
David Zhao 11e353c152 Use local class instead of having a separate file 2019-03-05 15:55:37 +09:00
David Zhao aecbc31ffa Use BeatmapSetCoverType.List for lobby listing 2019-03-05 12:08:14 +09:00
Dan Balasescu a37445a938
Merge branch 'master' into better-mp-songselect-deletion-handling 2019-02-28 17:35:08 +09:00
smoogipoo 921346d303 Rename a few more members 2019-02-28 17:27:28 +09:00
Jamie Taylor 4c8aa65200
private + renaming 2019-02-28 17:02:45 +09:00
Dan Balasescu 3a1066ff02
Merge branch 'master' into toquantity-1 2019-02-28 15:57:51 +09:00
Jamie Taylor cf2feec7df
Fix multiplayer enabled mods check 2019-02-28 15:02:22 +09:00
Joehu 2241e1af9d Use ToQuantity for words with number prefixes 2019-02-27 21:55:45 -08:00
Dean Herbert 0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert 42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert 26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Jamie Taylor c59d84fd21
Add sanity check to prevent TimeshiftPlayer from starting with incorrect beatmap/ruleset/mods 2019-02-27 16:21:14 +09:00
Jamie Taylor 7c2ffb1826
Fix MatchSongSelect not handling beatmapset deletions 2019-02-27 14:34:39 +09:00
Dean Herbert 80737b9ef8 Remove "silent" parameter; consolidate import logic 2019-02-25 18:24:06 +09:00
Dean Herbert 367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert 3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert 3fe4b8fd1c Update variable names 
Also cleans up some weird code
 2019-02-22 17:51:39 +09:00
Dean Herbert 452caabd40
Apply suggestions from code review 
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
 2019-02-22 17:06:49 +09:00