miterosan
|
0c62726fd7
|
Rename UserTabItem to UserChannelTabItem
|
2018-07-09 19:48:05 +02:00 |
|
miterosan
|
1589b65494
|
Move tab related stuff to /tabs, move selection related stuff to /selection, remove channeltabcontrol
|
2018-07-09 19:42:57 +02:00 |
|
miterosan
|
16d3815a59
|
Clean Channel up and reword two comments
|
2018-07-09 18:58:33 +02:00 |
|
miterosan
|
66378d5847
|
Remove the highlight from "Start Chat"
|
2018-07-09 18:58:10 +02:00 |
|
miterosan
|
4b638db475
|
Reorder the properties and fields on Channel.
Make MAX_HISTORY because cause can not be public.
|
2018-07-09 18:52:28 +02:00 |
|
miterosan
|
263e68de91
|
Use a custom channel not found exception.
|
2018-07-09 18:45:11 +02:00 |
|
miterosan
|
5e95995429
|
Rename chat to channel
|
2018-07-09 18:30:41 +02:00 |
|
miterosan
|
709d134f49
|
Rename DrawableChat to DrawableChannel
|
2018-07-09 18:23:40 +02:00 |
|
miterosan
|
1f04dd9ada
|
Cache the dependencies using the static method of the class Dependencies.
|
2018-06-17 15:08:13 +02:00 |
|
miterosan
|
e201f9fd72
|
Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages
|
2018-06-17 14:17:06 +02:00 |
|
miterosan
|
cd0fe6a09e
|
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
# Conflicts:
# osu.Game.Tests/Visual/TestCaseChatLink.cs
|
2018-06-17 14:15:14 +02:00 |
|
Dean Herbert
|
3c26556a23
|
Merge pull request #2617 from smoogipoo/timeline-audio-scrolling
Couple the editor waveform timeline to the audio
|
2018-06-17 19:33:05 +09:00 |
|
Dean Herbert
|
a20ec0d4cc
|
Merge branch 'master' into timeline-audio-scrolling
|
2018-06-17 19:01:21 +09:00 |
|
smoogipoo
|
08f172ba98
|
Make testcase work on appveyor (no BASS)
|
2018-06-17 19:01:18 +09:00 |
|
Dean Herbert
|
e0ee5e2085
|
Merge branch 'master' into timeline-audio-scrolling
|
2018-06-17 19:01:16 +09:00 |
|
smoogipoo
|
0695615c6a
|
Remove MusicController from compose timeline testcase
|
2018-06-17 19:01:14 +09:00 |
|
smoogipoo
|
6c100caba7
|
Use existing instance of beatmap rather than adding more resources
|
2018-06-17 19:00:58 +09:00 |
|
Dean Herbert
|
cdc88a6c48
|
Merge pull request #2802 from smoogipoo/diffcalc-rework
Rework difficulty calculators to better support mods and attributes
|
2018-06-15 18:22:43 +09:00 |
|
Dean Herbert
|
a6437c005c
|
Merge branch 'master' into diffcalc-rework
|
2018-06-15 18:02:18 +09:00 |
|
Dean Herbert
|
9374415307
|
Merge pull request #2775 from smoogipoo/fix-taiko-hitexplosions
Make sure taiko hitexplosions expire and get removed
|
2018-06-15 18:00:47 +09:00 |
|
Dean Herbert
|
30f7837b03
|
Merge branch 'master' into fix-taiko-hitexplosions
|
2018-06-15 17:52:53 +09:00 |
|
Dean Herbert
|
eac5db5dbc
|
Merge pull request #2812 from peppy/droplets-should-bounce
Fix droplets not bouncing off catcher's plate immediately
|
2018-06-15 17:52:28 +09:00 |
|
Dan Balasescu
|
0ba80fad60
|
Merge branch 'master' into droplets-should-bounce
|
2018-06-15 17:34:54 +09:00 |
|
Dan Balasescu
|
d7353135de
|
Merge pull request #2810 from peppy/remove-migrate-exception
Remove custom migration exception
|
2018-06-15 17:34:46 +09:00 |
|
Dan Balasescu
|
234ed04cdd
|
Merge branch 'master' into remove-migrate-exception
|
2018-06-15 17:22:34 +09:00 |
|
Dan Balasescu
|
ee88444be5
|
Merge pull request #2813 from peppy/fix-music-controller-drag
Fix music controller draggability
|
2018-06-15 17:22:29 +09:00 |
|
Dean Herbert
|
db9141a6cf
|
Merge branch 'master' into fix-music-controller-drag
|
2018-06-15 17:08:01 +09:00 |
|
Dan Balasescu
|
87d69b93a6
|
Merge pull request #2792 from peppy/fix-volume-pixellation
Fix pixellation of volume meter progress bars
|
2018-06-15 17:07:50 +09:00 |
|
Dan Balasescu
|
40daa87f22
|
Merge branch 'master' into fix-music-controller-drag
|
2018-06-15 17:07:25 +09:00 |
|
Dan Balasescu
|
aaf3ef240e
|
Remove easily-confused comment
|
2018-06-15 17:07:07 +09:00 |
|
Dean Herbert
|
8b5a9c3236
|
Merge branch 'master' into fix-volume-pixellation
|
2018-06-15 16:45:15 +09:00 |
|
Dean Herbert
|
e8fcc01ca4
|
Merge pull request #2807 from smoogipoo/mania-conversion-fixes
Fix a few osu!mania beatmap conversion edge cases
|
2018-06-15 16:45:10 +09:00 |
|
Dean Herbert
|
f7b2da852f
|
Merge branch 'master' into mania-conversion-fixes
|
2018-06-15 16:33:46 +09:00 |
|
Dean Herbert
|
a2950b1d80
|
Fix incorrect comment
|
2018-06-15 16:12:18 +09:00 |
|
Dean Herbert
|
1c27ef644a
|
Fix music controller drag activating from anywhere on the screen
|
2018-06-15 16:12:11 +09:00 |
|
Dean Herbert
|
149d94116b
|
Fix droplets not bouncing off catcher's plate immediately
|
2018-06-15 15:44:47 +09:00 |
|
Dean Herbert
|
3fcaf52378
|
Merge pull request #2806 from smoogipoo/conversion-test-improvements
Extend the testability of beatmap conversions
|
2018-06-15 14:33:46 +09:00 |
|
Dean Herbert
|
036c57833b
|
Merge branch 'master' into conversion-test-improvements
|
2018-06-15 14:26:37 +09:00 |
|
Dean Herbert
|
2819a283f7
|
Merge pull request #2811 from Joehuu/remove-from-prefix
Remove "from" prefix from sources on direct panels
|
2018-06-15 14:26:30 +09:00 |
|
Dean Herbert
|
e2a4d6c15f
|
Merge branch 'master' into remove-from-prefix
|
2018-06-15 14:19:36 +09:00 |
|
Joehu
|
069d939e29
|
Remove "from" prefix from sources on direct panels
|
2018-06-14 21:53:01 -07:00 |
|
Dan Balasescu
|
98cafa106f
|
Merge branch 'master' into fix-volume-pixellation
|
2018-06-15 13:44:18 +09:00 |
|
Dan Balasescu
|
dea5143028
|
Merge pull request #2801 from peppy/fix-juice-explosions
Fix combos ending with JuiceStreams never leaving the catcher's plate
|
2018-06-15 13:43:03 +09:00 |
|
Dean Herbert
|
4a19f22b3d
|
Remove custom migration exception
This was hiding the true error message from ever hitting logs.
Made to help disagnose #2711.
|
2018-06-15 13:38:42 +09:00 |
|
smoogipoo
|
a4d2364083
|
Add one more newline
|
2018-06-14 21:29:08 +09:00 |
|
smoogipoo
|
b99b520656
|
Allow convertmapping to be extended
|
2018-06-14 21:25:33 +09:00 |
|
smoogipoo
|
024d2abfe0
|
Always generate mappings/convert values as soon as objects are converted
# Conflicts:
# osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
|
2018-06-14 21:25:23 +09:00 |
|
smoogipoo
|
8d0e7abdd6
|
Some rulesets don't have a beatmap processor
|
2018-06-14 21:23:11 +09:00 |
|
smoogipoo
|
5e66b02108
|
Process beatmap before generating mappings
|
2018-06-14 21:22:56 +09:00 |
|
smoogipoo
|
fd84afb89b
|
Fix non-inverted calculation
|
2018-06-14 19:38:48 +09:00 |
|