RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,271 Commits 3 Branches 658 Tags 355 MiB
Commit Graph

1406 Commits

Author SHA1 Message Date
Salman Ahmed dfabed3d85
Merge branch 'master' into applicable-to-hud 2019-07-06 16:30:02 +03:00
Dean Herbert cc9a28afa8 Add shared base class for both mod imlpementations 2019-07-03 19:42:16 +09:00
Dean Herbert e95586857e Merge remote-tracking branch 'upstream/master' into deflate-branch 2019-07-03 19:26:21 +09:00
Dean Herbert 9bed0094de Merge remote-tracking branch 'upstream/master' into android 2019-07-02 19:40:50 +09:00
Salman Ahmed 744e651a37
Merge branch 'master' into applicable-to-hud 2019-07-02 05:24:56 +03:00
Salman Ahmed a8e8650ddd Move blocking fail logic into a base class 2019-07-02 01:47:39 +03:00
MaxOhn 48a828b746 Removed redundant imports and fixed indentation 2019-07-01 17:49:37 +02:00
MaxOhnh 02b9e89f43 Removed old unnecessary change, updated license header and apply deflating onto first object regardless 2019-07-01 14:46:17 +02:00
MaxOhnh cd5e1bc4b1 Replace deflate progress with modified copy-paste of grow mod 2019-07-01 13:55:09 +02:00
MaxOhnh 93b780c9a8 Resolved merge 2019-07-01 13:53:40 +02:00
Salman Ahmed d11b799571 Add explaining comment 2019-06-30 18:28:20 +03:00
Salman Ahmed f42ded3437 Move to DrawableOsuHitObject 2019-06-30 18:27:47 +03:00
Dean Herbert 60ea3d4e1a Fix skinning support for combobreak 2019-06-30 21:58:30 +09:00
iiSaLMaN 9c9334a8ba Hide health bar in relax mod 2019-06-29 04:26:24 +03:00
Albert Tang 3cf2ffc1a7
Merge branch 'master' into android 2019-06-25 17:54:23 -05:00
smoogipoo 0d98d637b6 Fix cursor expansion state potentially being incorrect 2019-06-25 15:47:54 +09:00
Dean Herbert aca9289d89 Use SkinnableSprite for approach circle 2019-06-24 15:17:56 +09:00
Shane Woolcock 17d103181c Merge branch 'master' into android 2019-06-18 20:05:14 +09:30
Dean Herbert b29b1bf254
Merge branch 'master' into mod-grow-improvement 2019-06-12 13:18:02 +09:00
Dean Herbert 00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +09:00
Dean Herbert d2e42b38fc Merge remote-tracking branch 'smoogipoo/cursortrail-vertexbatch' into update-framework 2019-06-11 19:25:25 +09:00
Dean Herbert 5c2c4f0ada
Merge pull request #4878 from HoLLy-HaCKeR/expose-skills 
Expose skills in DifficultyAttributes
 2019-06-11 18:47:56 +09:00
Arphox 07e17518e9 Fix all "Maintainability" CodeFactor issues 2019-06-11 10:28:16 +02:00
Dean Herbert 609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
smoogipoo 2b768bef96 Make CursorTrail use VertexBatch 2019-06-10 20:29:01 +09:00
Albert Tang 62639d347f Merge branch 'master' into android 2019-06-09 21:03:48 -05:00
Dean Herbert 8cdcf251b5 Make local bindable private 2019-06-09 16:30:04 +09:00
Ganendra Afrasya afc3a08953 Use existing setting instead 
Now it read IncreaseFirstObjectVisibility bindable instead
 2019-06-09 13:11:40 +07:00
Ganendra Afrasya 8ac64b5c16 Make first object not applying custom state 2019-06-08 01:46:05 +07:00
Dean Herbert ff6943e170
Merge branch 'master' into fix-cursor 2019-06-07 10:43:21 +09:00
David Zhao e2118299e9 update comment 2019-06-07 10:36:36 +09:00
David Zhao ac9a3e54a6 Fix cursor issue with stopped gameplay clock 2019-06-06 18:12:59 +09:00
smoogipoo c7d0fcd42a Update drawnodes 2019-06-06 16:49:35 +09:00
smoogipoo ae438213a5 Remove secondary buffered container from slider body 2019-06-06 16:32:43 +09:00
HoLLy 7e9f5a0939 Add Skills to DifficultyAttributes 2019-05-29 11:22:51 +02:00
tangalbert919 07e550a950 Merge branch 'master' into android 2019-05-28 09:08:44 -05:00
smoogipoo cbf662eb56 Remove redundant else statement 2019-05-15 10:55:02 +09:00
Alten 37ec722a1d Shorten code 2019-05-14 16:18:46 -04:00
Alten ad5ad8ccb5 Fix hard crash 2019-05-13 23:29:24 -04:00
Dean Herbert be6da833f8 Move constant local (and break line) 2019-05-14 11:11:57 +09:00
HoLLy 1809c996bb Use Interpolation.ValueAt instead of manually interpolating FL position. 2019-05-13 12:09:19 +02:00
HoLLy f7806bc205 Add smoothing to flashlight movement 2019-05-13 01:33:41 +02:00
Dean Herbert daa2786dbd Use a constant for the default value 2019-05-12 23:08:42 +09:00
Dean Herbert 487a56549e Fix CI issues 2019-05-12 22:53:12 +09:00
Dean Herbert ce0e4c506e
Merge branch 'master' into dev 2019-05-12 21:45:52 +09:00
Dean Herbert b8446fb67f Fix fallbacks for SliderTrackOverride and SliderBall too 2019-05-12 18:51:31 +09:00
Dean Herbert cbf126db25
Merge branch 'master' into fix-slider-border-color 2019-05-12 17:25:49 +09:00
tangalbert919 6fd1eb5e08 Merge remote-tracking branch 'upstream/master' into android 2019-05-08 08:15:03 -05:00
smoogipoo 117f8bdd01 Merge remote-tracking branch 'Joehuu/master' into flashlight-dim 2019-05-08 13:25:01 +09:00
smoogipoo 13b9b04bb8 Apply more cases/fix some existing ones 2019-05-07 13:23:09 +09:00