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

13236 Commits

Author SHA1 Message Date
smoogipoo 0695615c6a Remove MusicController from compose timeline testcase 2018-06-17 19:01:14 +09:00
smoogipoo 6c100caba7 Use existing instance of beatmap rather than adding more resources 2018-06-17 19:00:58 +09:00
smoogipoo 0a99d21938 Use the passed-in ruleset 2018-06-17 18:01:28 +09:00
smoogipoo 4575319102 Privatise the proxied content 2018-06-17 17:56:46 +09:00
smoogipoo 99ef44eca2 Merge remote-tracking branch 'origin/master' into fix-taiko-proxies 2018-06-17 17:54:50 +09:00
smoogipoo 4eda017fa5 Fix CI error 2018-06-17 17:54:05 +09:00
HoutarouOreki faff7feef1 Remove unnecessary white space change 2018-06-15 15:03:09 +02:00
HoutarouOreki 6938adc148 Unify join time text's visual format with the web 2018-06-15 15:00:41 +02:00
HoutarouOreki 38feb7651c Set text at updateTime 2018-06-15 14:34:01 +02:00
HoutarouOreki d122547c1e DrawableJoinDate handles "Here since the beginning" text 2018-06-15 14:28:49 +02:00
HoutarouOreki f0fbc04d92 Adjust formats to be EN-UK 2018-06-15 14:11:21 +02:00
Dean Herbert 57011ff13b
Merge branch 'master' into mania-playfield-inversions 2018-06-15 18:33:40 +09:00
Dean Herbert 719056ca4a
Merge branch 'master' into mania-keymod-optimisation 2018-06-15 18:29:27 +09:00
Dean Herbert f9a7e761e4
Merge branch 'master' into more-diffcalc-attributes 2018-06-15 18:29:20 +09:00
Dean Herbert cdc88a6c48
Merge pull request #2802 from smoogipoo/diffcalc-rework 
Rework difficulty calculators to better support mods and attributes
 2018-06-15 18:22:43 +09:00
Dean Herbert a6437c005c
Merge branch 'master' into diffcalc-rework 2018-06-15 18:02:18 +09:00
Dean Herbert 9374415307
Merge pull request #2775 from smoogipoo/fix-taiko-hitexplosions 
Make sure taiko hitexplosions expire and get removed
 2018-06-15 18:00:47 +09:00
Dean Herbert 30f7837b03
Merge branch 'master' into fix-taiko-hitexplosions 2018-06-15 17:52:53 +09:00
Dean Herbert eac5db5dbc
Merge pull request #2812 from peppy/droplets-should-bounce 
Fix droplets not bouncing off catcher's plate immediately
 2018-06-15 17:52:28 +09:00
Dan Balasescu 0ba80fad60
Merge branch 'master' into droplets-should-bounce 2018-06-15 17:34:54 +09:00
Dan Balasescu d7353135de
Merge pull request #2810 from peppy/remove-migrate-exception 
Remove custom migration exception
 2018-06-15 17:34:46 +09:00
Dean Herbert 5d105cd08d Avoid errors being logged when importing beatmaps while logged out 2018-06-15 17:23:03 +09:00
Dan Balasescu 234ed04cdd
Merge branch 'master' into remove-migrate-exception 2018-06-15 17:22:34 +09:00
Dan Balasescu ee88444be5
Merge pull request #2813 from peppy/fix-music-controller-drag 
Fix music controller draggability
 2018-06-15 17:22:29 +09:00
Dean Herbert db9141a6cf
Merge branch 'master' into fix-music-controller-drag 2018-06-15 17:08:01 +09:00
Dan Balasescu 87d69b93a6
Merge pull request #2792 from peppy/fix-volume-pixellation 
Fix pixellation of volume meter progress bars
 2018-06-15 17:07:50 +09:00
Dan Balasescu 40daa87f22
Merge branch 'master' into fix-music-controller-drag 2018-06-15 17:07:25 +09:00
Dan Balasescu aaf3ef240e
Remove easily-confused comment 2018-06-15 17:07:07 +09:00
Dean Herbert 8b5a9c3236
Merge branch 'master' into fix-volume-pixellation 2018-06-15 16:45:15 +09:00
Dean Herbert e8fcc01ca4
Merge pull request #2807 from smoogipoo/mania-conversion-fixes 
Fix a few osu!mania beatmap conversion edge cases
 2018-06-15 16:45:10 +09:00
Dean Herbert f7b2da852f
Merge branch 'master' into mania-conversion-fixes 2018-06-15 16:33:46 +09:00
Dean Herbert a2950b1d80 Fix incorrect comment 2018-06-15 16:12:18 +09:00
Dean Herbert 1c27ef644a Fix music controller drag activating from anywhere on the screen 2018-06-15 16:12:11 +09:00
Dean Herbert 149d94116b Fix droplets not bouncing off catcher's plate immediately 2018-06-15 15:44:47 +09:00
Dean Herbert 2ff7b4cdcf
Merge branch 'master' into catch-droplet-fix 2018-06-15 14:34:01 +09:00
Dean Herbert 3fcaf52378
Merge pull request #2806 from smoogipoo/conversion-test-improvements 
Extend the testability of beatmap conversions
 2018-06-15 14:33:46 +09:00
Dean Herbert 036c57833b
Merge branch 'master' into conversion-test-improvements 2018-06-15 14:26:37 +09:00
Dean Herbert 2819a283f7
Merge pull request #2811 from Joehuu/remove-from-prefix 
Remove "from" prefix from sources on direct panels
 2018-06-15 14:26:30 +09:00
Dean Herbert e2a4d6c15f
Merge branch 'master' into remove-from-prefix 2018-06-15 14:19:36 +09:00
Joehu 069d939e29 Remove "from" prefix from sources on direct panels 2018-06-14 21:53:01 -07:00
Dan Balasescu 98cafa106f
Merge branch 'master' into fix-volume-pixellation 2018-06-15 13:44:18 +09:00
Dan Balasescu dea5143028
Merge pull request #2801 from peppy/fix-juice-explosions 
Fix combos ending with JuiceStreams never leaving the catcher's plate
 2018-06-15 13:43:03 +09:00
Dean Herbert 4a19f22b3d Remove custom migration exception 
This was hiding the true error message from ever hitting logs.
Made to help disagnose #2711.
 2018-06-15 13:38:42 +09:00
smoogipoo 9709a40c54 Fix conversion test failing 2018-06-14 21:46:47 +09:00
smoogipoo b63e9f29d4 Merge branch 'conversion-test-improvements' into catch-droplet-fix 2018-06-14 21:38:16 +09:00
Dean Herbert d259b31893 Fix empty line 2018-06-14 21:38:08 +09:00
Dean Herbert cb73f215ac Add check for player screens too 2018-06-14 21:38:08 +09:00
Dean Herbert caeddc861a Add test for WorkingBeatmap leakage 2018-06-14 21:38:08 +09:00
Dean Herbert b97c415c50 Fix memory leak due to incorrect binding 2018-06-14 21:38:08 +09:00
smoogipoo e840083ab4 Oops fix incorrectly changed file 2018-06-14 21:38:08 +09:00