miterosan
|
bc7ac94d43
|
Merge branch 'master' of https://github.com/ppy/osu into Cakefy_osu!
# Conflicts:
# appveyor.yml
|
2018-07-30 21:37:42 +02:00 |
|
Dan Balasescu
|
0704f962c5
|
Merge pull request #3102 from peppy/add-skip-button-sound
Add more prominent sound when skipping
|
2018-07-30 18:05:09 +09:00 |
|
Dan Balasescu
|
090bc592b5
|
Merge branch 'master' into add-skip-button-sound
|
2018-07-30 17:56:08 +09:00 |
|
Dean Herbert
|
51c4d12e1d
|
Merge pull request #3061 from peppy/remove-net471-target
Remove net471 targeting
|
2018-07-30 15:53:49 +09:00 |
|
Dean Herbert
|
bd3e5f7e1b
|
Merge branch 'master' into remove-net471-target
|
2018-07-30 15:27:48 +09:00 |
|
Dean Herbert
|
338496452d
|
Move testing package references to somewhere appveyor will find them
|
2018-07-30 15:15:51 +09:00 |
|
Dean Herbert
|
7642db3572
|
Merge pull request #3133 from phosphene47/player-esc-result
Fix hitting "exit" key after gameplay ends not showing results
|
2018-07-30 15:11:42 +09:00 |
|
Dean Herbert
|
4abdca92e1
|
Merge remote-tracking branch 'upstream/master' into phosphene47-player-esc-result
|
2018-07-30 14:57:04 +09:00 |
|
Dean Herbert
|
8c3583ac54
|
Remove newline
|
2018-07-30 14:55:03 +09:00 |
|
Dean Herbert
|
0205916b9e
|
Revert "Specify tests directly"
This reverts commit 1502edcdc6.
|
2018-07-30 14:39:45 +09:00 |
|
Dean Herbert
|
a3e7d4bb21
|
Merge branch 'master' into peppy-remove-net471-target
|
2018-07-30 14:16:38 +09:00 |
|
Dean Herbert
|
f57ba4ffb1
|
Update framework
|
2018-07-30 14:14:16 +09:00 |
|
Dean Herbert
|
3cf906042e
|
Merge branch 'master' into remove-net471-target
|
2018-07-30 11:28:06 +09:00 |
|
miterosan
|
8652c48c18
|
Restore nuget before analyzing the binaries.
|
2018-07-30 02:23:31 +02:00 |
|
miterosan
|
aef824b13d
|
Also analyze the code for spaces and warnings.
|
2018-07-30 02:12:39 +02:00 |
|
miterosan
|
6a661d1766
|
Prepare inspect code
|
2018-07-29 20:49:26 +02:00 |
|
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 |
|
phosphene47
|
d32a3ff052
|
Esc at the end of play should push to result screen
Closes #3060
|
2018-07-28 08:34:51 +10: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 |
|
miterosan
|
91ca245c58
|
Allow testing
|
2018-07-26 03:40:28 +02: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 |
|