RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,788 Commits 3 Branches 659 Tags 366 MiB
Commit Graph

152 Commits

Author SHA1 Message Date
HoLLy be6b5419c4 Remove uncommented line 
Didn't mean to push this
 2019-01-31 18:10:44 +01:00
HoLLy 30292f44da Fix Catch diffcalc being off 2019-01-31 17:57:59 +01:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo 2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
jorolf 41a0f9896e
Merge branch 'master' into flashlight-mod 2018-11-15 00:35:42 +01:00
smoogipoo d8e7ad8241 Fix post-rebase issues 2018-11-12 17:36:19 +09:00
smoogipoo 10543cf1b6 Move rest of ScrollingPlayfield into ScrollingRulesetContainer 2018-11-12 17:34:35 +09:00
smoogipoo ad45bc7666 Move scroll direction to scrollinginfo 2018-11-12 17:34:35 +09:00
smoogipoo 7f0f143a1b Move IScrollAlgorithm to ScrollingRulesetContainer + use DI 2018-11-12 17:34:35 +09:00
smoogipoo aee7a80e71 ScrollAlgorithm -> ScrollVisualisationMethod 2018-11-12 17:26:37 +09:00
jorolf 023924396d Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time 2018-11-11 18:38:12 +01:00
smoogipoo f66a9f4f1e Rename IScrollChangeVisualiser -> IScrollAlgorithm 2018-11-08 14:04:21 +09:00
smoogipoo 70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement 
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
#	osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
#	osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
#	osu.Game/Rulesets/UI/RulesetContainer.cs
 2018-10-16 17:28:16 +09:00
Dean Herbert ffbc88c1bf
Merge branch 'master' into fix-catch-scale 2018-10-12 20:56:37 +09:00
smoogipoo ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework 
# Conflicts:
#	osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
 2018-10-05 10:40:16 +09:00
smoogipoo d0007c047a PlayfieldLayer -> PlayfieldAdjustmentContainer 2018-10-05 10:39:18 +09:00
smoogipoo 540a010fbb Implement an intermediary EditRulesetContainer 2018-10-03 15:36:24 +09:00
Hanamuke 08f58047c2 Remade measurements, turns out the correction was not needed 2018-09-30 16:08:17 +02:00
smoogipoo cdeb4913c4 Adjust catcher size to match stable 2018-09-21 15:53:15 +09:00
smoogipoo c3fa7f167f Move aspect adjustments out of CatchPlayfield 2018-09-21 15:53:06 +09:00
smoogipoo 0bc2bcaf14 Remove GetAspectAdjustedSize() and PlayfieldArea 2018-09-21 15:14:49 +09:00
smoogipoo 26094ea325 Simplify + rename playfield layers in Osu/Catch 2018-09-21 15:01:58 +09:00
smoogipoo 368ceec47c Simplify creation of a playfield 2018-09-21 14:35:50 +09:00
smoogipoo 826dc6ceb7 Make Playfield not a ScalableContainer 2018-09-21 14:02:32 +09:00
Hanamuke 309d8c8cb4 CI 2018-09-19 18:43:39 +02:00
Hanamuke e7d78b94ae Remove ScrollingVisualisation from settings 2018-09-19 18:30:25 +02:00
Hanamuke e3cc25a96a Implement ConstantScrollingSpeedVisualiser 2018-09-18 20:21:10 +02:00
Dean Herbert 2d74c088ce Add newline 2018-09-15 17:03:51 +09:00
Hanamuke dd7f667fe3 Disable scrolling speed control for osu!catch 2018-09-15 00:18:42 +02:00
Hanamuke 9b6f5c9097 Fix redundant paranthesis 2018-09-13 17:29:10 +02:00
Hanamuke 7d3380db66 Fixed comment. Created static CatchArea.GetCatcheWidth method 2018-09-13 17:01:33 +02:00
Dean Herbert 65018705f4
Restore IsLoaded check 2018-09-06 13:09:57 +09:00
Dean Herbert c03d1d9566 Attempt to fix CI failures on CatcherArea.Explode 2018-09-06 10:14:23 +09:00
Dean Herbert 03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo 1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
smoogipoo 35b5aeb99a Fix missed rename 2018-08-06 12:23:08 +09:00
smoogipoo 5fd4ed2f4e Rename judgement-related methods/events + commenting 2018-08-06 10:55:25 +09:00
smoogipoo 9dff5cea07 Make Rulesets.Catch use the new judgement result structure 2018-08-02 20:37:07 +09:00
smoogipoo 71c49de031 Fix possible nullref if no fruits are ever caught 2018-07-26 21:00:18 +09:00
smoogipoo 827c5c4939 Remove scroll direction from ScrolingPlayfield constructor 2018-07-17 15:14:03 +09:00
Dean Herbert 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
Dean Herbert f1a35f77d2 Make bananas explode even on miss 2018-06-29 16:49:01 +09:00
Dean Herbert 0940715631
Merge branch 'master' into catch-scoring 2018-06-29 14:59:15 +09:00
Dean Herbert cc746c0dde Merge remote-tracking branch 'upstream/master' into ekrctb-catch-stable-hyper 2018-06-26 13:02:39 +09:00
Dean Herbert 96191fc3ce Move transition variable back to being local to function 2018-06-26 13:02:29 +09:00
ekrctb d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
smoogipoo afcf91a4c5 What the... 2018-06-21 13:12:22 +09:00
smoogipoo 9314f49bc3 Expose the catch width from the Catcher 2018-06-21 12:57:59 +09:00
ekrctb 9194fd8dfe don't expose HyperDashModifier directly 2018-06-20 20:08:27 +09:00