95cca046fb
Merge branch 'master' into open-downloaded-beatmas
2018-07-25 12:38:49 +02:00
cd37b0df23
Merge branch 'master' into labelled-text-box
2018-07-24 09:19:22 +03:00
0aacde836a
Move private channel constructor to own class
2018-07-23 20:46:44 +02:00
9f43e0c900
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
...
# Conflicts:
# osu.Game/Overlays/Chat/ChatTabControl.cs
# osu.Game/Overlays/ChatOverlay.cs
2018-07-23 15:45:54 +02:00
dd56a2d95f
Apply proposed changes (untested)
2018-07-23 15:44:10 +03:00
82ea4456e4
Fix testing regression
2018-07-23 10:33:10 +02:00
d561f54282
Merge branch 'master' into per-object-css
2018-07-23 03:01:17 +09:00
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
a2f744b05e
Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas
2018-07-21 00:03:17 +09:00
6dd5c7e5ab
Add test case
2018-07-20 14:28:39 +03:00
7cc999027d
Merge branch 'master' into pause-input-fixes
2018-07-20 17:20:19 +09:00
241437c819
Remove unnecessary counting change logic
2018-07-20 17:08:25 +09:00
c087a73f40
Implement per-hitobject custom sample banks
2018-07-20 15:12:44 +09:00
967d0c3c72
Adjust testcase
2018-07-20 15:12:04 +09:00
64ead0fdf7
Add more tests and fix one remaining issue case
2018-07-20 11:55:17 +09:00
d7f1766ee2
wip
2018-07-19 18:51:08 +09:00
7be3a5d466
Centralise test storage logic
2018-07-19 14:07:55 +09:00
3e738c607a
Add more song select tests
2018-07-19 13:39:42 +09:00
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
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
9611292f4e
FilterTask -> PendingFilter
2018-07-18 13:18:50 +09:00
fb09385f51
Remove net471 targeting
2018-07-18 11:01:08 +09:00
827c5c4939
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 15:14:03 +09:00
ee2c7c50ad
Tidy up button hierarchy
2018-07-13 16:28:18 +09:00
e20cdccf05
Merge branch 'master' into update-disclaimer
2018-07-12 23:41:55 +09:00
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
4638ac902c
Remove pointless rate adjust slider from TestCaseOsuGame
2018-07-11 16:31:00 +09:00
8bc7c4c9a2
Add TestCase and update disclaimer screen
2018-07-11 16:30:51 +09:00
f5504914cc
Merge branch 'master' into fix-hitsound-fallback
2018-07-10 17:19:16 +09:00
40ec486152
Merge branch 'master' into improve-button-system
2018-07-10 16:44:55 +09:00
282a99fb88
Merge branch 'master' into fix-spelling
2018-07-10 16:32:14 +09:00
65d351c31a
Fix failing test cases
2018-07-10 16:26:04 +09:00
ad96338af7
Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages
2018-07-09 22:47:34 +02:00
ea597916ca
Code cleanups
2018-07-09 22:41:53 +02:00
ae093d2619
Merge branch 'master' into Private_Messages
2018-07-09 22:15:36 +02:00
290b6e5f1d
Fix the crash in the visual testcase
2018-07-09 22:09:27 +02:00
974c4f5185
ToolbarMode* -> ToolbarRuleset*
2018-07-10 01:20:21 +09:00
1670f4fe31
Merge branch 'master' into fix-osd-fade-in
2018-07-09 19:10:57 +09:00
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
10aae3b0ee
Remove age from User class
2018-07-09 10:33:46 +02:00
c56a4ea893
Merge branch 'master' into Private_Messages
2018-07-08 19:29:33 +02:00
6b240280d0
Merge https://github.com/ppy/osu into multiplayer-room-settings
2018-07-07 01:10:27 -03:00
0b30e6eb6a
Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system
2018-07-06 17:55:02 +09:00
4f894969df
Merge branch 'master' into hitobject-samples
2018-07-05 19:43:19 +09:00
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
d11ba2df0e
Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks
2018-07-05 14:53:31 +09:00
2aae528e1c
Improve code quality of main menu button system
2018-07-03 18:23:41 +09:00
d791216505
Merge branch 'master' into Private_Messages
2018-07-03 07:58:15 +02:00
90d90370c2
Use testcase ruleset
2018-07-02 15:25:37 +09:00
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
