1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-25 03:22:57 +08:00
Commit Graph

10251 Commits

Author SHA1 Message Date
Dean Herbert
fcb197f7b6 Simplify logic 2018-01-09 22:21:15 +09:00
ANDY840119-PC\andy840119
4060583b10 Merge branch 'master' of https://github.com/ppy/osu
# Conflicts:
#	osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs
2018-01-09 22:09:25 +09:00
Dan Balasescu
9c602f8770
Merge branch 'master' into drawable-fruit-improvements 2018-01-09 22:06:16 +09:00
Dean Herbert
2518d16a77 Denote unused variable 2018-01-09 21:34:31 +09:00
Dean Herbert
c2fadcfc1f
Merge branch 'master' into background-blur 2018-01-09 21:20:05 +09:00
Dean Herbert
1c9e9cb8af
Merge branch 'master' into expand-social-tab 2018-01-09 21:08:26 +09:00
Dean Herbert
51513b45eb
Merge branch 'master' into fix-dotsettings-file 2018-01-09 14:32:40 +09:00
Dan Balasescu
96226e1f27
Merge pull request #1870 from peppy/mod-per-file
Move mod implementations to individual files
2018-01-09 14:30:51 +09:00
Dean Herbert
b8bb0a52e3 Move mod implementations to individual files 2018-01-09 14:08:18 +09:00
Dean Herbert
bb57d33239
Merge pull request #1819 from LittleEndu/fix-randomizer
Don't allow randomizer to select invisible maps
2018-01-09 12:52:25 +09:00
Dean Herbert
722eb2515f Improve variable names 2018-01-09 12:44:52 +09:00
Dean Herbert
a3f05ca9ec Avoid unnecessary use of linq 2018-01-09 12:43:10 +09:00
Dean Herbert
b90b1e326e
Merge branch 'master' into fix-randomizer 2018-01-09 12:00:21 +09:00
Dean Herbert
cab702cc94
Merge pull request #1854 from james58899/fix-storyboard-variables
Fix storyboard variable parsing
2018-01-09 11:59:53 +09:00
Dean Herbert
4c0259a040
Merge branch 'master' into fix-storyboard-variables 2018-01-09 11:50:03 +09:00
Dean Herbert
e7f9c9f22b
Merge pull request #1869 from Aergwyn/ingame-keybinds
Add skip cutscene as "in game" keybinding
2018-01-09 11:49:32 +09:00
Aergwyn
f6c168be27 add skip cutscene as "in game" keybinding 2018-01-08 18:22:43 +01:00
ANDY840119-PC\andy840119
d5b436d91b use public List<Column> Columns => listColumnStages.SelectMany(x => x.Columns).ToList(); instead 2018-01-08 23:11:20 +09:00
Dean Herbert
9eb4eb4b36
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-08 22:51:16 +09:00
為什麼
0426327149
Merge branch 'master' into master 2018-01-08 21:46:20 +09:00
Dean Herbert
805e91c625
Merge pull request #1858 from Aergwyn/fix-leaderboard-requests
Fix Leaderboard loading scores multiple times
2018-01-08 20:30:34 +09:00
Dean Herbert
22665337a5
Merge branch 'master' into fix-leaderboard-requests 2018-01-08 20:21:18 +09:00
Dean Herbert
8fe319286f
Merge branch 'master' into fix-dotsettings-file 2018-01-08 20:18:24 +09:00
smoogipoo
c4d1922c8b Add scrolling algorithm to global settings 2018-01-08 11:34:37 +09:00
Dean Herbert
bf98c16595
Merge pull request #1865 from Aergwyn/improve-hidden
Minor standard hidden improvements
2018-01-08 09:35:10 +09:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Aergwyn
54c0197eb0 remove early fadeout of sliderball on hidden
it shouldn't have been done because it makes fast sliders unplayable as they never appear in the first place, ooops
2018-01-07 09:08:33 +01:00
Aergwyn
006b63eb42 remove unnecessary change of spinner end sequence
it wasn't really visible anyways *shrug*
2018-01-07 09:05:36 +01:00
為什麼
ec38669145
Merge branch 'master' into master 2018-01-07 13:58:26 +09:00
為什麼
0acceba2fe
Merge branch 'master' into master 2018-01-07 13:57:51 +09:00
smoogipoo
4ab3b0d76b Implement local scrolling hit object container 2018-01-07 13:24:09 +09:00
smoogipoo
117ab8a26d Split out scrolling algorithm 2018-01-07 13:23:16 +09:00
Dean Herbert
f660eff4d4 FIx incorrect licence header template 2018-01-07 12:02:42 +09:00
smoogipoo
2d345b2f80 Fix mania hold note tick positioning 2018-01-07 11:43:31 +09:00
Dean Herbert
8a4ab6c03d
Merge pull request #1862 from FreezyLemon/fix-mania-hitobject-test
Fix TestCaseManiaHitObjects exception on load
2018-01-07 11:37:45 +09:00
smoogipoo
98fd4f6ff2 Fix up precision + sizing issues 2018-01-07 11:33:59 +09:00
FreezyLemon
47f5b23dcf fix child size == 0 exception 2018-01-07 00:53:44 +01:00
Aergwyn
d9866a2052 fix hover effects on social panels 2018-01-06 11:27:17 +01:00
Aergwyn
a61666d2a7 update licence headers 2018-01-06 10:54:53 +01:00
Aergwyn
e6b581e259 Merge branch 'master' into expand-social-tab 2018-01-06 10:48:27 +01:00
Aergwyn
82dcb033de update submodules 2018-01-06 10:47:56 +01:00
Aergwyn
57b44b8c29 fix new panels appearing too soon 2018-01-06 10:40:18 +01:00
ANDY840119-PC\andy840119
6437efb54f update framework again.... 2018-01-06 11:38:22 +09:00
ANDY840119-PC\andy840119
6585610dfe update resource branch 2018-01-06 11:28:57 +09:00
ANDY840119-PC\andy840119
ca7cd40fba 1. update from ppy master
2. update header
2018-01-06 11:21:10 +09:00
為什麼
98929952e3
Merge branch 'master' into master 2018-01-06 11:17:15 +09:00
ANDY840119-PC\andy840119
50aaf571fb miss 2018-01-06 11:08:49 +09:00
ANDY840119-PC\andy840119
a55ac899a8 fix Empty argument list is redundant 2018-01-06 11:08:04 +09:00
ANDY840119-PC\andy840119
232381533c update framework again 2018-01-06 10:43:22 +09:00
ANDY840119-PC\andy840119
065ebe896b Merge branch 'master' of https://github.com/andy840119/osu 2018-01-06 10:35:21 +09:00