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

1531 Commits

Author SHA1 Message Date
Dean Herbert b2667bbb02 Move protected implementation down 2020-05-22 11:45:58 +09:00
Dean Herbert 6de2597958 Merge branch 'editor-position-snap' into mania-distance-snap-grid 2020-05-22 11:27:36 +09:00
Dean Herbert 8a105bdbcf Remove unused ColumnAt method 2020-05-22 11:23:39 +09:00
Dean Herbert 7dd3b3eeb5 Remove unused method 2020-05-21 15:16:59 +09:00
Dean Herbert a756e6d212 Add xmldoc and remove unnecessary parameter 2020-05-21 15:16:30 +09:00
Dean Herbert ce8b6b7383 Correctly account for blueprint origins 2020-05-21 15:15:24 +09:00
Dean Herbert a9a1c00cf1 Move responsibility placement blueprint's StartTime set to within 2020-05-21 14:50:33 +09:00
Dean Herbert bac78707de Move more logic to column to both clean things up and fix tests 2020-05-21 14:25:37 +09:00
Dean Herbert 5ad7842b91 Move ScreenSpacePositionAtTime to inside Column implementation 2020-05-21 13:33:02 +09:00
Dean Herbert 94bb59db0d Merge branch 'editor-position-snap' into mania-distance-snap-grid 2020-05-21 12:50:49 +09:00
Dean Herbert 83a5913b8d Undo beat snapping related changes 2020-05-21 12:12:21 +09:00
Dean Herbert 69db62b78a Combine implementation of time-to-position lookup 2020-05-20 21:42:21 +09:00
Dean Herbert 63b5f1a376 Remove unnecessary IRequireHighFrequencyMousePosition 2020-05-20 21:14:20 +09:00
Dean Herbert e3cec9cf6c Simplify column assignment 2020-05-20 21:13:08 +09:00
Dean Herbert 7c9fbb6fcf Split out classes 2020-05-20 21:03:03 +09:00
Dean Herbert 19e2da9c73 Fix down scrolling giving incorrect positioning data 2020-05-20 21:01:29 +09:00
Dean Herbert 26fb779f4d Move remaining positioning logic local to hold note blueprint 2020-05-20 21:01:29 +09:00
Dean Herbert 2f78866dfb Move positioning out of mania blueprints 2020-05-20 21:01:29 +09:00
Dean Herbert 62092e3f5b Propagate mania column in SnapResult 2020-05-20 21:01:29 +09:00
Dean Herbert 82d6549161 Pass down snap result and remove local TimeAt usage 2020-05-20 21:01:29 +09:00
Dean Herbert 970bd86d2e Remove local TimeAt usage in mania placement 2020-05-20 21:01:29 +09:00
Dean Herbert 23bf0d000e Implement mania beat snapping support 2020-05-20 21:01:19 +09:00
Dean Herbert ffb8d48fc3 Fix osu!mania editor placement regressions 2020-05-20 21:01:03 +09:00
Dean Herbert c46bfc2532 Create SnapResult class to hold various snapping results 2020-05-20 21:00:47 +09:00
Dean Herbert 3354d48a38 Change snapping to be screen space coordinate based 2020-05-20 21:00:29 +09:00
Dean Herbert 0bc3073d49 Fix test failures 2020-05-20 15:01:32 +09:00
Dean Herbert d31a59b074 Fix logic results in infinite loop on default timing point return 2020-05-20 14:55:36 +09:00
Dean Herbert 4f83bb679b Merge branch 'master' into mania-distance-snap-grid 2020-05-20 11:44:19 +09:00
Dean Herbert 85156c62ef Add xmldoc and address some code quality concerns 2020-05-19 23:05:08 +09:00
Dean Herbert c28a9bdb80 Move load method up 2020-05-19 23:02:20 +09:00
Dean Herbert a6f3dc53f7 Fix time value not being updated for next timing point 2020-05-19 23:01:36 +09:00
Dean Herbert d56466e2b9 Add very basic pooling of grid lines 2020-05-19 19:07:35 +09:00
Dean Herbert 406f39e8bf Construct online visible lines 2020-05-18 21:27:26 +09:00
Dean Herbert b35b150f38 Simplify colouring logic 2020-05-18 19:48:51 +09:00
Dean Herbert 16e85ae0b1 Remove Grid class 2020-05-18 17:52:04 +09:00
Dean Herbert d9bb90078b Move grids to inside columns 2020-05-18 17:47:52 +09:00
Dean Herbert 3e81d6d55f
Merge pull request #9053 from smoogipoo/fix-possible-ppcalc-exception 
Fix possible exceptions in performance calculators
 2020-05-18 16:37:33 +09:00
