Dean Herbert
|
8a6ef0dabb
|
Merge branch 'master' into beatmap-conversion-rework
|
2018-05-10 19:10:07 +08:00 |
|
Dean Herbert
|
9e26bcd571
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
|
2018-05-10 19:51:52 +09:00 |
|
smoogipoo
|
c03ab9014f
|
Improve TestCaseOnScreenDisplay
Now doesn't rely on framesync.
|
2018-05-10 18:48:48 +09:00 |
|
Dean Herbert
|
fadb1a5e0b
|
Add tests and expand functionality to ensure single fire
|
2018-05-10 17:31:16 +09:00 |
|
smoogipoo
|
c7bc79bce3
|
Remove explicit clock in TestCaseBreakOverlay
|
2018-05-09 12:40:04 +09:00 |
|
smoogipoo
|
09c70a9362
|
Add info label tests to TestCaseBeatmapInfoWedge
|
2018-05-07 15:51:08 +09:00 |
|
smoogipoo
|
6a9f139d9b
|
Instantiate convertible hitobjects for beatmap info wedge
|
2018-05-07 15:51:08 +09:00 |
|
smoogipoo
|
9128e64c9a
|
Rename OriginalBeatmap back to Beatmap
|
2018-05-07 10:29:38 +09:00 |
|
smoogipoo
|
4ecdea8b2e
|
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
|
2018-05-07 10:17:54 +09:00 |
|
smoogipoo
|
27c8591d48
|
Fix reference to old name
|
2018-05-07 10:07:50 +09:00 |
|
smoogipoo
|
77e661489d
|
Merge branch 'i-beatmap' into beatmap-conversion-rework
|
2018-05-07 10:00:24 +09:00 |
|
smoogipoo
|
20509b1cc2
|
Fix non-IBeatmap usage
|
2018-05-07 09:59:45 +09:00 |
|
smoogipoo
|
1aefd71b65
|
Merge remote-tracking branch 'origin/master' into i-beatmap
|
2018-05-07 09:58:53 +09:00 |
|
miterosan
|
ba5861b527
|
Merge remote-tracking branch 'origin/master' into Private_Messages
# Conflicts:
# osu.Game/Online/API/Requests/GetMessagesRequest.cs
# osu.Game/Overlays/Chat/ChatTabControl.cs
|
2018-05-06 19:45:33 +02:00 |
|
Roman Kapustin
|
b0e556d83f
|
Actualize QuitButton visual test
|
2018-05-04 00:01:00 +03:00 |
|
Roman Kapustin
|
39db1e8cbb
|
Rename HoldToQuit to QuitButton
|
2018-05-03 23:50:30 +03:00 |
|
Roman Kapustin
|
f8630115d6
|
Do not expose HoldToQuit.HoldToQuitButton
|
2018-05-03 23:29:58 +03:00 |
|
TocoToucan
|
3b84ce7c9f
|
Remove redundant test step
|
2018-05-01 03:56:01 +03:00 |
|
UselessToucan
|
d18a8ec9f5
|
Merge branch 'master' into exit_replay_button
|
2018-04-28 20:48:16 +03:00 |
|
TocoToucan
|
b3cf381c5d
|
Add TestCaseHoldToQuit
|
2018-04-28 19:24:49 +03:00 |
|
Dean Herbert
|
57219ae9c6
|
Fix clashing variable name
|
2018-04-24 02:07:16 +09:00 |
|
Dean Herbert
|
f4c2d6b1a3
|
Fix wedge load test again
Initial load was not being waited on for long enough.
|
2018-04-24 00:51:33 +09:00 |
|
Dean Herbert
|
9551b6914b
|
Fix UserProfile test failing when not logged in
|
2018-04-23 21:41:51 +09:00 |
|
Dean Herbert
|
7d09a39262
|
Fix remaining broken test
|
2018-04-23 20:50:16 +09:00 |
|
Dean Herbert
|
8bf25542cb
|
Add PlayerLoader TestCase and fix dummy beatmap load procedure
|
2018-04-20 17:30:27 +09:00 |
|
smoogipoo
|
03a5df84c6
|
Initial rework of beatmap conversion process
|
2018-04-19 22:04:12 +09:00 |
|
Dean Herbert
|
77af8ce556
|
Add back online load test for BeatmapScoresContainer
|
2018-04-19 21:11:16 +09:00 |
|
smoogipoo
|
66b3b295e7
|
Use IBeatmap wherever possible
|
2018-04-19 20:44:38 +09:00 |
|
miterosan
|
3b68dda23e
|
Merge remote-tracking branch 'origin/master' into Private_Messages
|
2018-04-18 20:55:12 +02:00 |
|
miterosan
|
29e8c70ed7
|
Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh.
|
2018-04-18 20:46:42 +02:00 |
|
Dean Herbert
|
1be2571d33
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:08:45 +09:00 |
|
jorolf
|
de9f15f620
|
add new test case and fix rotation not working
|
2018-04-16 19:22:11 +02:00 |
|
jorolf
|
2a18b4c3f8
|
add a DRAWABLE_BADGE_SIZE const and center badges
|
2018-04-16 18:51:35 +02:00 |
|
jorolf
|
6ca714d93b
|
add badges to ProfileHeader
|
2018-04-15 23:49:45 +02:00 |
|
Dean Herbert
|
ae77c010e2
|
Merge remote-tracking branch 'upstream/master' into wave-container
|
2018-04-15 21:03:18 +09:00 |
|
miterosan
|
142e1b8587
|
update the line endings
|
2018-04-14 13:32:48 +02:00 |
|
miterosan
|
5bfb386226
|
Merge remote-tracking branch 'origin/master' into Private_Messages
|
2018-04-14 13:31:03 +02:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
Endrik Tombak
|
d9f587edff
|
Merge remote-tracking branch 'upstream/master' into alt-eagerselect
|
2018-04-13 11:55:35 +03:00 |
|
miterosan
|
e39f5a1adf
|
Rename var chatmanager -> channelManager
Apply requested changes
|
2018-04-12 23:19:13 +02:00 |
|
Dean Herbert
|
1e6244afe1
|
Merge branch 'master' into remove-gamefield-test
|
2018-04-12 21:37:04 +09:00 |
|
smoogipoo
|
a2484fbf56
|
Move back to DI-ing adjustable clock into SummaryTimeline
|
2018-04-12 13:37:02 +09:00 |
|
smoogipoo
|
fbc50d6030
|
Merge master into editor-clock
|
2018-04-12 13:35:53 +09:00 |
|
DrabWeb
|
0bede52381
|
Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places.
|
2018-04-11 16:22:27 -03:00 |
|
miterosan
|
b997f0f3fa
|
Remove not needed using
|
2018-04-11 21:09:38 +02:00 |
|
miterosan
|
a5e0311253
|
Trim whitespaces
|
2018-04-11 20:53:35 +02:00 |
|
miterosan
|
499ecd3843
|
Fix the warnings
|
2018-04-11 20:44:35 +02:00 |
|
miterosan
|
2056258def
|
Fix code sanity
|
2018-04-11 20:31:16 +02:00 |
|
miterosan
|
3860594f40
|
Rename everything into channel and remove everything chat
|
2018-04-11 20:01:57 +02:00 |
|
miterosan
|
39ecc3d31d
|
Add Test Case, improve displaying the avatar, use a chatTabControl instead of putting both in ChatOverlay, readd shadow.
Requires osu-framework for a fix
|
2018-04-11 18:23:09 +02:00 |
|