smoogipoo
|
92b1c56aed
|
Update osu-resources
|
2018-11-16 18:31:37 +09:00 |
|
Dean Herbert
|
c9e2ee8f56
|
Fix masking of song bar
|
2018-11-16 18:14:42 +09:00 |
|
Dean Herbert
|
1ab4713ef6
|
Add tournament chat display
|
2018-11-16 15:30:19 +09:00 |
|
Dean Herbert
|
e6637532bc
|
Add back padding
|
2018-11-16 12:20:21 +09:00 |
|
Roman Kapustin
|
37b19f78ae
|
Set AccentColour in concrete counters
|
2018-11-15 23:37:21 +03:00 |
|
jorolf
|
80bd98bb9d
|
apply suggestions
|
2018-11-15 17:38:38 +01:00 |
|
Dean Herbert
|
46e163ec5e
|
Add score display
|
2018-11-15 21:28:42 +09:00 |
|
smoogipoo
|
e207dd728b
|
Fix taiko proxies not receiving the correct lifetimes
|
2018-11-15 20:26:12 +09:00 |
|
Dan Balasescu
|
3e2e2a7000
|
Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle
Return to large logo after idle period
|
2018-11-15 15:40:15 +09:00 |
|
Dan Balasescu
|
e8f34ddff0
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-11-15 15:16:10 +09:00 |
|
Dean Herbert
|
54b87e9c93
|
Don't crash on unexpected pairing links
|
2018-11-15 14:12:51 +09:00 |
|
Dean Herbert
|
604cb4cb9e
|
Update to support new dropdown logic
|
2018-11-15 14:12:41 +09:00 |
|
Dean Herbert
|
8eff21d128
|
Fix star colours being incorrect
|
2018-11-15 14:12:14 +09:00 |
|
Dean Herbert
|
01f814aace
|
Fix song length not being rounded correctly when DT is applied
|
2018-11-15 14:11:58 +09:00 |
|
Dean Herbert
|
b574a07f23
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2018-11-15 13:31:34 +09:00 |
|
Dan Balasescu
|
d94801b6c6
|
Merge pull request #3720 from HoLLy-HaCKeR/fix-settingstextbox
Fix SettingsTextBox having width of 0
|
2018-11-15 12:15:11 +09:00 |
|
jorolf
|
f0f7b15edc
|
remove unused using
|
2018-11-15 00:45:27 +01:00 |
|
jorolf
|
41a0f9896e
|
Merge branch 'master' into flashlight-mod
|
2018-11-15 00:35:42 +01:00 |
|
jorolf
|
7d2958b7b0
|
split shader, remove unnecessary clutter and fix some bugs
|
2018-11-15 00:33:13 +01:00 |
|
HoLLy
|
9dd3d28436
|
Fix SettingsTextBox having width of 0
|
2018-11-14 22:29:11 +01:00 |
|
Dean Herbert
|
1501e05c04
|
Merge branch 'master' into fix-mask-disposal
|
2018-11-14 21:27:37 +09:00 |
|
Dean Herbert
|
92adcb7613
|
Merge pull request #3719 from smoogipoo/dropdown-updates
Update with osu!-side dropdown changes
|
2018-11-14 21:27:16 +09:00 |
|
Dean Herbert
|
caaa5645e3
|
Correct framework version
|
2018-11-14 21:16:08 +09:00 |
|
Dean Herbert
|
30547ac064
|
Merge remote-tracking branch 'upstream/master' into dropdown-updates
|
2018-11-14 20:03:45 +09:00 |
|
Dan Balasescu
|
287d7043f8
|
Merge pull request #3686 from peppy/hold-for-menu-back
Require holding back button to quit gameplay
|
2018-11-14 19:32:24 +09:00 |
|
smoogipoo
|
f1f2fc133a
|
Use SkinInfo directly
|
2018-11-14 19:29:20 +09:00 |
|
Dan Balasescu
|
81a3170e3b
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 19:13:07 +09:00 |
|
Dean Herbert
|
e34881c2c0
|
Merge pull request #3714 from smoogipoo/placement-hiding
Hide the placement blueprint when cursor is outside the playfield
|
2018-11-14 18:54:26 +09:00 |
|
Dan Balasescu
|
61a62a4eae
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 18:35:08 +09:00 |
|
smoogipoo
|
4b86c29f7b
|
Merge remote-tracking branch 'origin/master' into placement-hiding
|
2018-11-14 18:34:45 +09:00 |
|
smoogipoo
|
c963fc7cd2
|
Reduce chaining
|
2018-11-14 18:34:13 +09:00 |
|
Dean Herbert
|
996e51db11
|
Merge pull request #3708 from smoogipoo/add-mania-selection-testcase
Add mania selection blueprint testcases
|
2018-11-14 18:28:30 +09:00 |
|
Dan Balasescu
|
e9b47c6233
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 18:22:34 +09:00 |
|
Dean Herbert
|
a83efe225e
|
Merge remote-tracking branch 'upstream/master' into add-mania-selection-testcase
|
2018-11-14 18:11:53 +09:00 |
|
Dean Herbert
|
9e24266934
|
Merge pull request #3710 from smoogipoo/notepieces
Separate note selection mask into a note piece
|
2018-11-14 18:11:07 +09:00 |
|
smoogipoo
|
aff5fa6169
|
Update with osu!-side dropdown changes
|
2018-11-14 18:02:38 +09:00 |
|
Dean Herbert
|
3fbabdfed2
|
Merge branch 'master' into notepieces
|
2018-11-14 17:30:39 +09:00 |
|
Dean Herbert
|
635c1bf833
|
Merge pull request #3707 from smoogipoo/more-global-scrollalgo
Move scroll algorithm to a more global location
|
2018-11-14 17:27:32 +09:00 |
|
Dean Herbert
|
a1dd1057ce
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 17:15:24 +09:00 |
|
Dean Herbert
|
84d16ee71b
|
Merge branch 'master' into placement-hiding
|
2018-11-14 16:59:41 +09:00 |
|
Dean Herbert
|
4a28d66d2d
|
Merge pull request #3694 from smoogipoo/fix-mania-selections
Fix mania selection blueprint sizing
|
2018-11-14 16:59:26 +09:00 |
|
Dan Balasescu
|
4fbad65e3d
|
Merge pull request #2371 from miterosan/Private_Messages
Add framework for private messaging support
|
2018-11-14 15:43:46 +09:00 |
|
smoogipoo
|
7274908059
|
Implement interface
|
2018-11-14 15:33:09 +09:00 |
|
smoogipoo
|
050af88be9
|
Fix post-merge issues
|
2018-11-14 14:29:22 +09:00 |
|
Dean Herbert
|
1b2924ea4a
|
Merge branch 'master' into fix-mania-selections
|
2018-11-14 14:24:45 +09:00 |
|
smoogipoo
|
29422345f7
|
Merge remote-tracking branch 'origin/master' into fix-mask-disposal
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
# osu.Game.Rulesets.Osu/Objects/Slider.cs
|
2018-11-14 14:03:25 +09:00 |
|
Dean Herbert
|
fb22fc11f6
|
Merge remote-tracking branch 'upstream/master' into Private_Messages
|
2018-11-14 13:59:17 +09:00 |
|
Dean Herbert
|
9a9d5e60af
|
More refactors
|
2018-11-14 13:59:02 +09:00 |
|
Dean Herbert
|
2ae139d260
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 13:54:53 +09:00 |
|
Dean Herbert
|
5c66547c18
|
Merge pull request #3709 from smoogipoo/scrollalgorithm-timeat
Implement IScrollAlgorithm.TimeAt()
|
2018-11-14 13:50:48 +09:00 |
|