smoogipoo 1865cd0762 Fix possible exceptions in performance calculators 2020-05-18 15:10:59 +09:00
Bartłomiej Dach 76c5be7bc1 Disallow catch-specific judgements in mania 2020-05-17 17:16:22 +02:00
smoogipoo 4719fcc291 Actually use the cancellation token 2020-05-15 18:17:39 +09:00
smoogipoo 98125102a7 Add cancellation token support to CreateNestedHitObjects() 2020-05-15 18:07:41 +09:00
smoogipoo 238d87f976 Add comment about gray usage 2020-05-15 15:56:32 +09:00
smoogipoo 1c6c128d11 Add const 2020-05-15 15:51:54 +09:00
smoogipoo 392d44e1fb Always fully display one beat 2020-05-15 15:49:50 +09:00
smoogipoo 4cbd51feb9 Fix test errors 2020-05-15 13:08:15 +09:00
smoogipoo 3441ab457d Fix hitobjects placed at non-beatsnapped times 2020-05-14 20:06:34 +09:00
smoogipoo 0e33494074 Fix flashing when changing beat divisor 2020-05-14 19:58:39 +09:00
smoogipoo 42c3d892cd Only update alive lines 2020-05-14 19:55:14 +09:00
smoogipoo 91d1b15d5a Integrate grid with the mania composer 2020-05-14 19:55:07 +09:00
smoogipoo 16585f767e Add initial beat snap grid implementation 2020-05-14 19:17:24 +09:00
smoogipoo 0ef3bae26a Expose playfield from IManiaHitObjectComposer 2020-05-14 18:34:51 +09:00
smoogipoo 78f1b230e9 Disable right-click placement in the mania editor 2020-05-13 14:43:50 +09:00
Dean Herbert 064e5004ed
Merge branch 'master' into fix-mania-selection 2020-04-29 17:15:48 +09:00
smoogipoo 4f332ace14 Use 0 length 2020-04-29 14:27:21 +09:00
smoogipoo 0c95d11fdb Remove unnecessary value change binding 2020-04-29 13:27:33 +09:00
Dan Balasescu 024f10a494
Use non-generic bindable 
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2020-04-29 13:24:31 +09:00
smoogipoo 1aaab40228 Fix mods affecting mania scroll speed 2020-04-28 19:34:02 +09:00
smoogipoo ff3928465c Add xmldoc 2020-04-28 18:58:29 +09:00
smoogipoo db12fafc2c Update comment 2020-04-28 18:58:29 +09:00
smoogipoo ff24a15760 Fix vertical drag in down-scroll scenarios 2020-04-28 18:36:24 +09:00
smoogipoo 7d54d4b800 Improve test scene 2020-04-28 18:36:10 +09:00
smoogipoo f93291e25b Remove unused override 2020-04-28 18:35:22 +09:00
smoogipoo a7a680b486 Fix horizontal drag not working 2020-04-28 18:34:55 +09:00
smoogipoo e5131400e7 Remove now unnecessary position manipulation 2020-04-28 18:34:39 +09:00
smoogipoo 3eb7c8755c Cleanup 2020-04-28 15:34:41 +09:00
smoogipoo 330521a2ae Fix lifetime override not working 2020-04-28 15:34:10 +09:00
smoogipoo 7342e00151 Convert positions to local HOC coordinate space 2020-04-28 14:00:14 +09:00
smoogipoo cebc0fc046 Attempt to fix multiple selection movements 2020-04-27 20:35:24 +09:00
smoogipoo b88dd44252 Fix movement not working correctly in down-scroll 2020-04-27 19:47:25 +09:00
smoogipoo acf95fca9c Remove old, now unnecessary method 2020-04-27 17:14:15 +09:00
smoogipoo 7f5a1d7f44 Merge branch 'master' into fix-mania-selection 2020-04-27 17:09:40 +09:00
Dean Herbert 59bd2b3035
Merge pull request #8823 from smoogipoo/all-ruleset-encoders 
Implement legacy beatmap encoding for all rulesets
 2020-04-24 17:49:34 +09:00
