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

13697 Commits

Author SHA1 Message Date
Dean Herbert 0d8701d0cb
Merge pull request #3124 from smoogipoo/fix-editor-lifetime 
Fix hitobjects not properly expiring if scrolling in the editor
 2018-07-28 12:43:02 +09:00
Dean Herbert ac67c2dab3
Merge branch 'master' into fix-editor-lifetime 2018-07-28 12:35:39 +09:00
ekrctb 5b18488174
Merge pull request #3126 from smoogipoo/fix-catch-nullref 
Fix possible nullref if no fruits are ever caught
 2018-07-26 23:05:03 +09:00
ekrctb 5d83d00806
Merge branch 'master' into fix-catch-nullref 2018-07-26 22:50:37 +09:00
Dan Balasescu 28844a97e8
Merge pull request #2515 from odgaard/master 
Disable MusicController's seek during gameplay
 2018-07-26 21:49:26 +09:00
smoogipoo 464333cf0b Merge remote-tracking branch 'origin/master' 2018-07-26 21:28:31 +09:00
smoogipoo 71c49de031 Fix possible nullref if no fruits are ever caught 2018-07-26 21:00:18 +09:00
smoogipoo ff2a3a6e92 Fix hitobjects not properly expiring if scrolling in the editor 2018-07-26 20:07:16 +09:00
Dan Balasescu dc6898e7e0
Merge pull request #3108 from peppy/fix-turkish-i 
Fix usage of culture local ToUpper causing incorrect display on Turkish machines
 2018-07-26 18:17:38 +09:00
Dan Balasescu ceaa23fbbb
Merge branch 'master' into fix-turkish-i 2018-07-26 18:06:58 +09:00
Dan Balasescu 8a68ec6462
Merge pull request #3116 from AlFasGD/labelled-text-box-fixes 
Apply certain fixes for labelled text box
 2018-07-25 21:34:44 +09:00
Dan Balasescu 6c290702a3
Merge branch 'master' into labelled-text-box-fixes 2018-07-25 21:21:06 +09:00
AlFasGD c4b1ba2979 Remove padding, fix corner radiuses 2018-07-25 15:14:40 +03:00
Dean Herbert 7400d4d0e9
Merge pull request #3101 from peppy/fix-always-skipping 
Fix gameplay always skipping to first hitobject time
 2018-07-25 12:40:14 +02:00
Dean Herbert ff04527c6d
Merge branch 'master' into fix-always-skipping 2018-07-25 12:30:39 +02:00
Dan Balasescu 71898754a0
Merge pull request #3086 from AlFasGD/labelled-text-box 
Add labelled text box component for the Beatmap Setup Screen
 2018-07-25 19:15:49 +09:00
smoogipoo 206e3686f2 Add back blue border 2018-07-25 18:38:50 +09:00
smoogipoo 127084ba74 Merge remote-tracking branch 'origin/master' into labelled-text-box 2018-07-25 18:35:04 +09:00
smoogipoo b60e4b0728 Cleanup 2018-07-25 18:34:47 +09:00
Dan Balasescu 53e55c2f14
Merge branch 'master' into fix-always-skipping 2018-07-25 15:30:24 +09:00
Dean Herbert 38f221cd60
Merge branch 'master' into fix-turkish-i 2018-07-25 08:15:20 +02:00
Dan Balasescu dcf70bbd54
Merge pull request #3104 from peppy/fix-invalid-operation 
Fix a potential InvalidOperationException when entering song select
 2018-07-25 14:49:26 +09:00
Dean Herbert da8fc0ee5d ToLower -> ToLowerInvariant 2018-07-25 07:37:05 +02:00
Dean Herbert 425b5e4119 Merge remote-tracking branch 'upstream/master' into peppy-fix-turkish-i 2018-07-25 07:36:24 +02:00
Dan Balasescu affecccabc
Merge branch 'master' into fix-invalid-operation 2018-07-25 14:35:36 +09:00
Dan Balasescu 391eaa30e0
Merge pull request #3109 from peppy/fix-migration-fail 
Fix resetting database failing due to incorrect disposal logic
 2018-07-25 13:56:53 +09:00
AlFasGD 6675c455f3 Trim whitespace that magically appeared 2018-07-24 22:33:19 +03:00
AlFasGD 3ca112aef0 Clean code and apply requested changes 2018-07-24 22:04:02 +03:00
Dean Herbert 5364a6148a Use ToUpperInvariant 2018-07-24 14:42:06 +02:00
Dean Herbert 1d86083981 Hide unnecessary log output 2018-07-24 12:13:48 +02:00
Dean Herbert b38da34da9 Fix resetting database failing due to incorrect disposal logic 2018-07-24 12:13:48 +02:00
Dean Herbert ab9340f4be Fix usage of culture local ToUpper causing incorrect display on Turkish machines 
Closes #3098.
 2018-07-24 11:37:43 +02:00
AlFasGD 0e50e4ee34 Clean code 2018-07-24 10:10:17 +03:00
AlFasGD 765c6e4ecc Remove custom text box 2018-07-24 09:46:24 +03:00
AlFasGD 2f452c162c Make text colour white 2018-07-24 09:21:01 +03:00
AlFasGD a833fa3d92 Update framework and apply suggested changes 2018-07-24 09:19:45 +03:00
AlFasGD cd37b0df23 Merge branch 'master' into labelled-text-box 2018-07-24 09:19:22 +03:00
AlFasGD dd56a2d95f Apply proposed changes (untested) 2018-07-23 15:44:10 +03:00
Dean Herbert 1b456fd716 Fix a potential InvalidOperationException when entering song select 
Closes #3052.
 2018-07-23 13:11:06 +02:00
Dan Balasescu 9dc55688d2
Merge pull request #3103 from peppy/fix-testing-regression 
Fix fatal test result on temporary file deletion failures
 2018-07-23 19:44:25 +09:00
Dean Herbert 2169a47325 Prevent fatal failures on delete failures 2018-07-23 10:39:43 +02:00
Dean Herbert 82ea4456e4 Fix testing regression 2018-07-23 10:33:10 +02:00
Dean Herbert 44a2ae5f9a Fix incorrect variable usage 2018-07-23 08:33:47 +02:00
Dean Herbert 8501967b6a Fix testing regression 2018-07-22 22:47:25 +02:00
Dean Herbert 9f1d37e052
Merge pull request #3079 from smoogipoo/centralise-judgement-display 
Centralise method of disabling playfield judgements
 2018-07-23 05:34:50 +09:00
Dean Herbert 6fa70ed696
Merge branch 'master' into centralise-judgement-display 2018-07-23 05:23:52 +09:00
Dean Herbert 3c59ccadd0 Fix gameplay always skipping to first hitobject time 
Regresssed with previous build
 2018-07-22 22:19:58 +02:00
Dean Herbert f285279258
Merge pull request #3076 from smoogipoo/per-object-css 
Add support for multiple sample banks on a per-hitobject level
 2018-07-23 05:07:46 +09:00
Dean Herbert d561f54282
Merge branch 'master' into per-object-css 2018-07-23 03:01:17 +09:00
Dean Herbert aa54472600
Merge pull request #3095 from VPeruS/patch-1 
README clarification about dotnet restore for VScode users
 2018-07-23 03:00:45 +09:00