h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 07:32:55 +08:00
Code Issues Releases Wiki Activity
13,360 Commits 3 Branches 661 Tags 368 MiB
d11ba2df0e
Commit Graph

13360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smoogipoo
afcf91a4c5 What the... 2018-06-21 13:12:22 +09:00
Dean Herbert
498302e298
Merge pull request #2559 from KoziLord/ParallaxContainerImprovement 
Add support for negative ParallaxAmount in ParallaxContainer
 2018-06-21 13:06:09 +09:00
smoogipoo
9314f49bc3 Expose the catch width from the Catcher 2018-06-21 12:57:59 +09:00
Dean Herbert
74f732038f Add documentation for negative values of ParallaxAmount 2018-06-21 12:49:07 +09:00
Dean Herbert
df0083e3d9 Add tests for ParallaxContainer 2018-06-21 12:48:57 +09:00
Dean Herbert
5f2d1d4a1e Dim TestCase background a bit 2018-06-21 12:48:44 +09:00
smoogipoo
5d0c847835 Fix post-merge errors 2018-06-21 12:26:21 +09:00
smoogipoo
c9581a2d56 Merge remote-tracking branch 'origin/master' into catch_star_rating 
# Conflicts:
#	osu-framework
#	osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
#	osu.Game/Rulesets/Difficulty/DifficultyCalculator.cs
 2018-06-21 12:15:25 +09:00
Dean Herbert
733b7d1177
Merge branch 'master' into ParallaxContainerImprovement 2018-06-21 12:10:10 +09:00
smoogipoo
48989df6eb Make sure that 0 SR is returned when there are no hitobjects 2018-06-21 12:04:14 +09:00
Dean Herbert
65487d1610
Merge branch 'master' into improve-volume-controls 2018-06-21 11:56:56 +09:00
Dean Herbert
bf9b210a44
Merge pull request #2708 from DrabWeb/multiplayer-match 
Multiplayer match screen
 2018-06-21 10:33:37 +09:00
Dean Herbert
2a42418dbf Tidy up ReadyButton 2018-06-21 10:21:54 +09:00
Dean Herbert
4c068097c8 Change required child to use same structure as other use cases 2018-06-21 10:12:12 +09:00
Dean Herbert
2697579448 Give TestLounge a background to make transitions work correctly 2018-06-21 09:54:13 +09:00
Dan Balasescu
bf11a61d52
Merge branch 'master' into more-diffcalc-attributes 2018-06-21 09:26:50 +09:00
ekrctb
9194fd8dfe don't expose HyperDashModifier directly 2018-06-20 20:08:27 +09:00
ekrctb
79c5596b27 Merge remote-tracking branch 'origin/master' into catch-stable-hyper 2018-06-20 19:06:54 +09:00
ekrctb
516b1c5495 Fix droplet position clamping 2018-06-20 18:29:23 +09:00
Dean Herbert
96100a2200 Remove schedule logic (seems unnecessary) 2018-06-20 17:41:48 +09:00
Dean Herbert
39649747aa Simplify and synchronise multiplayer screen transitions 2018-06-20 17:25:22 +09:00
ekrctb
9d7e5b4920 Clamp juice stream position 2018-06-20 17:23:55 +09:00
Dean Herbert
f0c72438a3 Group ValueChanged attachment with bindings 2018-06-20 17:06:02 +09:00
Dean Herbert
3f020a2802
Merge branch 'master' into multiplayer-match 2018-06-20 14:49:32 +09:00
Dean Herbert
b95042e370 Fix background screens not supporting early-exit condition 
Closes #2681.
 2018-06-20 12:43:48 +09:00
Dean Herbert
a01a0b7d52
Merge pull request #2831 from ThePyrotechnic/ShowMorePadding 
Add padding to "show more" button
 2018-06-20 12:27:47 +09:00
Dean Herbert
3eb0a17978 Merge remote-tracking branch 'upstream/master' into ThePyrotechnic-ShowMorePadding 2018-06-20 10:45:43 +09:00
Dean Herbert
d7f65d62e0 Use vertical/horizontal pair instead 2018-06-20 10:45:35 +09:00
Dean Herbert
03db19eb9c
Merge pull request #2838 from tom-arrow/ruleset-container 
RulesetContainer<TObject> cannot be derived
 2018-06-20 10:36:31 +09:00
Tom Arrow
d753df65a5 Remove default bindings for right actions 2018-06-19 18:04:53 +02:00
Dan Balasescu
77e03a59a9
Merge branch 'master' into ruleset-container 2018-06-19 21:47:10 +09:00
Tom Arrow
ad883e087a RulesetContainer<TObject> cannot be derived 2018-06-19 14:31:24 +02:00
Dean Herbert
58b551b98e
Merge pull request #2836 from peppy/update-framework 
Update framework
 2018-06-19 21:12:16 +09:00
Dan Balasescu
0b1b3319aa
Merge branch 'master' into update-framework 2018-06-19 20:57:19 +09:00
Dean Herbert
e17d60db8a
Merge branch 'master' into improve-editor-scrolling 2018-06-19 20:23:41 +09:00
Dean Herbert
3819ecb2be Update framework 2018-06-19 20:19:52 +09:00
Dean Herbert
b9d63ee7b1
Merge pull request #2829 from tom-arrow/reverse-arrow-fix 
Fix reverse arrow displayed with incorrect angle
 2018-06-19 20:17:16 +09:00
Dean Herbert
cb24957c62
Merge branch 'master' into reverse-arrow-fix 2018-06-19 20:06:37 +09:00
Dan Balasescu
c1c95dfe84
Merge pull request #2833 from peppy/update-configuration-names 
Update rider configuration names
 2018-06-19 18:42:41 +09:00
Dean Herbert
15f3a05c83 Update rider configuration names 2018-06-19 18:09:02 +09:00
Dean Herbert
b8f9caf418
Merge branch 'master' into multiplayer-match 2018-06-19 17:18:33 +09:00
Michael Manis
a0f1143287 Add padding to 'show more' button 2018-06-18 19:14:44 -04:00
Tom Arrow
4aa89de2d7 Fix reverse arrow displayed with incorrect angle 2018-06-18 17:22:01 +02:00
smoogipoo
8c671f93fc Always perform non-seeked scroll in the editor while audio is playing 2018-06-18 19:32:04 +09:00
smoogipoo
54e60d8bc2 Fix test appveyor tests failing due to lack of audio manager 2018-06-18 19:27:22 +09:00
smoogipoo
6d318d35ee Fix not being able to seek by other means during flick-scroll 2018-06-18 18:56:54 +09:00
smoogipoo
dbc50e35d5 Fix the timeline and editor fighting over track seeking 2018-06-18 18:02:26 +09:00
smoogipoo
01b909eaa7 Add testfixture annotation 2018-06-18 17:06:21 +09:00
smoogipoo
ffc5d7bd43 Fix some incorrect test case values 2018-06-18 17:05:04 +09:00
smoogipoo
0d154621b6 Cleanup testcase 2018-06-18 16:09:38 +09:00