RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
40,165 Commits 4 Branches 650 Tags 351 MiB
Commit Graph

839 Commits

Author SHA1 Message Date
Dean Herbert 8e489754cc Add ability for `LegacySkin`s to customise the fallback provider 2021-05-31 21:29:47 +09:00
Dean Herbert 88ed95e012 Add `FindProvider` lookup function 2021-05-31 21:29:47 +09:00
Dean Herbert 1d30791ab0 Add potential pathway for legacy lookups 2021-05-31 21:29:47 +09:00
Dean Herbert 4b27d43e26 Add new parameter for default fallback logic in `LegacySkin` 2021-05-31 21:29:47 +09:00
Dean Herbert 17fa2426d4 Merge branch 'master' into legacy-skin-resource-improvements 2021-05-31 19:36:09 +09:00
Dean Herbert 65709ec7d7 Move leagcy resource store construction local to `DefaultLegacySkin` 2021-05-31 19:14:49 +09:00
Dean Herbert b16d10bd95 Provide game-wide resources via `IStorageResourceProvider` 2021-05-31 18:57:47 +09:00
Salman Ahmed fb81e5133f Merge branch 'master' into catch-hide-combo-workaround 2021-05-30 14:16:46 +03:00
Salman Ahmed 53cbf369d7 Fix potential nullref 2021-05-29 21:22:46 +03:00
Salman Ahmed 42618c713f
Merge branch 'master' into legacy-beatmap-skin-hud-fallback 2021-05-29 20:56:05 +03:00
Dean Herbert b36b40cb34 Remove unnecessary double specification 2021-05-26 15:20:47 +09:00
kamp 65649e5a62 Prevent skin editor crash when scaling 0 area drawables 
Some skinnable drawables can have 0 width or height in certain
cases, leading to division by 0 and a crash when the position is
updated.
 2021-05-24 21:36:42 +02:00
Dean Herbert caa2c5638e Fix legacy combo counter not accounting for song progress bar 2021-05-23 16:46:57 +09:00
Dean Herbert 45c6a9ca91 Merge branch 'refactor-selection-rotate-logic' into fix-flip-logic-discrepancy 2021-05-22 21:17:58 +09:00
Dean Herbert 7d88a19d7f Remove unnecessary field storage of origin reference 2021-05-22 21:03:40 +09:00
Dean Herbert 34a5b22b79 Merge branch 'master' into refactor-selection-rotate-logic 2021-05-22 20:52:28 +09:00
Dean Herbert 485728ca4e
Merge pull request #12866 from peppy/refactor-selection-scale-logic 
Add proper scaling support to skin editor
 2021-05-22 20:07:03 +09:00
Dean Herbert bb2fae55ce Merge branch 'master' into refactor-selection-rotate-logic 2021-05-21 19:19:54 +09:00
Dean Herbert 0d575f5728 Remove incorrect (and unintended) modulus logic 2021-05-21 15:06:53 +09:00
Dean Herbert f9d51656b6 Fix scaling of rotated items not behaving in an understandable way 2021-05-21 15:02:36 +09:00
Dan Balasescu 7845d07dd5
Merge pull request #12886 from peppy/fix-skin-editor-context-menu-sticking 
Fix skin editor context menus not dismissing when clicking away
 2021-05-20 21:03:35 +09:00
Dean Herbert 1848bd902d Fix skin editor context menus not dismissing when clicking away 2021-05-20 19:51:07 +09:00
Dean Herbert df5970fab4 Create base implementations of the two most common `TernaryStateMenuItem`s 2021-05-20 19:34:53 +09:00
Dean Herbert 20f1ef4318 Extract common implementation of updating drawable position from screen space pos 2021-05-20 18:35:13 +09:00
Dean Herbert 6f75c59760 Fix flip logic not using the full selection quad 2021-05-20 18:31:51 +09:00
Dean Herbert 95c78b9185 Split out common selection quad logic 2021-05-20 18:24:25 +09:00
Dean Herbert 27e81d6504 Implement proper rotation algorithm for skin editor 2021-05-20 18:21:16 +09:00
Salman Ahmed 43094425e2 Merge branch 'legacy-beatmap-skin-hud-fallback' into catch-hide-combo-workaround 2021-05-19 23:18:27 +03:00
Salman Ahmed 9f3ea150f5 Fix legacy beatmap skins not falling back properly on HUD components 2021-05-19 23:01:29 +03:00
Bartłomiej Dach 788f1fcf48
Merge branch 'master' into disable-skin-editor-border 2021-05-19 21:52:29 +02:00
Salman Ahmed 21ca9c8431 Merge branch 'master' into beatmap-skin 2021-05-19 22:39:32 +03:00
Dean Herbert eb5db8ff03 Disable border display on skin editor to avoid crashes 
This wasn't being displayed correctly anyway, so rather than fixing
let's just remove it for now.

Closes #12868.
 2021-05-20 02:01:46 +09:00
Dean Herbert 22337e0fc7 Add comment explaining why origin is flipped 2021-05-20 01:59:30 +09:00
Dean Herbert 363aec8179 Merge branch 'master' into hit-error-skinnable 2021-05-20 01:51:45 +09:00
Dean Herbert a55879e511 Fix oversights in scale algorithm 2021-05-20 01:47:31 +09:00
Dean Herbert 14af86d6c5 Use the same code path for all scaling 2021-05-19 21:46:41 +09:00
Dean Herbert 6a3c58b9ad Implement proper scaling algorithms 2021-05-19 19:58:55 +09:00
Salman Ahmed 825d61e22c Separate default beatmap skins from `DefaultSkin` 2021-05-19 12:06:10 +03:00
Salman Ahmed 9806d94b74 Move beatmap skin info creation to static method at `IBeatmapSkin` 2021-05-19 11:58:00 +03:00
Salman Ahmed c98d036b48 Merge branch 'master' into catch-hide-combo-workaround 2021-05-18 17:47:20 +03:00
Dean Herbert d661e98fa6 Move common functionality out of `OsuSelectionHandler` and implement flip support 2021-05-18 18:34:06 +09:00
Dean Herbert c80e736712 Change `SkinBlueprint` to use the origin point as the selection point 
Not sure how this feels, but it makes using the same point throughout
the editor possible, which I think is the correct way forward for now.
 2021-05-18 18:33:06 +09:00
Dean Herbert 10c730b37d Add new default locations for hit bar error displays 2021-05-18 15:50:50 +09:00
Salman Ahmed f667ea3fd0 Replace `AllowDefaultHUDComponentsFallback` with a temporary override at `LegacyBeatmapSkin` 2021-05-17 21:34:53 +03:00
Dan Balasescu ea4dfd3374
Merge pull request #12842 from peppy/song-progress-skinnable 
Add layout customisation support for `SongProgress`
 2021-05-17 20:15:01 +09:00
Dean Herbert 42d2711dc6 Use `ShouldBeConsideredForInput` instead of `ReceivePositionalInputAtSubTree` 2021-05-17 19:29:59 +09:00
Dean Herbert 60f3e628bc Fix song progress being interactable inside toolbox button 2021-05-17 19:05:22 +09:00
Dean Herbert da0913ca2d Make `SongProgress` a skinnable component 2021-05-17 18:52:56 +09:00
smoogipoo 0d7a349500 Exclude interfaces from skinnable types 2021-05-17 18:16:09 +09:00
Salman Ahmed 4c25fe750f Disallow beatmap skin to fall back to default HUD components 
This should become a more generalized `AllowDefaultSkinFallback` when default legacy skin fallback is supported.
 2021-05-15 14:32:16 +03:00