1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 01:47:31 +08:00
Commit Graph

274 Commits

Author SHA1 Message Date
Dean Herbert
b62ed004f2 Remove judgements when deciding a new judgement for a HitObject
Generally happens when rewinding.
2018-03-07 19:14:42 +09:00
smoogipoo
2a9fb2c2c6 Make NestedHitObjects lazily-constructed 2018-03-05 21:40:26 +09:00
Dean Herbert
2003887cc8
Merge branch 'master' into clock-fixes 2018-03-05 17:45:08 +09:00
Dean Herbert
bd510e5356 Merge remote-tracking branch 'upstream/master' into clock-fixes 2018-03-02 21:01:53 +09:00
Dean Herbert
c54c1699bf
Merge branch 'master' into ruleset-replayframes 2018-03-01 22:26:16 +09:00
smoogipoo
a3c7755ade Implement a conversion process for ReplayFrames 2018-03-01 02:28:14 +09:00
Dean Herbert
01fcf9c813 Update in line with framework changes 2018-02-28 22:01:48 +09:00
Dean Herbert
cff17f1864 Update in line with inverse ShoudProcessClock default 2018-02-27 17:23:38 +09:00
Dean Herbert
73fb185132 Change the way ShouldProcessClock is specified in line with framework changes 2018-02-27 17:23:38 +09:00
smoogipoo
d72290ee24 Make ScaledContainer private 2018-02-23 15:06:08 +09:00
Dean Herbert
a3336f2577
Merge branch 'master' into fix-editor-osu-scale 2018-02-22 14:14:41 +09:00
smoogipoo
5faec5c2f1 Add a separate property to control playfield area 2018-02-21 20:54:33 +09:00
smoogipoo
6757be2007 Fix incorrect RelativeChildSize in Catch 2018-02-21 20:15:51 +09:00
smoogipoo
7fd7dc1538 Extract playfield scaling into a separate class
And make it more general.
2018-02-21 11:07:42 +09:00
smoogipoo
b7be162f28 Remove AspectAdjust property (override GetAspectAdjustedSize instead) 2018-02-19 17:05:10 +09:00
smoogipoo
cd2c9a9de6 Adjust xmldoc and rename to GetAspectAdjustedSize 2018-02-19 17:04:18 +09:00
smoogipoo
77149b00ce Merge branch 'codestyle-fixes' into update-branch 2018-02-08 23:47:31 +09:00
smoogipoo
4699b5ad7c Fix a few code styling issues
These are present in the netstandard branch (the rules aren't working there - probably using the wrong configuration).
2018-02-08 23:47:03 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
smoogipoo
75858bd3de Update in-line with framework changes 2018-02-02 15:41:54 +09:00
Dean Herbert
9d4ec6f8b5 Merge branch 'master' into ismaskedaway-input-fix 2018-02-01 19:29:10 +09:00
smoogipoo
1b99e54005 Fix IsMaskedAway not being up-to-date when fastfowarding replays 2018-02-01 15:21:23 +09:00
Dean Herbert
cd37be9440
Merge branch 'master' into better-slider-objects 2018-02-01 08:39:39 +09:00
Dean Herbert
888d2362fd
Merge branch 'master' into fix-taiko-fastforwarding 2018-01-31 18:30:15 +09:00
smoogipoo
c97ea3ed60 Post-process beatmap before applying defaults 2018-01-30 15:49:55 +09:00
smoogipoo
ef3fb8c05a InputManager -> Container where KeyBindings are involved 2018-01-30 14:49:12 +09:00
Dean Herbert
03154dbc63 Fix incorrect initial migration
Also adds variant to settings
2018-01-25 23:41:03 +09:00
smoogipoo
57cd50c45e Reorder the way input is handled for replays
Fixes https://github.com/ppy/osu/issues/1625 .
2018-01-25 17:39:50 +09:00
Dean Herbert
5a00ae36d1 Add database-based configuration for rulesets 2018-01-24 17:45:28 +09:00
Dean Herbert
b197cd56af Allow DI'd OnScreenDisplay to be null 2018-01-23 16:42:31 +09:00
Dean Herbert
c01f67b0d8 Merge remote-tracking branch 'upstream/master' into ruleset-configs 2018-01-23 16:23:25 +09:00
smoogipoo
c1331cef1b Disallow DualStages for non-converted beatmaps 2018-01-22 15:52:54 +09:00
smoogipoo
9ac035f3d5 Merge branch 'bdl-cache-changes' into ruleset-configs 2018-01-22 13:11:45 +09:00
為什麼
feb79ff9e7
Merge branch 'master' into mania_stage_fix 2018-01-19 20:08:24 +08:00
smoogipoo
a94ea7025e Register/Unregister -> BeginTracking/StopTracking and add exceptions 2018-01-18 18:45:48 +09:00
smoogipoo
dee298c395 No more statics + better unregistration 2018-01-18 17:40:05 +09:00
smoogipoo
7910b47868 Move ConfigManager registration/dependency injection to RulesetContainer 2018-01-18 17:00:23 +09:00
ANDY840119-PC\andy840119
6c67f96fdb fix ci error 2018-01-18 02:01:01 +09:00
ANDY840119-PC\andy840119
3b291abf60 Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game/Rulesets/UI/Playfield.cs
2018-01-17 22:27:32 +09:00
smoogipoo
2ebb3d6e0e Fix ReplayLoader not being treated as having a replay loaded
Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.
2018-01-17 17:37:14 +09: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
28586317dd Give stages a size again 2018-01-15 19:44:42 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
smoogipoo
512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +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
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
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +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
smoogipoo
36e9232472 Merge master into netstandard 2018-01-05 00:42:48 +09:00
smoogipoo
add68ff068 Fix swells not stopping at the hit position 2018-01-04 21:45:29 +09:00
smoogipoo
585df22c88 Add a way to calculate length of IHasEndTime objects 2018-01-04 20:56:18 +09:00
smoogipoo
a7aab21a29 Re-namespace files 2018-01-04 19:22:15 +09:00
smoogipoo
e0c921ff5c Split out ScrollingHitObjectContainer into new file 2018-01-04 19:20:43 +09:00
smoogipoo
651e24e3cc Implement proper scrolling directions 2018-01-04 19:17:40 +09:00
smoogipoo
f34131f8f4 Initial game-wide replacement of scrolling playfields 2018-01-04 18:50:17 +09:00
smoogipoo
2b79ad879f Add a way to access alive hitobjects 2018-01-04 16:37:48 +09:00
Dean Herbert
c8ec27c4de Remove redundant prefix 2018-01-04 16:31:41 +09:00
Dean Herbert
152b846cff Fix incorrect scaling of hitobjects in catch 2018-01-04 16:29:53 +09:00
smoogipoo
697efba5e2 Replace .OfType with .Cast 2018-01-04 15:55:35 +09:00
smoogipoo
6d253fd33c Add a way to adjust the conversion process with mods 2018-01-03 19:06:20 +09:00
smoogipoo
714d93dd92 Merge remote-tracking branch 'origin/master' 2017-12-30 16:17:14 +09:00
smoogipoo
7a793eaded Merge master into netstandard 2017-12-27 20:48:53 +09:00
Aergwyn
f5d4ed2a22 add interface to adjust DrawableHitObjects 2017-12-26 11:49:42 +01:00
Ninjaprawn
71e59bc9e7 Removed the IgnoreTooltip property 2017-12-16 20:16:40 +11:00
smoogipoo
b28b86dea9 Use Lazy for threadsafety on playfield 2017-12-14 20:27:51 +09:00
smoogipoo
f41af191ed Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-08 15:13:18 +09:00
Ninjaprawn
9b3e666a07 Added IgnoreTooltip to all classes required 2017-12-08 14:10:23 +11:00
Dean Herbert
a78441bc5a Apply changes in line with framework input adjustments 2017-12-07 13:16:59 +09:00
smoogipoo
cf859a6cf2 Make the dragger attach to objects it surrounds
Plus a lot more implementation.
2017-12-02 00:26:02 +09:00
smoogipoo
e8cbde3ae1 Add overlay/underlay 2017-11-30 21:56:19 +09:00
smoogipoo
b3bf6e7bee Merge master into netstandard 2017-11-21 16:39:21 +09:00
Dean Herbert
2610cadd3c CI fixes 2017-11-21 12:11:29 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
smoogipoo
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +09:00
smoogipoo
18f2e92a48 Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator 2017-11-17 12:36:13 +09:00
Dean Herbert
f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
Dean Herbert
ae6d4aa38d Merge remote-tracking branch 'upstream/master' into fix-replay-clock 2017-11-13 20:03:29 +09:00
smoogipoo
495155874c Make sure that the clock is only updated once per time value 2017-11-13 19:30:57 +09:00
smoogipoo
0cec51110a Fix replay clock always running 1 frame behind
* Fixes swells never completing.
* Fixes forward playback missing notes every now and then.
* Probably more stuff.
2017-11-13 17:55:21 +09:00
smoogipoo
ae8407a3f3 Fix nested hitobject judgements not being removed 2017-11-13 14:00:35 +09:00