Commit Graph

41259 Commits

Author SHA1 Message Date
1757b9c3e7 Merge branch 'master' into fruit-piece-in-place 2020-12-08 17:42:34 +09:00
67e0f02665 Merge pull request #11123 from ekrctb/catcher-on-result
Move catcher state changing logic to OnNewResult and OnRevertResult
2020-12-08 17:42:18 +09:00
22a5df6309 Clear all transforms of catcher trail sprite before returned to pool 2020-12-08 17:31:00 +09:00
4d5c242d35 Use virtual property instead of a field for optional pieces 2020-12-08 17:15:40 +09:00
9d926de944 Fix test failure 2020-12-08 17:04:30 +09:00
603cecb2eb Make CatchHitObjectPiece abstract class 2020-12-08 17:02:57 +09:00
17d48c82f6 Use switch statement instead of an array 2020-12-08 16:59:06 +09:00
197a787f77 Merge pull request #11115 from peppy/archive-model-manager-stream-import-support
Add the ability to import into ArchiveModelManagers from a stream
2020-12-08 16:45:07 +09:00
f9afb7f335 Merge branch 'master' into archive-model-manager-stream-import-support 2020-12-08 16:11:11 +09:00
02571ec7ae Remove hit explosion on revert result 2020-12-08 15:43:17 +09:00
1a66d8f2bc Remove caught objects on revert result 2020-12-08 15:24:39 +09:00
100b365c98 Restore hyper dash state on revert judgement result 2020-12-08 15:21:47 +09:00
cb76a2d7b5 Restore catcher state on revert judgement result 2020-12-08 15:03:03 +09:00
0213f77b4b Move catcher state changing logic to OnNewResult method 2020-12-08 14:28:30 +09:00
88db7823b2 Merge pull request #11119 from smoogipoo/rework-multi-filtercontrol 2020-12-08 13:15:42 +09:00
58d7e41978 Enable nullable on ImportTask 2020-12-08 12:52:34 +09:00
c3cb82489b Merge pull request #11107 from Xexxar/ar11-nerf
osu! PerformanceCalc Short Map AR11 Nerf
2020-12-08 12:51:26 +09:00
77279a7e56 Update stale xmldoc on import method
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-12-08 12:48:59 +09:00
57b7ef88e2 Fix spacing 2020-12-08 12:12:53 +09:00
4da6717d0e Rename things in PulpFormation 2020-12-08 10:33:18 +09:00
3cbdaf5960 Make resolved properties protected 2020-12-08 10:30:23 +09:00
6002014f95 Change underlyingstorage to alltournaments for clarity 2020-12-07 22:07:54 +01:00
f980f41324 Address review 2020-12-07 21:38:15 +01:00
c778646f10 Add support for importing replay files. 2020-12-07 18:01:57 +01:00
10c1823534 Remove now unused files 2020-12-07 22:07:11 +09:00
34f3672750 Make ctor protected 2020-12-07 22:04:41 +09:00
f599427080 Implement TimeshiftFilterControl 2020-12-07 22:04:35 +09:00
1b3836aeef Re-implement multiplayer FilterControl 2020-12-07 21:59:26 +09:00
5be0672fe9 Split out enums 2020-12-07 21:54:42 +09:00
c36551227e Merge pull request #11117 from smoogipoo/max-room-name-length
Limit room name to 100 characters
2020-12-07 21:20:31 +09:00
191f863a49 Remove unncessary words from the description 2020-12-07 13:14:59 +01:00
eda6e1fbdd Add tournament switching in the UI 2020-12-07 13:11:13 +01:00
fa65874763 Limit room name to 100 characters 2020-12-07 21:09:38 +09:00
b2e5658d23 Merge branch 'master' into fruit-piece-in-place 2020-12-07 18:57:42 +09:00
87da6b3270 Merge pull request #11113 from ekrctb/fix-scrolling-wrong-layout-one-frame
Fix scrolling hit object displayed in wrong position for one frame
2020-12-07 18:48:24 +09:00
fb599e0746 Merge pull request #11114 from ekrctb/pool-catcher-trail
Pool catcher trail sprite
2020-12-07 18:48:08 +09:00
cdc7ef8c15 Merge pull request #10925 from peppy/fix-multiple-playback-on-skin-change
Fix skinnable sounds playing more than once on skin change
2020-12-07 18:45:19 +09:00
86cf42d610 Merge pull request #11091 from ekrctb/move-piece-files
Move `Piece*` classes under `Skinning` namespace
2020-12-07 18:42:19 +09:00
8eb1076fd7 Add test coverage 2020-12-07 18:18:14 +09:00
12c6b3c1fb Pool catcher trail sprite 2020-12-07 18:12:55 +09:00
eb38bc4b4c Add the ability to import into ArchiveModelManagers from a stream 2020-12-07 18:09:18 +09:00
a548269c34 Fix scrolling hit object displayed in wrong position for one frame 2020-12-07 17:26:12 +09:00
a5e2509d52 Merge pull request #11105 from Joehuu/mod-settings-fade-in/out
Add fade in/out animations to mod settings container
2020-12-07 17:12:29 +09:00
9cd3cec041 Merge pull request #11111 from ekrctb/fix-mouse-settings-null-reference 2020-12-07 16:55:05 +09:00
454e94574c Add corner rounding and positional transform 2020-12-07 16:43:07 +09:00
7253866e17 Move customisation panel to be in same area as main content 2020-12-07 16:42:55 +09:00
f4eb17d398 Update osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
Set mouse confine mode at initialization

Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-12-07 16:09:14 +09:00
2469608c10 Fix possible null reference due to bindable change before variable is initialized 2020-12-07 15:19:18 +09:00
c1d39b6401 Don't inherit Fruit from Banana 2020-12-07 14:10:17 +09:00
7f1ad1040d Don't inherit DrawableFruit from DrawableBanana
- A banana cannot be hyper
2020-12-07 14:08:50 +09:00