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

97 Commits

Author SHA1 Message Date
Dean Herbert
c2cdf12986 Better pause logic 2018-07-18 19:59:04 +09:00
Dean Herbert
b967fe714b Fix lead-in time now being long enough in many cases 2018-07-17 14:29:22 +09:00
Dean Herbert
24054246b8 Fix DI regression 2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1 Update framework 2018-07-11 17:12:01 +09:00
Tom Arrow
ad883e087a RulesetContainer<TObject> cannot be derived 2018-06-19 14:31:24 +02:00
smoogipoo
14b7530994 Use a global ruleset config cache 2018-06-11 15:07:42 +09:00
smoogipoo
be01dbae3a Move ruleset dependency caching to CreateLocalDependencies
In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.
2018-06-11 15:07:29 +09:00
smoogipoo
eca016ec6c Move ruleset config managers to Ruleset 2018-06-11 13:17:08 +09:00
smoogipoo
63ec36b3be Explicitly handle null settings case + add annotations 2018-06-11 12:57:56 +09:00
smoogipoo
b219c17115 Move dependency creation under ctor 2018-06-11 12:57:26 +09:00
Dean Herbert
d3cd267036 Formatting fixes 2018-06-06 14:20:51 +09:00
Dean Herbert
5ec349de78 Reorder methods and remove useless comments 2018-05-21 15:59:33 +09:00
Dean Herbert
f53164843d Reduce spacing changes 2018-05-21 15:56:02 +09:00
Vidalee
2492e34d3f
resolving codefactor styling issues 2018-05-17 19:44:09 +02:00
Vidalee
6a1abf4084
Merge branch 'master' into osu-hd-setting 2018-05-17 19:39:17 +02:00
smoogipoo
db3e48c194 Rename GetBeatmap() to GetPlayableBeatmap() 2018-05-07 10:40:30 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
Vidalee
c4e45e30ef Solving conflict 2018-05-06 13:18:12 +02:00
Vidalee
d36d9643eb Missed one white space.. I guess my editor wasn't properly configured
for this file
2018-05-06 13:09:46 +02:00
Vidalee
af85102277 Should be ok now 2018-05-06 13:04:20 +02:00
Vidalee
008daf9a07 White space trimmed 2018-05-06 12:57:52 +02:00
Vidalee
095f6e1530 Code sanity 2018-05-06 12:49:15 +02:00
Vidalee
393c01ba90 Made the changes requested 2018-05-06 12:38:25 +02:00
Dean Herbert
76e58a51b9 Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting 2018-04-25 17:28:21 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
551ba6ac4b Fix ScalableContainer irrepairably altering content size 2018-04-02 13:06:06 +09:00
smoogipoo
c29f7a4333 Merge remote-tracking branch 'origin/master' into netstandard 2018-03-24 14:49:46 +09:00
Vidalee
92b47d87ba makes more sense but not fixed 2018-03-14 23:14:03 +01:00
Vidalee
6d9e78a3a3 Review changes 2018-03-11 22:40:49 +01:00
Vidalee
802a6870c4 Chesterton's fence 2018-03-11 22:09:16 +01:00
Vidalee
ea6434a7a0 Why this line got deleted 🤔 2018-03-11 21:19:34 +01:00
Vidalee
eed0f3a1de Added setting to not hide the first object in Hidden mod 2018-03-11 21:02:14 +01:00
smoogipoo
a3c7755ade Implement a conversion process for ReplayFrames 2018-03-01 02:28:14 +09:00
smoogipoo
5faec5c2f1 Add a separate property to control playfield area 2018-02-21 20:54:33 +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
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
smoogipoo
c97ea3ed60 Post-process beatmap before applying defaults 2018-01-30 15:49:55 +09:00
Dean Herbert
03154dbc63 Fix incorrect initial migration
Also adds variant to settings
2018-01-25 23:41:03 +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
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
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