|
|
7414a6aadd
|
Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Mania/ManiaRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
|
2019-12-26 14:56:54 +09:00 |
|
|
|
a47e5aeead
|
Fix sample lookup not working correctly for custom rulesets
|
2019-12-26 00:51:44 +09:00 |
|
|
|
9702cc9809
|
Merge branch 'master' into remove-legacy-id
|
2019-12-25 21:01:12 +09:00 |
|
|
|
1b1c255394
|
Make the Easy mod's extra life count customizable (#7331)
Make the Easy mod's extra life count customizable
|
2019-12-25 20:19:08 +09:00 |
|
|
|
d84b319a3a
|
Merge remote-tracking branch 'upstream/master' into adjustable-map-settings
|
2019-12-25 15:20:17 +09:00 |
|
|
|
911dc2d98d
|
Fix code inspections
|
2019-12-25 15:20:10 +09:00 |
|
|
|
52ba0cd816
|
Rename method to be more appropriate
Also adds xmldoc.
|
2019-12-25 15:20:04 +09:00 |
|
|
|
e019ea408a
|
Merge branch 'master' into adjustable-map-settings
|
2019-12-25 13:16:47 +09:00 |
|
|
|
e3753ae29f
|
Make the easy mod's extra life count customizable
|
2019-12-24 10:13:12 +01:00 |
|
|
|
00546787c8
|
Remove unused method
|
2019-12-24 16:52:49 +09:00 |
|
|
|
fcb7a9ade5
|
Update RulesetStore to read from populated defaults
|
2019-12-24 16:16:55 +09:00 |
|
|
|
5738267642
|
Copy ruleset info over default
|
2019-12-24 16:05:20 +09:00 |
|
|
|
d87203857b
|
Move default construction into constructor
|
2019-12-24 16:02:35 +09:00 |
|
|
|
a324bfbc2c
|
Remove LegacyID from Ruleset
|
2019-12-24 13:48:27 +09:00 |
|
|
|
fe73b9f8d3
|
make HP and OD generic and instantiate CS and AR to modes that need it
|
2019-12-22 16:45:32 +08:00 |
|
|
|
55be4478aa
|
Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours
|
2019-12-21 12:36:09 +03:00 |
|
|
|
1bd44529dd
|
add full-stop to mod description for consistency
|
2019-12-20 18:31:16 +08:00 |
|
|
|
08b477ed52
|
make ModDifficultyAdjust abstract
|
2019-12-20 18:30:23 +08:00 |
|
|
|
50fa6c5f77
|
Update score on reverts
|
2019-12-19 20:18:23 +09:00 |
|
|
|
04c3a6f8a4
|
Move more properties to the base class
|
2019-12-19 20:18:17 +09:00 |
|
|
|
76f2fb378f
|
Separate score and health parts of ScoreProcessor
|
2019-12-19 20:03:14 +09:00 |
|
|
|
1da8cc8690
|
Encapsulate common logic of ScoreProcessor
|
2019-12-19 19:03:27 +09:00 |
|
|
|
39489e2901
|
Merge remote-tracking branch 'refs/remotes/origin/master' into fix-editor-movement-crash
|
2019-12-18 18:51:56 +09:00 |
|
|
|
5664ce3109
|
Add hitobject container regression test
|
2019-12-18 18:51:12 +09:00 |
|
|
|
ea661fce21
|
Merge branch 'master' into adjustable-map-settings
|
2019-12-18 18:44:11 +09:00 |
|
|
|
5cdc7d3b18
|
Merge pull request #7183 from smoogipoo/legacy-beatmap-saving
Add initial implementation of a legacy beatmap encoder
|
2019-12-18 18:43:14 +09:00 |
|
|
|
51a01c7006
|
Merge pull request #7256 from peppy/remove-ruleset-ctor-param
Remove RulesetInfo parameter from Ruleset constructor
|
2019-12-18 18:42:42 +09:00 |
|
|
|
2a128340d0
|
Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats
|
2019-12-18 17:58:37 +09:00 |
|
|
|
fa067b8799
|
Merge branch 'master' into legacy-beatmap-saving
|
2019-12-18 17:17:03 +09:00 |
|
|
|
6e0802e50c
|
Remove RulesetInfo parameter from Ruleset constructor
|
2019-12-18 14:49:09 +09:00 |
|
|
|
df8f8ffd0d
|
Fix potential exception during removal
|
2019-12-18 12:03:15 +09:00 |
|
|
|
bcc19e29f2
|
Fix editor crashing after re-ordering objects
|
2019-12-18 02:56:29 +09:00 |
|
|
|
e0ce87adca
|
Move CreateScoreProcessor() to Ruleset (#7244)
Move CreateScoreProcessor() to Ruleset
|
2019-12-17 22:15:42 +09:00 |
|
|
|
fd2785bab3
|
Merge branch 'master' into fxcop
|
2019-12-17 20:14:45 +09:00 |
|
|
|
49bf8d27d1
|
Move CreateScoreProcessor() to Ruleset
|
2019-12-17 20:08:13 +09:00 |
|
|
|
d5994ed484
|
CA2208: create exceptions correctly.
|
2019-12-17 13:00:10 +08:00 |
|
|
|
3c39fde7ff
|
CA1065: throw NotSupportedException in properties.
|
2019-12-17 13:00:05 +08:00 |
|
|
|
d7b3578cc6
|
CA2201: throw correct exception type.
|
2019-12-17 13:00:02 +08:00 |
|
|
|
ecfc6dfa3d
|
CA1825: use Array.Empty.
|
2019-12-17 12:59:48 +08:00 |
|
|
|
b5db927d93
|
Merge branch 'master' into cinema-mod
|
2019-12-17 12:56:06 +09:00 |
|
|
|
272d7d0ca9
|
Merge branch 'master' into fallback-to-skin-combo-colours
|
2019-12-17 12:36:20 +09:00 |
|
|
|
87035f8251
|
Simplify complex method
|
2019-12-17 12:12:15 +09:00 |
|
|
|
438d97f4f5
|
Rename variable for clarity
|
2019-12-16 19:42:28 +09:00 |
|
|
|
cfd8111120
|
Better initial beat handling
|
2019-12-16 19:41:02 +09:00 |
|
|
|
72404bff9a
|
Add support for simple triple time
|
2019-12-16 19:16:54 +09:00 |
|
|
|
210fecc951
|
Fix incorrect hat logic; add support for first barline omission
|
2019-12-16 18:57:11 +09:00 |
|
|
|
0f9ff32cdc
|
Fix beat playing while paused
|
2019-12-16 18:51:22 +09:00 |
|
|
|
c883c97bab
|
Fix off-by-one starting bar
|
2019-12-16 18:50:58 +09:00 |
|
|
|
3e0fda58ea
|
Play finish in addition to kick, not isolated
|
2019-12-16 18:47:06 +09:00 |
|
|
|
9de6b62fb1
|
Fix nightcore beat not playing if song doesn't hit beat index 0
|
2019-12-16 18:24:29 +09:00 |
|
