1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

13799 Commits

Author SHA1 Message Date
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
Dean Herbert
10656be954 Add interpolation to repeat point during sliding 2018-07-23 16:55:38 +02: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
479fe98335 Add more prominent sound when skipping 2018-07-22 22:57:55 +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
Dean Herbert
717345f260
Use full application name 2018-07-22 20:00:34 +02:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display 2018-07-23 02:58:49 +09:00
Dean Herbert
61a57b8050
Merge pull request #3093 from peppy/update-framework
Update framework
2018-07-23 02:57:46 +09:00
VperuS
41ffc17fe3
Small clarification about to run dotnet restore 2018-07-21 13:27:45 +03:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
a2f744b05e Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas 2018-07-21 00:03:17 +09:00
Dan Balasescu
1796ffde14
Merge pull request #3063 from peppy/fix-model-import
Fix ArchiveModelManager's model import method not running import logic
2018-07-20 23:50:29 +09:00
Dean Herbert
77da100c0f
Merge branch 'master' into fix-model-import 2018-07-20 23:30:41 +09:00
AlFasGD
6dd5c7e5ab Add test case 2018-07-20 14:28:39 +03:00
AlFasGD
f200cfe40d Add labelled text box files 2018-07-20 13:05:19 +03:00
Dean Herbert
3fc7f33e90
Merge branch 'master' into centralise-judgement-display 2018-07-20 17:29:15 +09:00
Dean Herbert
f226e10033
Merge pull request #3042 from peppy/pause-input-fixes
Improve pause logic
2018-07-20 17:28:25 +09:00
Dean Herbert
7cc999027d
Merge branch 'master' into pause-input-fixes 2018-07-20 17:20:19 +09:00