RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,622 Commits 3 Branches 659 Tags 359 MiB
Commit Graph

109 Commits

Author SHA1 Message Date
Dean Herbert 841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
smoogipoo a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Joehu f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
smoogipoo 356a60b561 Fix hitobjects in scrolling rulesets getting masked away 2018-09-12 15:14:51 +09:00
smoogipoo e04b2f4fa9 Fix hitobject results not rewinding 2018-08-14 18:31:32 +09:00
smoogipoo 2a54b5b78d ResetResult -> RevertResult 2018-08-06 12:29:22 +09:00
smoogipoo 3a7488767c Make HitObject not store the judgement 2018-08-06 11:50:18 +09:00
smoogipoo 0d6a8a2bf5 More xmldocs 2018-08-06 11:31:54 +09:00
smoogipoo 741ec0021e Rename more judgement-related methods to "result" 2018-08-06 11:31:46 +09:00
smoogipoo ab642b563f CreateJudgementResult -> CreateResult 2018-08-06 11:07:41 +09:00
smoogipoo 754f3c8621 Move result creation to load(), add exceptions 2018-08-06 11:07:05 +09:00
smoogipoo b35817c877 More xmldocs to hitobject/drawablehitobject 2018-08-06 10:55:38 +09:00
smoogipoo 5fd4ed2f4e Rename judgement-related methods/events + commenting 2018-08-06 10:55:25 +09:00
smoogipoo 482526135f Make IsHit not consider nested hitobjects 2018-08-03 16:07:20 +09:00
smoogipoo 2a4994e5ce Make hitobjects only have one judgement + result 2018-08-03 15:38:48 +09:00
smoogipoo 35b4ab5456 Introduce the concept of a "MainResult" 2018-08-02 21:07:40 +09:00
smoogipoo 3619290c34 Split out judgement definition from judgement result 2018-08-02 20:35:54 +09:00
smoogipoo d51d0e8547 Initial structure for new hitobject judgement system 2018-08-01 21:45:59 +09:00
Dean Herbert d11ba2df0e Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks 2018-07-05 14:53:31 +09:00
smoogipoo 45a4187923 Tidy up lookups to NestedHitObjects 2018-07-02 16:10:56 +09:00
smoogipoo 781095b96b Encapsulate the method to apply SampleControlPoints to SampleInfos 2018-06-28 18:29:07 +09:00
Dean Herbert 32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo 6d4f94756e Rewrite the way drag + click selections happen 
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).

I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.

1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
 2018-03-29 22:07:23 +09:00
Dean Herbert af65f2dd48 Move AccentColour changes local to rulesets which rely on it 2018-03-22 18:53:16 +09:00
Dean Herbert 366b7fca65 Remove GetColour method 2018-03-22 18:50:19 +09:00
Dean Herbert c4fe6a04c5 Use string lookups for combo colours 2018-03-22 17:32:05 +09:00
Dan Balasescu ab9505652b Merge branch 'master' into skin--completion 2018-03-22 16:44:00 +09:00
Dean Herbert 9ad4e9284a Add skin source fallback chain 2018-03-20 16:40:11 +09:00
Dean Herbert a42035f494 Make DrawableHitObject a CompositeDrawable 
No reason for it to be a container.
 2018-03-15 13:41:06 +09:00
smoogipoo 2a9fb2c2c6 Make NestedHitObjects lazily-constructed 2018-03-05 21:40:26 +09:00
Dean Herbert 4a52df2dd4 Apply review 2018-02-24 23:07:02 +09:00
Dean Herbert 768e0a4e2a Add SkinnableSound class 
Tidy things up, move logic out of SampleInfo.
 2018-02-24 22:47:14 +09:00
Dean Herbert 6ceabfe19e Add basic hitsound skinning 2018-02-23 13:38:12 +09:00
smoogipoo b77f08941c Make mania play the next note's sounds if no note is hit 
Fixes #1911.

This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.
 2018-01-24 20:05:37 +09:00
Dean Herbert 9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
smoogipoo 0ae0dac192 Fix DrawableHitObject not binding nested hitobject events 2018-01-15 20:35:38 +09:00
Aergwyn 8ac6818639 expose IsHit 2018-01-13 16:26:14 +01: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
smoogipoo 9d00e5bb7d Make ScrollingHitObjectContainer handle nested hitobjects 2018-01-11 15:08:30 +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
TocoToucan ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Dean Herbert 37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo f34131f8f4 Initial game-wide replacement of scrolling playfields 2018-01-04 18:50:17 +09:00
Aergwyn ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
Dean Herbert a0966305d4 Remove unnecessary new event 2017-12-30 14:46:44 +09:00
Aergwyn f547c7986d created option to override values before UpdateState is called 2017-12-29 17:50:55 +01:00
Dean Herbert 27cb445c24 Always recrusively apply custom sequence to nested hitobjects 2017-12-29 17:48:05 +09:00