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

8841 Commits

Author SHA1 Message Date
Dean Herbert
7097ecb740 Fix discrepancies in how elements of play mode fade when restarting/exiting 2018-08-02 19:08:23 +09:00
Dean Herbert
4a11f2ec2a Improve UX when adjusting visual settings at loading screen 2018-08-02 18:18:55 +09:00
Dean Herbert
9fdba887e4
Merge branch 'master' into fix-playerloader-ready-check 2018-08-02 11:37:45 +09:00
Dean Herbert
70ee7e4afd Scroll chat to end of buffer when posting a new message 2018-08-02 08:00:14 +09:00
smoogipoo
d51d0e8547 Initial structure for new hitobject judgement system 2018-08-01 21:45:59 +09:00
smoogipoo
41512667a8 Require all judgements to be present for map completion 2018-08-01 19:51:24 +09:00
Dean Herbert
6ce32bd431 Update remaining nuget deps 2018-08-01 19:17:16 +09:00
Dean Herbert
4224d35a75 Use forked squirrel
Allows for updating SharpCompress, too.
2018-08-01 16:56:36 +09:00
ekrctb
ecc6d55380 Fix player loader not gets ready when multiple mouse button is down 2018-08-01 16:20:29 +09:00
Dean Herbert
3d136bf207 Remove unused nuspec 2018-08-01 03:37:59 +09:00
Shane Woolcock
4fdca2b198 Update framework 2018-07-31 21:21:26 +09:30
Shane Woolcock
47533f83c3 Update TabControl subclasses to use AddInternal 2018-07-31 20:52:11 +09:30
Dean Herbert
582bc58715 Remove unused colour propagation 2018-07-31 18:05:14 +09:00
Dean Herbert
3c06655672 Split out Special mods into Automation and Conversion 2018-07-31 18:00:42 +09:00
Dean Herbert
bcc23f10c5
Merge branch 'master' into disable-download-button 2018-07-31 17:03:41 +09:00
Dean Herbert
9ab56bc4ef Make Ruleset non-public 2018-07-31 16:35:51 +09:00
smoogipoo
ec31028f14 Add tooltip 2018-07-31 14:50:57 +09:00
smoogipoo
70338e087a Disable beatmap download button if not supporter 2018-07-31 14:41:31 +09:00
Dean Herbert
ddecf59cfd
Merge branch 'master' into open-downloaded-beatmas 2018-07-31 13:21:14 +09:00
Dan Balasescu
090bc592b5
Merge branch 'master' into add-skip-button-sound 2018-07-30 17:56:08 +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
f57ba4ffb1 Update framework 2018-07-30 14:14:16 +09:00
Dean Herbert
b7de922896
Merge branch 'master' into open-downloaded-beatmas 2018-07-28 12:44:34 +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
smoogipoo
464333cf0b Merge remote-tracking branch 'origin/master' 2018-07-26 21:28:31 +09:00
Dan Balasescu
ceaa23fbbb
Merge branch 'master' into fix-turkish-i 2018-07-26 18:06:58 +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
95cca046fb Merge branch 'master' into open-downloaded-beatmas 2018-07-25 12:38:49 +02:00
Dean Herbert
ff04527c6d
Merge branch 'master' into fix-always-skipping 2018-07-25 12:30:39 +02: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
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
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
Dean Herbert
2169a47325 Prevent fatal failures on delete failures 2018-07-23 10:39:43 +02:00
Dean Herbert
44a2ae5f9a Fix incorrect variable usage 2018-07-23 08:33:47 +02:00
Dean Herbert
aead4be134 Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container 2018-07-23 06:36:10 +02:00
Dean Herbert
479fe98335 Add more prominent sound when skipping 2018-07-22 22:57:55 +02: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
d561f54282
Merge branch 'master' into per-object-css 2018-07-23 03:01:17 +09:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display 2018-07-23 02:58:49 +09: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
Dean Herbert
77da100c0f
Merge branch 'master' into fix-model-import 2018-07-20 23:30:41 +09: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
7cc999027d
Merge branch 'master' into pause-input-fixes 2018-07-20 17:20:19 +09:00
Dean Herbert
241437c819 Remove unnecessary counting change logic 2018-07-20 17:08:25 +09:00
smoogipoo
1139f0dbf2 Centralise method of disabling playfield judgements 2018-07-20 17:04:33 +09:00
Dean Herbert
fc6deb6ab5 Merge remote-tracking branch 'upstream/master' into peppy-fix-model-import 2018-07-20 16:42:46 +09:00
Dean Herbert
7fea2b3a8b
Add ToList 2018-07-20 16:38:02 +09:00
Dean Herbert
92fe996a8b
Merge branch 'master' into fix-model-import 2018-07-20 16:17:39 +09:00
Dean Herbert
0e7bb3b548
Merge branch 'master' into no-more-memory-sqlite 2018-07-20 16:17:36 +09:00
smoogipoo
c087a73f40 Implement per-hitobject custom sample banks 2018-07-20 15:12:44 +09:00
smoogipoo
de8d05bb0c Remove unnecessary setting of sample name to same value 2018-07-20 15:12:21 +09:00
Dean Herbert
64ead0fdf7 Add more tests and fix one remaining issue case 2018-07-20 11:55:17 +09:00
David V
9eb69a1e76 Restructure + corrects converting to support all systems 2018-07-19 17:47:55 +02:00
David V
4e72794101 Converts float to int. 2018-07-19 15:55:38 +02:00
Dan Balasescu
5dba048c46
Merge branch 'master' into mania-mask-container 2018-07-19 19:38:43 +09:00
Dean Herbert
d7f1766ee2 wip 2018-07-19 18:51:08 +09:00
Dean Herbert
c31676f8f1 Rework update methods to separate out ruleset and beatmap changes
Combining them was causing complexity and logic errors.
2018-07-19 18:48:40 +09:00
Dean Herbert
693ba8e994 Add more ToString output 2018-07-19 18:43:11 +09:00
smoogipoo
b7721edc80 Remove more unnecessary changes 2018-07-19 18:25:28 +09:00
Dean Herbert
332c62f110 Merge branch 'fix-model-import' into open-downloaded-beatmas
# Conflicts:
#	osu.Game/Beatmaps/BeatmapManager.cs
#	osu.Game/Database/SingletonContextFactory.cs
2018-07-19 14:11:31 +09:00
Dean Herbert
7be3a5d466 Centralise test storage logic 2018-07-19 14:07:55 +09:00
Dean Herbert
68614f1512 Ensure online IDs are validated for imports that don't have an associated archive too 2018-07-19 13:41:34 +09:00
Dean Herbert
82ddbb3f5d Delay key count stop 2018-07-19 01:18:07 +09:00
Dean Herbert
41441771ae Remove unnecessary cast 2018-07-18 22:22:28 +09:00
Dean Herbert
8414fe9d05 Add key counter exceptions for paused state 2018-07-18 22:19:32 +09:00
Dean Herbert
a01361f833 Set restart count 2018-07-18 22:05:24 +09:00
Dean Herbert
c2cdf12986 Better pause logic 2018-07-18 19:59:04 +09:00
Dean Herbert
0c24244340 Remove SingletonContextFactory
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.

# Conflicts:
#	osu.Game/Database/SingletonContextFactory.cs
2018-07-18 16:50:56 +09:00
Dean Herbert
1d52231d4f Remove SingletonContextFactory
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
2018-07-18 16:44:47 +09:00
Dean Herbert
90840c9384 Fix ArchiveModelManager's model import method not running import logic 2018-07-18 13:18:50 +09:00
Dean Herbert
9611292f4e FilterTask -> PendingFilter 2018-07-18 13:18:50 +09:00
Dean Herbert
f1c3fbe644 Improve integrity of song select bind/change logic 2018-07-18 13:18:50 +09:00
Dean Herbert
5fe634a3b6 Click download button to load beatmap 2018-07-18 13:18:50 +09:00
Dean Herbert
e3fb781a5a Fix ArchiveModelManager's model import method not running import logic 2018-07-18 12:59:22 +09:00
Dean Herbert
aa2f2f3e94
Merge pull request #3034 from peppy/reduce-panel-width
Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions
2018-07-17 19:14:48 +09:00
smoogipoo
9b7d01397b Add ruleset config to HitObjectComposer 2018-07-17 16:53:32 +09:00
smoogipoo
6437fdd9db Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00