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

7588 Commits

Author SHA1 Message Date
TocoToucan e6d7136a92 Fix HoldToQuit appearance and set HoldToQuitButton.ExitAction 2018-04-21 20:21:09 +03:00
TocoToucan 21454d1f10 Revert "Add 'End replay' button" 
This reverts commit c34ef42f00.
 2018-04-21 19:27:17 +03:00
TocoToucan 3b621db460 Implement CircularProgress filling 2018-04-21 19:25:21 +03:00
TocoToucan 633c775306 Initial HoldToQuit commit 2018-04-21 18:24:31 +03:00
TocoToucan c34ef42f00 Add 'End replay' button 2018-04-20 12:50:19 +03:00
Dean Herbert a64ed142f0 Use a more suiting icon for discord for now 2018-04-20 13:51:30 +09:00
Dean Herbert 8649ddc68b Make forum posts a web link 2018-04-20 13:01:23 +09:00
Dean Herbert fe644c6909
Merge branch 'master' into profile_web_changes 2018-04-20 12:51:30 +09:00
tgi74000 64709da546 Update profile header to osu-web changes 2018-04-19 14:46:42 +02:00
Dean Herbert 0356e5e6bf Remove unused property 2018-04-19 21:00:22 +09:00
Dean Herbert f7ca6267b1 Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability 2018-04-19 20:53:06 +09:00
Dean Herbert e395a47112 Changes to naming and text 2018-04-18 19:47:13 +09:00
Dean Herbert bd834dd487 Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling 2018-04-18 19:46:59 +09:00
Dean Herbert 1be2571d33 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:08:45 +09:00
smoogipoo d5ce618d9b Update with framework changes 2018-04-18 15:12:48 +09:00
smoogipoo ffbe6f2e37 Merge remote-tracking branch 'origin/master' into fix-rank-status 
# Conflicts:
#	osu.Game/Beatmaps/RankStatus.cs
#	osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
#	osu.Game/Overlays/Direct/FilterControl.cs
#	osu.Game/Overlays/DirectOverlay.cs
 2018-04-18 14:16:58 +09:00
Dan Balasescu 33f4f57ee3
Merge branch 'master' into replay_mods 2018-04-18 14:00:32 +09:00
Dean Herbert 64f47daff4
Merge branch 'master' into fix-leaderboard-nullref 2018-04-18 12:05:13 +09:00
Dean Herbert 188c8ce1e7 Remove unnecessary score nulling (already happens in PlaceholderState_Set) 2018-04-18 11:58:55 +09:00
Dean Herbert a27f39a555 Add documentation explaining intertwining logic 2018-04-18 11:57:06 +09:00
Dean Herbert a827fb51bc Simplify child definition 2018-04-18 11:42:55 +09:00
jorolf ddd59382e2 Merge branch 'profile-badges' of github.com:Jorolf/osu into profile-badges 2018-04-16 19:37:52 +02:00
jorolf de9f15f620 add new test case and fix rotation not working 2018-04-16 19:22:11 +02:00
jorolf 046412f962 make hover lost transition instant (similar to hover transition) 2018-04-16 18:52:09 +02:00
jorolf 2a18b4c3f8 add a DRAWABLE_BADGE_SIZE const and center badges 2018-04-16 18:51:35 +02:00
jorolf af0c49cca8 badge_size is the actual badge size now 
also fixes rotateBadges bug when hover is lost
 2018-04-16 18:27:18 +02:00
tgi74000 1feba556eb CI: unused directive 2018-04-16 14:25:43 +02:00
tgi74000 9b36cf2066 Review changes 2018-04-16 14:14:40 +02:00
smoogipoo 9af6ef1864 Remove extra unneded safety 2018-04-16 17:48:49 +09:00
smoogipoo b9220a1e29 Fix leaderboard placeholder sometimes disappearing indefinitely 2018-04-16 17:39:55 +09:00
smoogipoo 1b9d54a6ad Fix various data races causing crashes or incorrect leaderboard states 2018-04-16 17:39:03 +09:00
jorolf af755b4a90
Merge branch 'master' into profile-badges 2018-04-15 23:50:52 +02:00
jorolf 6ca714d93b add badges to ProfileHeader 2018-04-15 23:49:45 +02:00
tgi74000 3454ec1ca3 Set Value instead of BindTo 2018-04-15 20:23:57 +02:00
tgi74000 4c08aa3dfb Merge remote-tracking branch 'upstream/master' 2018-04-15 20:22:16 +02:00
Dean Herbert 9eb04a5fc8
Merge branch 'master' into fix-button-kb-input 2018-04-16 02:48:51 +09:00
Dean Herbert 2eefe722f3 Move cache to a slightly more familiar place and add comment 2018-04-16 00:38:32 +09:00
Dean Herbert 96ef564f44 Remove unused field 2018-04-16 00:25:09 +09:00
Dean Herbert c9615f837a Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot 2018-04-16 00:20:06 +09:00
Dean Herbert ae77c010e2 Merge remote-tracking branch 'upstream/master' into wave-container 2018-04-15 21:03:18 +09:00
Dean Herbert fd54ae3c87 Simplify logic 2018-04-15 16:12:42 +09:00
Dean Herbert 069d48ac14 Remove unused variable 2018-04-15 15:29:00 +09:00
TocoToucan 671de4f6c2 Resolve merge conflicts 2018-04-14 15:11:28 +03:00
FreezyLemon 3ece54e1c3 make buttons only accept input when expanded 
both other states are "inactive"/invisible so should never accept keyboard input
 2018-04-14 00:08:54 +02:00
tgi74000 73ba8e1c87 CI: remove unused directive 2018-04-13 16:10:01 +02:00
tgi74000 b23b0a445b Add support for replay mods 2018-04-13 15:41:35 +02:00
smoogipoo fe77417e03 Merge remote-tracking branch 'origin/master' into ignored_input_handler 2018-04-13 22:23:33 +09:00
Dan Balasescu 258e17566c
Merge branch 'master' into update-nunit-3.10.1 2018-04-13 22:05:26 +09:00
Dean Herbert a0f9f8d512 Update frramework again 2018-04-13 21:47:50 +09:00
smoogipoo cf65833572 Reword xmldoc 2018-04-13 21:15:08 +09:00