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

23424 Commits

Author SHA1 Message Date
Huo Yaoyuan d385862267 Add dotnet format check. 2019-11-11 20:32:32 +08:00
Huo Yaoyuan e9b8cbb516 Apply other styles. 2019-11-11 20:27:04 +08:00
Huo Yaoyuan d8482448dc Save iOS projects with BOM to avoid VS continuously changing them. 2019-11-11 20:13:13 +08:00
Huo Yaoyuan ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Huo Yaoyuan 3d1c31f2ae Copy configs from framework repo. 2019-11-11 20:13:12 +08:00
Dean Herbert 28afc9e162
Remove redundant package references in iOS props (#6808) 
Remove redundant package references in iOS props
 2019-11-11 20:30:53 +09:00
Huo Yaoyuan 9c1a9c29e4 Remove redundant package references in iOS props. 2019-11-11 19:00:19 +08:00
Dean Herbert 1155f0b0de
Bump Newtonsoft.Json from 12.0.2 to 12.0.3 (#6806) 
Bump Newtonsoft.Json from 12.0.2 to 12.0.3

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2019-11-11 18:58:47 +09:00
dependabot-preview[bot] a345fd8a86
Bump Newtonsoft.Json from 12.0.2 to 12.0.3 
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 12.0.2 to 12.0.3.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/12.0.2...12.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 09:26:56 +00:00
Dan Balasescu 97075c49e9
Merge pull request #6671 from huoyaoyuan/infrastructure 
Port merged tooling updates from framework
 2019-11-11 16:16:56 +09:00
Dan Balasescu f27398e899
Merge branch 'master' into infrastructure 2019-11-11 16:02:05 +09:00
Dean Herbert 9a88b901eb
Merge pull request #6801 from smoogipoo/edit-disable-input 
Disable ruleset input in the editor
 2019-11-11 15:34:07 +09:00
smoogipoo e924a5d51e Disable ruleset input in the editor 2019-11-11 13:04:43 +09:00
Dan Balasescu cceb982f57
Merge pull request #6769 from peppy/fix-broken-tourney-tests 
Fix incorrect DI usage in some tournament screen tests
 2019-11-11 12:46:02 +09:00
Dan Balasescu 0396da2170
Merge branch 'master' into fix-broken-tourney-tests 2019-11-11 11:51:20 +09:00
Dean Herbert 990a82cd06 Update readme 2019-11-11 11:32:06 +09:00
Dean Herbert 93f1c3c152 Update rider configurations 2019-11-11 11:31:55 +09:00
Dean Herbert 5e70e1e53f Update .gitignore 2019-11-11 11:31:42 +09:00
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 c280f1ab08 Fix incorrect DI usage in some tournament screen tests 2019-11-08 19:35:55 +09: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