smoogipoo 2b0deec491 Finish note placement on mouse down 2020-04-24 13:20:41 +09:00
smoogipoo 4ebb28d3e7 wip 2020-04-23 17:52:54 +09:00
smoogipoo 0a840a2613 Fix mania not getting its own selection handler 2020-04-23 17:41:33 +09:00
smoogipoo 12c235027d Remove stale file 2020-04-23 13:28:27 +09:00
smoogipoo 4f0b5a34d3 Fix hold note placement body sized incorrectly 2020-04-23 12:53:23 +09:00
smoogipoo 22d2607ff5 Only commit if placement is active 2020-04-23 12:53:09 +09:00
smoogipoo c59096a941 Fix note placement 2020-04-23 12:36:40 +09:00
smoogipoo 58af75ad57 Add back missing line 2020-04-22 13:45:12 +09:00
smoogipoo 6da0872ae5 Use the last node sample for the tail note 2020-04-22 09:06:04 +09:00
smoogipoo 1f962f5c56 Reword comment 2020-04-22 09:06:04 +09:00
smoogipoo cc0c82aaeb Implement IHasXPosition on ManiaHitObject 2020-04-22 09:06:04 +09:00
smoogipoo d957614fc9 Cleanup handling of mania samples 2020-04-22 09:06:04 +09:00
smoogipoo 0a2b585c65 Apply missing scale 2020-04-21 17:14:49 +09:00
Dean Herbert 4c689c6ad2 Add constant for max stage keys 2020-04-21 10:56:04 +09:00
smoogipoo 4e271ff46f Add support for 10K mod + 20K dual stages 2020-04-20 21:28:36 +09:00
smoogipoo 5d96d67226 Add special key definition just for sanity 2020-04-20 14:40:37 +09:00
smoogipoo b881293b98 Allow 10k to be played on a single stage 2020-04-20 14:08:23 +09:00
smoogipoo e534d59c80 Use another argument exception 2020-04-15 13:08:15 +09:00
Dean Herbert d47e414fb1 Apply review feedback (unroll inner loop / xml fixes) 2020-04-15 12:35:43 +09:00
Dean Herbert 7f95418262 Fix osu!mania replays actuating incorrect keys when multiple stages are involved 2020-04-14 16:52:17 +09:00
Dean Herbert c51bad0e35 Cache ManiaPlayfield instead 2020-04-13 13:42:21 +09:00
Dean Herbert cdff6060d3 Remove recursive hierarchy traversal for mania sample balance 2020-04-13 13:01:27 +09:00
Dean Herbert 65b96079a0 Move dampening to base implementation and change range to 0..1 2020-04-13 13:01:02 +09:00
Fire937 22d89dbff7 Merge branch 'master' of https://github.com/ppy/osu into stereo-shifted-playback 2020-04-12 01:46:32 +02:00
Fire937 f274ec297c Add positional sound support for all rulesets 
The SamplePlaybackBalance is calculated in a way that the balance
remains between -0.4 and 0.4.
Positional sound is not supported in osu!taiko.
 2020-04-12 01:33:25 +02:00
Dean Herbert 12c21cba7e Add missing masking specification 2020-04-11 15:20:27 +09:00
Dean Herbert cb6372acac
Merge branch 'master' into mania-stage-background-skinning 2020-04-09 15:37:48 +09:00
smoogipoo d13231eff7 Use ctor for default width 2020-04-08 18:23:24 +09:00
smoogipoo 83db6cebb6 Implement bottom stage image 2020-04-08 16:20:54 +09:00
smoogipoo cd15b672eb Implement left and right stage images 2020-04-08 16:20:47 +09:00
smoogipoo e429c274a9 Initial structure 2020-04-08 15:35:37 +09:00
Dean Herbert 9db996a91f Increase size of default osu!mania skin's keys to allow clearance with HUD 2020-04-08 14:13:31 +09:00
Dean Herbert 3794b55eef Rename ManiaStage to Stage 2020-04-08 14:13:31 +09:00
Dean Herbert 2062087155
Merge branch 'master' into more-mania-colours 2020-04-07 23:36:42 +09:00
Dean Herbert 9ff4458fd6
Merge branch 'master' into mania-skin-note-images 2020-04-07 22:41:22 +09:00
Dean Herbert 2118998243
Merge pull request #8653 from smoogipoo/better-mania-scrollspeed 
Fix inconsistent scroll speeds in mania
 2020-04-07 22:38:55 +09:00
