RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,353 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

14353 Commits

Author SHA1 Message Date
WebFreak001 91b25870ef Make fruit catcher enter and leave what's behind the blinds 2018-09-16 12:48:36 +02:00
WebFreak001 5f3c0549c9 Sprites in blinds mod & gameplay improvements 
There are now skinnable actual blinds (shoji screen panels)
The black overlay is still behind them to avoid cheating with skins
The blinds don't open linearly anymore, they are health squared now
When easy mod is on, there is always a little gap open
 2018-09-15 23:44:22 +02:00
WebFreak001 040a44d42c Merge branch 'master' of github.com:WebFreak001/osu into mod-fl2 2018-09-15 20:12:06 +02:00
Dean Herbert b17bd6aaaa
Merge pull request #3438 from peppy/fix-new-inspections 
Fix new resharper redundant parenthesis inspections
 2018-09-16 00:16:39 +09:00
Dean Herbert 00d0613053 Fix new resharper redundant parenthesis inspections 2018-09-16 00:09:17 +09:00
Dean Herbert a34b0d67f8
Merge pull request #3435 from plankp/patch-1 
Make Transform and Wiggle incompatible with each other
 2018-09-15 23:59:48 +09:00
Paul Teng 1a8665864c Remove redundant explicit array type info 2018-09-15 08:55:29 -04:00
Paul Teng 3e02a36938
Make Wiggle incompatible with Transform 2018-09-15 08:43:22 -04:00
Paul Teng 92c6b570ea
Make Transform incompatible with Wiggle 2018-09-15 08:42:04 -04:00
Dean Herbert 8cb0b5e98d
Merge pull request #3423 from peppy/update-squirrel 
Bump squirrel version
 2018-09-15 19:07:00 +09:00
Dean Herbert 6a1e2c6fa5 Update efcore packages 2018-09-15 18:49:01 +09:00
Dean Herbert 39a6bcba17 Merge remote-tracking branch 'upstream/master' into update-squirrel 2018-09-15 18:45:19 +09:00
Dean Herbert 9a88e09eb0
Merge pull request #3388 from peppy/fix-logo-overhead 
Fix osu! logo being present throughout the whole game
 2018-09-15 18:44:12 +09:00
Dean Herbert 41be757a11
Merge branch 'master' into fix-logo-overhead 2018-09-15 18:33:22 +09:00
Dean Herbert 7fa6b4154e
Merge pull request #3427 from Hanamuke/disable_scroll_control_catch 
Disable scrolling speed control for osu!catch
 2018-09-15 18:31:47 +09:00
Dean Herbert 511f129ee1 Merge remote-tracking branch 'upstream/master' into disable_scroll_control_catch 2018-09-15 17:03:57 +09:00
Dean Herbert 2d74c088ce Add newline 2018-09-15 17:03:51 +09:00
Dean Herbert d18a86c5a7
Merge pull request #3100 from UselessToucan/replay_keycounter 
Restore key counters state on replay rewinding
 2018-09-15 16:59:41 +09:00
Dean Herbert 79b56cb35c Make saveState private 2018-09-15 16:34:08 +09:00
Dean Herbert 7b57439976 Add proper testing 2018-09-15 16:25:37 +09:00
Dean Herbert e636cfe79e Fix dynamic compilation not working 2018-09-15 16:24:06 +09:00
Dean Herbert 65b2bceef2 Simplify implementation 2018-09-15 14:51:04 +09:00
Hanamuke dd7f667fe3 Disable scrolling speed control for osu!catch 2018-09-15 00:18:42 +02:00
Dean Herbert 1662575f88
Merge branch 'master' into replay_keycounter 2018-09-14 19:08:54 +09:00
Dean Herbert 7a2d83d807
Merge pull request #3140 from miterosan/ArrangeMod 
Add "transform" mod
 2018-09-14 19:07:21 +09:00
Dean Herbert 328de07615
Merge branch 'master' into ArrangeMod 2018-09-14 18:58:00 +09:00
Dean Herbert 14c2aec53e Merge remote-tracking branch 'upstream/master' into ArrangeMod 2018-09-14 18:48:32 +09:00
Dean Herbert ccabad60fb
Merge pull request #3419 from peppy/fix-system-user 
Fix system user attempting to show in profile overlay
 2018-09-14 18:46:22 +09:00
Dean Herbert bf10561052
Merge pull request #3362 from MaxOhn/wiggle-branch 
Add "wiggle" mod
 2018-09-14 18:30:14 +09:00
Dean Herbert ec6185cd31 Reduce random allocations 2018-09-14 18:21:12 +09:00
Dean Herbert ef31698f56 Further code tidying 2018-09-14 18:21:12 +09:00
Dean Herbert 00daaef27a Use a slightly more suiting icon 2018-09-14 18:21:12 +09:00
Dean Herbert 9d94aa4e62 Fix formatting and constants 2018-09-14 18:21:12 +09:00
MaxOhn b1f6828a1a Added OsuModWiggle class and adjusted OsuRuleset.cs 2018-09-14 18:21:11 +09:00
Dean Herbert da8b838438
Merge branch 'master' into ArrangeMod 2018-09-14 17:20:04 +09:00
Dean Herbert a1328fb4e5
Merge branch 'master' into fix-system-user 2018-09-14 17:19:17 +09:00
Dan Balasescu 7a9fe15a27
Merge pull request #3416 from Hanamuke/fix_hyperdash 
Fixes hyperdash computation (for nested objects)
 2018-09-14 11:36:42 +09:00
Dan Balasescu e9a522023b
Merge branch 'master' into fix_hyperdash 2018-09-14 11:27:27 +09:00
Dean Herbert f280e910bb Bump squirrel version 2018-09-14 04:26:30 +09:00
Dean Herbert e430a3dd6a
Merge pull request #3414 from smoogipoo/judgement-fixes 
Fix hitobjects getting masked away before receiving a result
 2018-09-14 04:25:09 +09:00
Dean Herbert c6b909e4a5
Merge branch 'master' into judgement-fixes 2018-09-14 04:03:54 +09:00
Hanamuke 9b6f5c9097 Fix redundant paranthesis 2018-09-13 17:29:10 +02:00
Hanamuke 7e07a07c01 Fix HitObjects being out of order because of nested objects 2018-09-13 17:15:46 +02:00
Hanamuke 7d3380db66 Fixed comment. Created static CatchArea.GetCatcheWidth method 2018-09-13 17:01:33 +02:00
Hanamuke 623f8bfaf5 Merge branch 'master' into fix_hyperdash 2018-09-13 16:52:55 +02:00
Dean Herbert 4341d258af Make readonly instead 2018-09-13 14:03:21 +09:00
Dean Herbert 0be3ba946f Fix system user attempting to show in profile overlay 2018-09-13 13:40:46 +09:00
Dean Herbert 40f7c1bd99
Merge pull request #3411 from smoogipoo/texture-dispose-fix 
Reference whether texture is available rather than disposed
 2018-09-13 13:15:27 +09:00
smoogipoo 067bc39185 Update nuget package 2018-09-13 12:47:26 +09:00
Dan Balasescu 96b4cb7821
Merge branch 'master' into texture-dispose-fix 2018-09-13 11:54:23 +09:00