RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,405 Commits 3 Branches 650 Tags 350 MiB
Commit Graph

23405 Commits

Author SHA1 Message Date
Dean Herbert fd7bdc03ab Merge remote-tracking branch 'upstream/master' into infrastructure 2019-11-11 11:11:59 +09:00
Dean Herbert 9db73d33cc
Remove horizontal padding on toolbar ruleset selector (#6780) 
Remove horizontal padding on toolbar ruleset selector
 2019-11-11 10:02:30 +09:00
Dean Herbert 7d5b6226a9
Merge pull request #6752 from smoogipoo/fix-mania-compose-crash 
Fix possible crash when loading mania compose screen
 2019-11-10 17:42:27 +09:00
Dean Herbert 45e1501c02
Merge branch 'master' into infrastructure 2019-11-09 16:23:58 +09:00
Dean Herbert 86963f430f
Disallow voting for own comments (#6663) 
Disallow voting for own comments

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-11-09 16:23:36 +09:00
Dean Herbert 5c47641608
Reorder conditional 2019-11-09 16:23:22 +09:00
Joehu b675024161 Remove horizontal padding on toolbar ruleset selector 2019-11-08 20:28:24 -08:00
Dean Herbert 683916967c
Merge branch 'master' into vote-pill-fix 2019-11-09 12:15:48 +09:00
Dean Herbert 88d5749647
Merge pull request #6772 from peppy/update-framework 
Update framework
 2019-11-09 00:00:41 +09:00
Dean Herbert 2dd514012a Update framework 2019-11-08 23:28:22 +09:00
Huo Yaoyuan 6ebe02f409 Merge branch 'master' into infrastructure 2019-11-08 21:19:59 +08:00
Huo Yaoyuan a0f58ba9c4 Add missing project to iOS filter. 2019-11-08 21:17:59 +08:00
Huo Yaoyuan 9ed8b3a125 Use original dotsettings, with word IOS added to dictionary. 2019-11-08 21:15:24 +08:00
Dean Herbert c70c05c896
Less sickening parallax (#6743) 
Less sickening parallax
 2019-11-08 19:15:25 +09:00
Dean Herbert 5699f3e22b
Seek to the first hitobject when entering the editor (#6766) 
Seek to the first hitobject when entering the editor

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-11-08 19:15:08 +09:00
Dan Balasescu 1c1a49011b
Merge branch 'master' into infrastructure 2019-11-08 19:10:49 +09:00
Dean Herbert 5f122d88b9
Improve tournament screen transitions (#6767) 
Improve tournament screen transitions
 2019-11-08 19:09:36 +09:00
Dean Herbert c1ad3114d6 Merge remote-tracking branch 'upstream/master' into tournament-improve-transitions 2019-11-08 19:09:19 +09:00
Dean Herbert 7c2400ca29
Tournament highlight active screen (#6764) 
Tournament highlight active screen

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2019-11-08 19:08:18 +09:00
Dean Herbert ac0ec0d66e
Read initial beat divisor value from the beatmap (#6765) 
Read initial beat divisor value from the beatmap
 2019-11-08 19:06:25 +09:00
Dean Herbert a849bc0746 Move implementation into resetTrack for safety 2019-11-08 18:51:01 +09:00
Dan Balasescu 592368a320
Merge branch 'master' into tournament-highlight-active-screen 2019-11-08 18:28:51 +09:00
Dan Balasescu adf3aff8ec
Merge pull request #6763 from peppy/fix-tourney-button-sounds 
Fix tournament buttons playing sound effects
 2019-11-08 18:28:31 +09:00
Dean Herbert 12b855d68f Make drawing screen transition properly 2019-11-08 17:56:11 +09:00
Dean Herbert 7b8ed1ac9a Improve tournament screen transitions 2019-11-08 17:56:04 +09:00
Dan Balasescu f68013059f
Merge branch 'master' into fix-tourney-button-sounds 2019-11-08 17:47:38 +09:00
Dan Balasescu 4fc6aa940a
Merge pull request #6761 from peppy/fix-tournament-video-performance 
Fix tournament videos stuttering when changing scenes
 2019-11-08 17:46:50 +09:00
smoogipoo e904928314 Seek to first hitobject when entering editor 2019-11-08 17:42:19 +09:00
smoogipoo 36cc79f04f Softly handle invalid beat divisors instead of throwing 2019-11-08 17:28:11 +09:00
smoogipoo 998e1dfe47 Fix non-1/1 initial beat divisor control display 2019-11-08 17:23:47 +09:00
smoogipoo eb9fff96ba Read default beat divisor from beatmap 2019-11-08 17:22:58 +09:00
Dean Herbert 651a1e2ae1 Highlight selected tournament screen's button 2019-11-08 17:22:51 +09:00
Dean Herbert 380859e06e Set clock on video directly; ignore long frames 2019-11-08 17:13:45 +09:00
Dean Herbert 8bcbc93501 Fix tournament buttons playing sound effects 2019-11-08 17:00:47 +09:00
Dean Herbert 5fe764b2db Fix tournament videos stuttering when changing scenes 2019-11-08 16:19:34 +09:00
Dean Herbert 6805c029e7
Implement slider head control point snapping (#6753) 
Implement slider head control point snapping
 2019-11-07 18:48:29 +09:00
Dean Herbert b1b354c420
Advance editor clock after a snapped placement (#6754) 
Advance editor clock after a snapped placement
 2019-11-07 18:48:17 +09:00
Dean Herbert d18489f1d1
Bump Microsoft.NET.Test.Sdk from 16.3.0 to 16.4.0 (#6756) 
Bump Microsoft.NET.Test.Sdk from 16.3.0 to 16.4.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-11-07 16:04:39 +09:00
dependabot-preview[bot] f2084df0bb
Bump Microsoft.NET.Test.Sdk from 16.3.0 to 16.4.0 
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.3.0 to 16.4.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.3...v16.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 06:19:49 +00:00
Andrei Zavatski 446e2894f7 Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-11-07 08:48:35 +03:00
smoogipoo f3ddc4c00b Advance editor clock after a snapped placement 2019-11-07 14:08:02 +09:00
smoogipoo b1da81571f Implement slider head control point snapping 2019-11-07 14:00:12 +09:00
smoogipoo 1f9f03dc66 Add temporary fix for null references 2019-11-07 13:36:54 +09:00
smoogipoo 8d42e45fd3 Make holdnote notes update lazily 2019-11-07 13:23:00 +09:00
smoogipoo 8141509a71 Split hold note blueprints into separate file 2019-11-07 12:59:05 +09:00
Dean Herbert eaf2123142
Merge pull request #6749 from iiSaLMaN/fix-dummy-api-logged-in-not-correct 
Fix DummyAPIAccess.IsLoggedIn returning incorrect values
 2019-11-07 09:31:46 +09:00
Dean Herbert d400e4a5f6 Add shared constant for parallax amount 2019-11-07 09:30:50 +09:00
Andrei Zavatski 59aa9b59d6 Move login to it's own function 2019-11-06 18:32:09 +03:00
Andrei Zavatski 8395df596b Don't use online API for tests 2019-11-06 18:24:30 +03:00
iiSaLMaN 6ecea0e4c1 Fix DummyAPIAccess being potentially incorrect 2019-11-06 18:15:49 +03:00