smoogipoo 11d58fb7f6 Implement column background and light colours 2020-04-07 16:53:55 +09:00
smoogipoo 9fd73492ca Implement judgement line colour 2020-04-07 16:53:55 +09:00
smoogipoo 9cfeb60afc Fix missed speed removal in mania 2020-04-07 16:30:58 +09:00
smoogipoo 3ecb99462f Make note height scale by minimum column width 2020-04-07 16:07:18 +09:00
smoogipoo 707a6269b3 Fix incorrect key texture lookup 2020-04-06 19:03:37 +09:00
Dean Herbert cfa2404626 Remove explicit specification of new default 2020-04-06 12:39:49 +09:00
Dean Herbert 3289fa7c66
Merge branch 'master' into better-mania-scrollspeed 2020-04-03 23:25:14 +09:00
Dean Herbert eacbb20d87
Merge branch 'master' into fix-convert-scroll-speed 2020-04-03 22:47:53 +09:00
Dean Herbert 53c99d137a
Merge branch 'master' into mania-config-lookup-refactor 2020-04-03 22:22:59 +09:00
smoogipoo 23b7cde941 Add milliseconds value alongside 2020-04-03 18:38:04 +09:00
smoogipoo 1ff2cc31d1 Implement more familiar scroll speed options in mania 2020-04-03 18:25:01 +09:00
Dean Herbert 51db361c32 Update usages of Animation and Video in line with framework changes 2020-04-03 16:00:06 +09:00
smoogipoo b42d1104b7 Fix mania converts scrolling at incorrect speeds 2020-04-03 13:16:01 +09:00
smoogipoo 571748d105 Add some xmldocs + nullable parameter 2020-04-03 12:31:05 +09:00
smoogipoo 1f797207f7 Rework lookups to not require total playfield columns 2020-04-03 12:31:05 +09:00
Dean Herbert f919a2f267
Merge branch 'master' into mania-hitexplosion-skinning 2020-04-02 23:57:03 +09:00
Dan Balasescu 0f5fd8051c
Merge branch 'master' into mania-hitexplosion-skinning 2020-04-02 23:08:31 +09:00
Dean Herbert c35dd0153d
Merge branch 'master' into mania-column-line-colour 2020-04-02 23:03:22 +09:00
Dean Herbert bff58f36e5
Merge pull request #8563 from smoogipoo/expand-mania-vertically 
Expand mania to fit vertical screen bounds
 2020-04-02 23:01:56 +09:00
smoogipoo 47e2ff5ce6 Fix incorrect frame length for hit explosions 2020-04-02 22:56:30 +09:00
Dean Herbert e1a9a76e01
Merge pull request #8564 from smoogipoo/fix-holdnote-texturing 
Fix hold note animation not being reset
 2020-04-02 22:42:47 +09:00
Dean Herbert 8f2a3578bd Merge branch 'master' into mania-hitexplosion-skinning 2020-04-02 21:59:01 +09:00
smoogipoo 62f1bc276d Add skinning support for column line colour 2020-04-02 18:10:17 +09:00
smoogipoo 9552319732 Fix hold note animation not being reset 2020-04-02 17:09:08 +09:00
smoogipoo 5aa4c4f3cb Remove corner radius 2020-04-02 16:10:09 +09:00
smoogipoo 7ba533b7a4 Expand mania to fit vertical screen bounds 2020-04-02 16:04:09 +09:00
mcendu dae738d6a4
add todo entries 2020-04-02 14:58:31 +08:00
smoogipoo 62f6683a20 Remove unnecessary generic 2020-04-02 15:57:50 +09:00
smoogipoo c8d161e03a Fix explosion expiry 2020-04-02 15:57:02 +09:00
mcendu f3b96f8f50
add fallback to normal note image 2020-04-02 14:29:30 +08:00
smoogipoo de7ee57100 Fix adding null hit explosions 2020-04-02 15:27:31 +09:00
smoogipoo fa3a449c3b Implement legacy normal hit explosions 2020-04-02 14:37:29 +09:00
smoogipoo b375a02cff Cleanup positioning factor definition 2020-04-02 14:37:29 +09:00
smoogipoo c8eee8d204 Add structure for legacy hit explosions 2020-04-02 14:37:29 +09:00
smoogipoo 94031b57ea Split hit explosion positioning from column 2020-04-02 14:37:29 +09:00
Dean Herbert 1446b0782b
Merge branch 'master' into mania-existence-check 2020-04-01 23:11:09 +09:00
Dean Herbert 312f94d810
Merge pull request #8541 from smoogipoo/fix-default-explosion-position 
Fix incorrect explosion position on default skin
 2020-04-01 21:46:58 +09:00
Dan Balasescu 33119d38ad
Merge branch 'master' into fix-default-explosion-position 2020-04-01 20:03:23 +09:00
smoogipoo f4d8defa48 Fix incorrect explosion position on default skin 2020-04-01 20:01:35 +09:00
Dean Herbert aac7915eab
Merge branch 'master' into fix-column-light-position 2020-04-01 19:46:33 +09:00
smoogipoo 558feade87 Fix ci warnings 2020-04-01 18:19:11 +09:00
smoogipoo 59eac34d82 Fix barlines scrolling at different speeds in legacy skins 2020-04-01 18:00:17 +09:00