1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-30 05:09:42 +08:00
Commit Graph

792 Commits

Author SHA1 Message Date
Jarosław Zgierski
44bdd0dbb6
Merge branch 'master' into changelog-overlay 2018-07-22 10:57:30 +02: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
HoutarouOreki
a857999950 Refactor3 2018-07-20 00:52:50 +02:00
HoutarouOreki
bcd132e87f API1 2018-07-19 19:07:24 +02:00
Dean Herbert
7be3a5d466 Centralise test storage logic 2018-07-19 14:07:55 +09:00
HoutarouOreki
11e0732a27 Refactor1, UX1 2018-07-18 19:32:15 +02:00
HoutarouOreki
837747e35f Streams3 2018-07-18 15:17:20 +02: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
HoutarouOreki
6baa761b9c Streams2 2018-07-18 03:26:08 +02:00
HoutarouOreki
523d47e815 Streams1 2018-07-18 01:35:06 +02:00
HoutarouOreki
3c1e445fdf Header3 2018-07-17 18:32:11 +02:00
HoutarouOreki
b4bb97fba8 Header2 2018-07-17 15:01:53 +02:00
smoogipoo
827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
HoutarouOreki
be977e2541 Header1 2018-07-16 23:50:22 +02:00
Dean Herbert
ee2c7c50ad Tidy up button hierarchy 2018-07-13 16:28:18 +09:00
Dan Balasescu
e20cdccf05
Merge branch 'master' into update-disclaimer 2018-07-12 23:41:55 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Dean Herbert
4638ac902c Remove pointless rate adjust slider from TestCaseOsuGame 2018-07-11 16:31:00 +09:00
Dean Herbert
8bc7c4c9a2 Add TestCase and update disclaimer screen 2018-07-11 16:30:51 +09:00
Dan Balasescu
f5504914cc
Merge branch 'master' into fix-hitsound-fallback 2018-07-10 17:19:16 +09:00
Dan Balasescu
40ec486152
Merge branch 'master' into improve-button-system 2018-07-10 16:44:55 +09:00
Dan Balasescu
282a99fb88
Merge branch 'master' into fix-spelling 2018-07-10 16:32:14 +09:00
smoogipoo
65d351c31a Fix failing test cases 2018-07-10 16:26:04 +09:00
Dean Herbert
974c4f5185 ToolbarMode* -> ToolbarRuleset* 2018-07-10 01:20:21 +09:00
Dean Herbert
1670f4fe31
Merge branch 'master' into fix-osd-fade-in 2018-07-09 19:10:57 +09:00
Dean Herbert
df67c0498d Fix OSD fade-in not correctly debouncing
It could potentially never fade in on quick presses.
2018-07-09 17:53:39 +09:00
HoutarouOreki
10aae3b0ee Remove age from User class 2018-07-09 10:33:46 +02:00
Dean Herbert
0b30e6eb6a Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system 2018-07-06 17:55:02 +09:00
Dean Herbert
4f894969df
Merge branch 'master' into hitobject-samples 2018-07-05 19:43:19 +09:00
Dean Herbert
1d6609d9f3 Add common custom words to dotsettings dictionary
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
Dean Herbert
d11ba2df0e Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks 2018-07-05 14:53:31 +09:00
Dean Herbert
2aae528e1c Improve code quality of main menu button system 2018-07-03 18:23:41 +09:00
smoogipoo
90d90370c2 Use testcase ruleset 2018-07-02 15:25:37 +09:00
smoogipoo
4070c1a888 Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
#	osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
smoogipoo
c1b8799253 Add simple testcase 2018-07-02 14:40:43 +09:00
smoogipoo
c78bfbfa55 Fix failing json conversion testcases 2018-07-02 13:34:19 +09:00
smoogipoo
9fd9af22f0 Remove unused using 2018-06-28 18:40:12 +09:00
smoogipoo
94f1b2eeb8 Only custom sample banks > 1 modify the filename 2018-06-28 18:29:17 +09:00
smoogipoo
3a9a82c80c Add back legacy custom sample banks 2018-06-28 18:29:12 +09:00
Dean Herbert
c44a81bdf5 Add word wrap support 2018-06-28 13:04:39 +09:00
smoogipoo
ede59f63f6 Merge remote-tracking branch 'origin/master' into make-loading-more-visible 2018-06-27 12:52:06 +09:00
Dean Herbert
ac1bf3b092
Merge branch 'master' into editor-seek-snapping-fix 2018-06-27 11:08:19 +09:00
Dean Herbert
018dcc98b4 Fix failing tests 2018-06-26 19:17:34 +09:00
Dean Herbert
594cc0d21d
Merge branch 'master' into mania-playfield-inversions 2018-06-25 18:36:23 +09:00
Dean Herbert
e75ff1145c
Merge branch 'master' into editor-seek-snapping-fix 2018-06-25 18:27:03 +09:00
Dean Herbert
b0cd227e81 Fix race condition in TestCaseLounge (attempt 2) 2018-06-25 14:10:54 +09:00
Dan Balasescu
d77ba64a73
Merge branch 'master' into fix-test-case-lounge 2018-06-22 17:36:40 +09:00
Dean Herbert
fccd4f965c Merge remote-tracking branch 'upstream/master' into make-loading-more-visible 2018-06-22 14:21:01 +09:00
Dean Herbert
eb6d6dc2de Improve the visibility of the global loading animation
Updates design to match new `osu-web` design.
Adds TestCase for visual testing.
2018-06-22 13:14:43 +09:00