smoogipoo
|
706e884cc0
|
Update accent colour on combo index change
|
2019-09-26 17:13:13 +09:00 |
|
Dean Herbert
|
a06cb54732
|
Merge branch 'master' into beatmap-parsing-fallback-v2
|
2019-09-20 15:28:08 +09:00 |
|
Dean Herbert
|
3fa1b53b2a
|
Add back combo colours for osu!classic
|
2019-09-19 12:39:15 +09:00 |
|
Bartłomiej Dach
|
11eda44d34
|
Migrate decoding to line-buffered reader
Migrate all usages of StreamReader in the context of decoding beatmaps,
storyboards or skins to the new LineBufferedReader.
|
2019-09-15 01:28:07 +02:00 |
|
Dean Herbert
|
6760e239a1
|
Fix osu! hitcircle font textures being incorrectly sized
|
2019-09-11 13:39:21 +09:00 |
|
Dean Herbert
|
f4f9519761
|
Add todo comment
|
2019-09-06 12:16:20 +09:00 |
|
Dean Herbert
|
a0aeccf232
|
Fix fallback to default combo colours not working
|
2019-09-05 23:24:13 +09:00 |
|
smoogipoo
|
90985b6af6
|
Add missing license header
|
2019-09-05 17:01:14 +09:00 |
|
smoogipoo
|
bda21998c4
|
Add helper method to make direct casts be used
|
2019-09-05 16:48:56 +09:00 |
|
Dean Herbert
|
c0bcbfd892
|
Merge branch 'master'
Conflicts:
osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
|
2019-09-05 14:40:30 +09:00 |
|
Dean Herbert
|
6197c7fd31
|
Add automatic resource mapping for rulesets to their own dll
|
2019-09-04 20:29:28 +09:00 |
|
Dean Herbert
|
8ea82123e4
|
Fix nullref on test disposal
|
2019-09-04 15:59:09 +09:00 |
|
Dean Herbert
|
2983918f71
|
Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor
|
2019-09-04 13:40:41 +09:00 |
|
Dean Herbert
|
f655cd4516
|
Fix parsing of null configuration elements
|
2019-09-04 13:30:46 +09:00 |
|
Dean Herbert
|
04c2c33c64
|
Allow LegacySkin to be constructed with all nulls
|
2019-09-04 13:29:55 +09:00 |
|
Dean Herbert
|
f58ca82398
|
Don't include section for now
|
2019-09-03 18:56:01 +09:00 |
|
Dean Herbert
|
002de80c30
|
Add xmldoc to ISkin
|
2019-09-03 18:30:22 +09:00 |
|
Dean Herbert
|
097012dc95
|
Move slider ball colouring to DefaultLegacySkin for now
|
2019-09-03 18:05:16 +09:00 |
|
Dean Herbert
|
bebc3309ce
|
Refactor skin configuration to be infinitely extensible
|
2019-09-03 17:57:34 +09:00 |
|
Dean Herbert
|
d1cdf49dd5
|
Revert SkinnableSprite lookups to old behaviour
|
2019-09-03 14:21:54 +09:00 |
|
Dean Herbert
|
0261456d5a
|
Merge branch 'master' into play-to-gameplay
|
2019-09-03 11:42:15 +09:00 |
|
Dean Herbert
|
09097f7680
|
Merge branch 'master' into iskincomponent
|
2019-09-02 22:38:57 +09:00 |
|
Dean Herbert
|
b460f76fa6
|
Adjust file spacing slightly
|
2019-09-02 19:01:43 +09:00 |
|
Dean Herbert
|
0bfe4650c3
|
Early return if no change occurred in looping value
|
2019-09-02 19:01:17 +09:00 |
|
Dean Herbert
|
f08b523abf
|
Name tuple items
|
2019-09-02 18:20:30 +09:00 |
|
Dean Herbert
|
9c53430a0f
|
Only initialise when required
|
2019-09-02 18:18:59 +09:00 |
|
Dean Herbert
|
eaeecfb300
|
Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound
|
2019-09-02 18:15:17 +09:00 |
|
Dean Herbert
|
f9fcf1562f
|
Merge remote-tracking branch 'upstream/master' into iskincomponent
|
2019-09-02 14:21:02 +09:00 |
|
Dean Herbert
|
d2a3e0581b
|
Fix legacy decoder using wrong configuration
|
2019-08-31 13:27:03 +09:00 |
|
Dean Herbert
|
12eeec36fc
|
Fix ruleset skins incorrectly providing configuration defaults
|
2019-08-31 12:33:29 +09:00 |
|
Dean Herbert
|
3aa2ece49b
|
Merge branch 'iskincomponent' into play-to-gameplay
|
2019-08-30 15:29:55 +09:00 |
|
Dean Herbert
|
fe90e194e3
|
Remove redundant qualifier
|
2019-08-30 15:29:44 +09:00 |
|
Dean Herbert
|
70e417533f
|
Update naming
|
2019-08-30 15:13:29 +09:00 |
|
Dean Herbert
|
a7c94c3883
|
Simplify hit result lookups
|
2019-08-30 15:12:03 +09:00 |
|
Dean Herbert
|
a15828ab25
|
Introduce the concept of SkinComponents
Removes reliance on string lookups and better defines elements for introduction into database
|
2019-08-30 14:55:52 +09:00 |
|
Dean Herbert
|
8f9fe99237
|
Move SliderFollowCircle implementation
|
2019-08-30 14:40:36 +09:00 |
|
Dean Herbert
|
71192791d5
|
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
|
2019-08-30 14:12:56 +09:00 |
|
Dean Herbert
|
c389a5c798
|
Move remaining osu-specific implementations to OsuLegacySkin
|
2019-08-30 13:42:29 +09:00 |
|
Dean Herbert
|
7bba8ca14b
|
Split out nested classes
|
2019-08-30 13:04:11 +09:00 |
|
Dean Herbert
|
84e4748268
|
Remove duplicate getAnimation function and improve namespacing
|
2019-08-30 12:59:58 +09:00 |
|
Dean Herbert
|
bfbec067b1
|
Remove remnants of user skin PR
|
2019-08-30 11:54:36 +09:00 |
|
iiSaLMaN
|
06224a7d4e
|
Fix build issue
|
2019-08-29 15:38:33 +03:00 |
|
iiSaLMaN
|
ec6a40af33
|
Add adjustments on channel creation if there is
|
2019-08-29 15:32:21 +03:00 |
|
Dean Herbert
|
40c1c6072e
|
Add "osu!classic" as a bundled skin choice
|
2019-08-29 16:39:42 +09:00 |
|
iiSaLMaN
|
3d62003382
|
Add null check
|
2019-08-28 15:39:45 +03:00 |
|
Dean Herbert
|
01aede3e29
|
Add comprehensive skin fallback integration testing
|
2019-08-28 19:57:17 +09:00 |
|
iiSaLMaN
|
2f3fb8cf88
|
Add Stop + RemoveAdjustment functions
|
2019-08-28 13:10:11 +03:00 |
|
iiSaLMaN
|
cb8fe89b8b
|
Allow setting looping to existing channels
|
2019-08-28 13:09:53 +03:00 |
|
iiSaLMaN
|
d1cbd11d28
|
Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound
|
2019-08-28 13:09:07 +03:00 |
|
Dean Herbert
|
7ea55a5cdd
|
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
|
2019-08-28 16:36:20 +09:00 |
|
Dean Herbert
|
1aa09ff05c
|
Merge pull request #5795 from iiSaLMaN/allow-fallback-to-samples-without-bank
Try retrieving samples without bank names
|
2019-08-28 13:12:51 +09:00 |
|
Dean Herbert
|
4add1727b7
|
Fix hitsounds not updating immediately after switching skins
|
2019-08-28 03:25:57 +09:00 |
|
iiSaLMaN
|
18431a42e6
|
Resolve merge conflicts
|
2019-08-27 20:06:17 +03:00 |
|
iiSaLMaN
|
4ef991b973
|
Loop over lookup names on default-samples retrieval
|
2019-08-27 19:42:17 +03:00 |
|
Dean Herbert
|
7ccc409df7
|
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
|
2019-08-27 18:27:26 +09:00 |
|
Dean Herbert
|
7aeeb65ae7
|
Tidy up Player's container loading logic
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
|
2019-08-27 18:27:21 +09:00 |
|
Dean Herbert
|
0ea10a4922
|
Fix skin sample reading failing
|
2019-08-27 17:18:32 +09:00 |
|
Dean Herbert
|
66223b9954
|
Merge branch 'master' into allow-fallback-to-samples-without-bank
|
2019-08-27 14:44:16 +09:00 |
|
Dean Herbert
|
62641c149d
|
Fx component lookups being incorrect for non-databased legacy skins
|
2019-08-26 18:20:45 +09:00 |
|
Dean Herbert
|
5e362d10b1
|
Add ruleset-specific legacy skin providers
This moves implementation of osu! skinnables to OsuLegacySkin.
|
2019-08-26 12:21:49 +09:00 |
|
Dean Herbert
|
de2c6aa23d
|
Rename and expand usability of SkinProvidingContainer
|
2019-08-26 12:21:11 +09:00 |
|
iiSaLMaN
|
0bcd323d17
|
Remove unnecessary string literal
|
2019-08-24 09:30:43 +03:00 |
|
iiSaLMaN
|
da72806693
|
Remove lookup logic from SkinnableSound
|
2019-08-23 14:55:38 +03:00 |
|
iiSaLMaN
|
d8535574d1
|
Pass sample info to Skin.GetSample
|
2019-08-23 14:32:43 +03:00 |
|
iiSaLMaN
|
66d8440167
|
Move non-bank samples logic to LegacySkin
|
2019-08-22 12:50:47 +03:00 |
|
iiSaLMaN
|
87f3184fcc
|
Try retrieving samples without bank names
Fallback for spinner bonus samples
|
2019-08-21 15:14:33 +03:00 |
|
Dean Herbert
|
28dfe072a5
|
Update one more blending mode change post-master merge
|
2019-08-21 15:11:46 +09:00 |
|
Dean Herbert
|
4186d2566a
|
Remove unnecessary null checks
|
2019-08-21 15:11:33 +09:00 |
|
Dean Herbert
|
745bd58f37
|
Merge remote-tracking branch 'upstream/master' into update-framework-blending
|
2019-08-21 15:10:08 +09:00 |
|
Dean Herbert
|
444f2b9387
|
Specify font size in a saner way
|
2019-08-21 15:01:50 +09:00 |
|
Dean Herbert
|
6a48819055
|
Merge branch 'master' into update-framework-blending
|
2019-08-21 14:27:57 +09:00 |
|
Dean Herbert
|
cca64771dd
|
Add comment about placement of default loading
|
2019-08-21 13:56:49 +09:00 |
|
Dean Herbert
|
aa8b7b60de
|
Merge remote-tracking branch 'upstream/master' into update-framework-blending
|
2019-08-21 13:30:24 +09:00 |
|
Dan Balasescu
|
82fe506f97
|
Merge branch 'master' into animated-legacy-skins
|
2019-08-21 13:03:11 +09:00 |
|
smoogipoo
|
0de219dda4
|
Update with spritetext text builder changes
|
2019-08-20 19:03:57 +09:00 |
|
Dean Herbert
|
4bffb0df84
|
Merge branch 'animated-legacy-skins' into animated-slider-ball
|
2019-08-20 18:14:17 +09:00 |
|
Dean Herbert
|
6dd638b327
|
Further improve legibility of texture lookup
|
2019-08-20 17:39:24 +09:00 |
|
Dean Herbert
|
84530b7839
|
Colour the correct layer
|
2019-08-20 15:02:07 +09:00 |
|
Dean Herbert
|
f7ce7c7d99
|
Merge branch 'fix-skin-test-regression' into animated-slider-ball
|
2019-08-20 14:09:53 +09:00 |
|
Dean Herbert
|
3b7cee2d45
|
Fix LegacySkin not checking for @2x hitcircle when deciding sizing
|
2019-08-20 13:50:16 +09:00 |
|
Dean Herbert
|
b5cb59faf2
|
Add default skin sprites and specular/diffuse layer support
|
2019-08-20 13:19:32 +09:00 |
|
Dean Herbert
|
d0766fa1cd
|
Add slider ball animation support
|
2019-08-19 19:55:47 +09:00 |
|
Dean Herbert
|
539a27a557
|
Refactor texture lookup code
|
2019-08-19 19:23:54 +09:00 |
|
Dean Herbert
|
d02b8d14f7
|
Avoid unnecessary texture retrieval for non-animated sprites
|
2019-08-19 17:47:59 +09:00 |
|
Dean Herbert
|
d224405bc6
|
Rename const and make more available
|
2019-08-19 17:46:05 +09:00 |
|
Dean Herbert
|
4356f2ef9f
|
Add sample usage of looping skinnable
|
2019-08-19 17:45:54 +09:00 |
|
iiSaLMaN
|
cfa569b226
|
Add looping field and fix build
|
2019-08-15 05:35:47 +03:00 |
|
iiSaLMaN
|
07e7e1187c
|
Add adjustment function in SkinnableSound
|
2019-08-15 05:30:35 +03:00 |
|
Dean Herbert
|
bc49164cc1
|
Merge branch 'master' into animated-legacy-skins
|
2019-08-13 00:40:20 +09:00 |
|
smoogipoo
|
5486c77362
|
Remove explicit autosize
|
2019-08-09 15:25:42 +09:00 |
|
Dean Herbert
|
ec13143ab3
|
Add further xmldoc
|
2019-08-07 18:45:56 +09:00 |
|
jorolf
|
7b95741dab
|
fix crash and add some tests
- still missing special skin textures
|
2019-07-31 21:55:56 +02:00 |
|
jorolf
|
e01d3d85a3
|
Merge branch 'master' of git://github.com/ppy/osu into animated-legacy-skins
|
2019-07-30 20:29:04 +02:00 |
|
Dean Herbert
|
9335ebeb55
|
Fix missing anchor/origin specification
|
2019-07-30 23:45:55 +09:00 |
|
Dean Herbert
|
f6b6fa9633
|
Add disappeared null check
|
2019-07-30 23:44:47 +09:00 |
|
Dean Herbert
|
f9c95e21be
|
Merge remote-tracking branch 'upstream/master' into legacy-cursor-middle
|
2019-07-30 23:44:13 +09:00 |
|
Dean Herbert
|
21a8f566c3
|
Trim whitespace
|
2019-07-30 23:24:28 +09:00 |
|
Dean Herbert
|
d12de7dbfa
|
Add temporary scale hack to make cursors correct size
|
2019-07-30 23:20:35 +09:00 |
|
Dean Herbert
|
8e9f8bb565
|
Merge branch 'master' into slider-ball-scaling
|
2019-07-30 23:19:28 +09:00 |
|
Dean Herbert
|
fbc5285a1f
|
Add legacy skin hit animations (#5464)
Add legacy skin hit animations
|
2019-07-30 23:18:12 +09:00 |
|