1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 17:57:38 +08:00
Commit Graph

569 Commits

Author SHA1 Message Date
smoogipoo
52b48f2b7e Fix replays not correctly considering negative time diffs 2018-01-17 15:23:07 +09:00
Dean Herbert
56df27fcc2
Merge branch 'master' into fix-event-bindings 2018-01-16 17:49:01 +09:00
Dean Herbert
976f7cec39
Merge branch 'master' into playfield-judgements 2018-01-16 15:26:13 +09:00
Dean Herbert
807e455a58
Merge branch 'master' into more-nested-playfields 2018-01-16 14:50:09 +09:00
aQaTL
65ecc18141
Cap ApproachRate in HardRock mod at 10.0f 2018-01-15 16:11:00 +01:00
smoogipoo
8c5ef0a330 Remove base OnJudgement from Playfield to properly accomodate nested playfields 2018-01-15 20:48:57 +09:00
smoogipoo
c32ff9c43b Move nested playfields to the base Playfield 2018-01-15 20:39:57 +09:00
smoogipoo
0ae0dac192 Fix DrawableHitObject not binding nested hitobject events 2018-01-15 20:35:38 +09:00
Dean Herbert
053a29f9a7 Make judgements visually smaller
This is a temporary change based on people's feedback. Makes judgements feel a lot better.

nb: This is one of my changes that I've had deployed sinfce the end-of-year 2017 build.
2018-01-15 17:41:17 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
Aergwyn
8ac6818639 expose IsHit 2018-01-13 16:26:14 +01:00
Dan Balasescu
ebb8550f53
Merge branch 'master' into shrink-drawablehitobject_t 2018-01-14 00:16:42 +09:00
Aergwyn
7875f0cb01 remove unnecessary internal 2018-01-13 16:15:41 +01:00
Aergwyn
356bb5da1e move sample logic up too 2018-01-13 12:55:52 +01:00
Aergwyn
70fc09f81e move judgement + state logic up to DrawableHitObject 2018-01-13 12:42:42 +01:00
Aergwyn
ae1adfd2f2 remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
smoogipoo
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
Dean Herbert
354d781002 Merge remote-tracking branch 'upstream/master' into fix-mod-implementation-check 2018-01-12 17:49:31 +09:00
Dean Herbert
b55adf655f Yeah, cinema mod isn't going to work 2018-01-12 17:46:24 +09:00
Dean Herbert
7f189080b9 Move fail override back to abstract implementation 2018-01-12 17:43:56 +09:00
smoogipoo
8a04c954a9 Cleanup 2018-01-12 17:19:59 +09:00
smoogipoo
441e8aced5 Better namings for the speed change "algorithms" 2018-01-12 17:18:34 +09:00
Dean Herbert
9a77005d2e Make sure unimplemented auto mods aren't consumable 2018-01-12 14:26:23 +09:00
Dean Herbert
057efa24c7 Move a few interfaces to base classes 2018-01-12 14:26:09 +09:00
smoogipoo
4b2d971b00 Add some comments 2018-01-12 13:06:17 +09:00
smoogipoo
712d586d41 Revert "Add OSD + config value for scroll speed"
This reverts commit a6d8b28221.
2018-01-12 12:28:43 +09:00
smoogipoo
ab762045d6 Move back to using load(), fix testcase 2018-01-11 16:51:46 +09:00
smoogipoo
d998936e9e Fix testcase errors 2018-01-11 15:50:44 +09:00
smoogipoo
9ae67b519b Optimise nested hitobject position computations 2018-01-11 15:25:15 +09:00
smoogipoo
9d00e5bb7d Make ScrollingHitObjectContainer handle nested hitobjects 2018-01-11 15:08:30 +09:00
smoogipoo
a6d8b28221 Add OSD + config value for scroll speed 2018-01-11 13:40:46 +09:00
smoogipoo
3a869edf36 Add a flag to disable user scroll speed adjustments 2018-01-11 12:44:39 +09:00
smoogipoo
6a5a3b01b2 Fix license headers 2018-01-11 12:39:06 +09:00
smoogipoo
6255aaab68 Per-hitobject lifetime management 2018-01-10 19:17:43 +09:00
smoogipoo
9036ea92eb Run child updates for nested hitobjects when parent hitobjects are masked 2018-01-10 18:29:46 +09:00
smoogipoo
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
Dean Herbert
58626e3b30 Allow rulesets to create their own instantiation info 2018-01-10 17:04:07 +09:00
Dean Herbert
9d099feadc
Merge branch 'master' into fix-catcher-width 2018-01-10 10:04:10 +09:00
smoogipoo
c4d1922c8b Add scrolling algorithm to global settings 2018-01-08 11:34:37 +09:00
smoogipoo
4ab3b0d76b Implement local scrolling hit object container 2018-01-07 13:24:09 +09:00
smoogipoo
117ab8a26d Split out scrolling algorithm 2018-01-07 13:23:16 +09:00
smoogipoo
98fd4f6ff2 Fix up precision + sizing issues 2018-01-07 11:33:59 +09:00
smoogipoo
7526225282 Use DP for most of the code to avoid unnecessary computations 2018-01-05 20:56:21 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
5d12682e83 Initial implementation of the new (old) mania scrolling calculations 2018-01-05 20:18:18 +09:00
smoogipoo
d2b135d2a8 Give hitobjects lifetimes 2018-01-05 15:48:19 +09:00
smoogipoo
1276e2c71a Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-05 14:58:57 +09:00
Dean Herbert
01038bd9bb
Merge branch 'master' into mania-rc-cleanup 2018-01-05 10:18:15 +09:00
smoogipoo
5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
smoogipoo
add68ff068 Fix swells not stopping at the hit position 2018-01-04 21:45:29 +09:00