Dean Herbert
|
40c61894ef
|
Update some case sensitive resources lookups in-line with resources
|
2019-09-04 10:44:24 +09:00 |
|
Dean Herbert
|
05ed9d3802
|
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
|
2019-09-03 13:07:58 +09:00 |
|
Dean Herbert
|
0261456d5a
|
Merge branch 'master' into play-to-gameplay
|
2019-09-03 11:42:15 +09:00 |
|
smoogipoo
|
8302658186
|
Fix other potential nullref cases that rider missed
|
2019-09-02 18:31:33 +09:00 |
|
smoogipoo
|
4c150839c0
|
Fix potential diffcalc hitwindow nullref
|
2019-09-02 17:38:58 +09:00 |
|
smoogipoo
|
f3656475de
|
Return null hitwindows for non-time-based objects
|
2019-09-02 16:10:30 +09:00 |
|
Dean Herbert
|
f9fcf1562f
|
Merge remote-tracking branch 'upstream/master' into iskincomponent
|
2019-09-02 14:21:02 +09:00 |
|
Dean Herbert
|
13bb0676b1
|
Merge branch 'master' into fix-taiko-swell-tick-display
|
2019-09-02 13:47:04 +09:00 |
|
smoogipoo
|
1df422e591
|
Hide taiko swell ticks
|
2019-09-02 13:30:55 +09:00 |
|
smoogipoo
|
5b685c4cd2
|
Fix swell ticks having non-zero time offsets
|
2019-09-02 13:25:39 +09:00 |
|
Dean Herbert
|
70e417533f
|
Update naming
|
2019-08-30 15:13:29 +09:00 |
|
Dean Herbert
|
a15828ab25
|
Introduce the concept of SkinComponents
Removes reliance on string lookups and better defines elements for introduction into database
|
2019-08-30 14:55:52 +09:00 |
|
smoogipoo
|
6ab2b20c70
|
Add an interface for working beatmaps
|
2019-08-29 19:38:44 +09:00 |
|
Dean Herbert
|
720908ba22
|
Merge pull request #5865 from peppy/fix-osu-hitobject-fade-in
Fix osu! approach circles fading in too late
|
2019-08-28 20:25:49 +09:00 |
|
Dean Herbert
|
9a98f39f06
|
Share logic with other rulesets (and make default)
|
2019-08-28 18:12:47 +09:00 |
|
smoogipoo
|
7cc92e2fad
|
Make taiko proxy containers use LifetimeManagementContainer
|
2019-08-28 13:20:28 +09:00 |
|
smoogipoo
|
3723c441d2
|
Merge remote-tracking branch 'origin/master' into fix-taiko-proxy-rewind
# Conflicts:
# osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
|
2019-08-27 17:42:45 +09:00 |
|
smoogipoo
|
2b22fd799d
|
Use constant value for offset
|
2019-08-27 15:33:53 +09:00 |
|
smoogipoo
|
bc7a81e733
|
Add initial fade transform
|
2019-08-27 15:33:53 +09:00 |
|
smoogipoo
|
dba3679817
|
Fix DrawableSwell not proxying its content in time/correctly
|
2019-08-27 15:33:28 +09:00 |
|
smoogipoo
|
b85e62a6e2
|
Fix taiko proxies being removed on rewind
|
2019-08-27 15:24:49 +09:00 |
|
iiSaLMaN
|
0eef398ca7
|
Remove redundant using directive
|
2019-08-27 05:19:21 +03:00 |
|
iiSaLMaN
|
cd68d030bd
|
Remove unnecessary UpdateState overrides
|
2019-08-27 05:04:34 +03:00 |
|
iiSaLMaN
|
843da26dba
|
Use transform management for taiko hit objects
|
2019-08-27 05:03:56 +03:00 |
|
smoogipoo
|
d4a296f911
|
Slight refactoring
|
2019-08-26 17:45:12 +09:00 |
|
smoogipoo
|
fd4c6e08ca
|
Merge remote-tracking branch 'origin/master'
|
2019-08-26 17:37:06 +09:00 |
|
Dean Herbert
|
48716f8f2b
|
Update framework
|
2019-08-21 13:29:50 +09:00 |
|
Desconocidosmh
|
77e9e89fec
|
Refactoring
|
2019-08-19 20:45:23 +02:00 |
|
Desconocidosmh
|
9bd844bf4d
|
Make comment more informative
|
2019-08-19 19:54:22 +02:00 |
|
Desconocidosmh
|
9732f5d622
|
Add Swell to GetNextObject() check
|
2019-08-19 17:28:32 +02:00 |
|
Desconocidosmh
|
eb83e36e0f
|
Make TaikoAutoGenerator unpress sooner
|
2019-08-19 17:15:08 +02:00 |
|
Desconocidosmh
|
b3556403aa
|
Make GetNextObject() a virtual method
|
2019-08-19 16:18:25 +02:00 |
|
Desconocidosmh
|
aa3651f65e
|
Change the logic so the last button gets unpressed instead of staying pressed forever
|
2019-08-15 19:45:10 +02:00 |
|
Desconocidosmh
|
386d788813
|
Change if-else to ternary if
|
2019-08-15 18:32:45 +02:00 |
|
Desconocidosmh
|
ba539abac7
|
Refactoring
|
2019-08-14 21:05:24 +02:00 |
|
Desconocidosmh
|
e567e81981
|
Refactoring
|
2019-08-14 20:10:52 +02:00 |
|
Desconocidosmh
|
f849b4ce54
|
Make autoplay unpress sooner, if needed
|
2019-08-14 19:49:32 +02:00 |
|
smoogipoo
|
8a64ab0384
|
Remove generics from IApplicableToBeatmap
|
2019-08-01 12:39:32 +09:00 |
|
Dean Herbert
|
c3b81bef4a
|
Flip default to the preferred method going forward
|
2019-07-22 15:55:38 +09:00 |
|
Dean Herbert
|
9bed0094de
|
Merge remote-tracking branch 'upstream/master' into android
|
2019-07-02 19:40:50 +09:00 |
|
Unknown
|
665da09ed7
|
disable HD for taiko
|
2019-07-01 09:45:14 +02:00 |
|
Dean Herbert
|
60ea3d4e1a
|
Fix skinning support for combobreak
|
2019-06-30 21:58:30 +09:00 |
|
Shane Woolcock
|
17d103181c
|
Merge branch 'master' into android
|
2019-06-18 20:05:14 +09:30 |
|
HoLLy
|
7e9f5a0939
|
Add Skills to DifficultyAttributes
|
2019-05-29 11:22:51 +02:00 |
|
tangalbert919
|
6fd1eb5e08
|
Merge remote-tracking branch 'upstream/master' into android
|
2019-05-08 08:15:03 -05:00 |
|
smoogipoo
|
d7c09e7dbd
|
Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
|
2019-05-07 13:20:17 +09:00 |
|
Dean Herbert
|
d40177f97c
|
Merge branch 'master' into drawnode-composability
|
2019-04-27 18:41:19 +09:00 |
|
smoogipoo
|
aeae759fcd
|
Rename method + add xmldoc
|
2019-04-22 18:08:15 +09:00 |
|
smoogipoo
|
4edb17a88a
|
Make hp work + cleanup
|
2019-04-22 18:02:49 +09:00 |
|
smoogipoo
|
b59f23d094
|
Implement hp increase for taiko
|
2019-04-22 17:04:46 +09:00 |
|
smoogipoo
|
0222424aef
|
Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
|
2019-04-10 17:20:36 +09:00 |
|
smoogipoo
|
c584967eb1
|
Remove mods from workingbeatmap
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dean Herbert
|
42eaabe24c
|
Fix editor blueprints being misplaced
Regressed with PlayfieldAdjustmentContainer changes.
|
2019-03-31 01:29:37 +09:00 |
|
Dean Herbert
|
3e8952b087
|
Merge pull request #4521 from peppy/hitobject-drawable-representation
Fix DrawableRuleset drawable creation method's name
|
2019-03-29 14:08:23 +09:00 |
|
Dean Herbert
|
c72705217a
|
Merge branch 'master' into framed-replay-handler-fixes
|
2019-03-29 12:59:51 +09:00 |
|
Dean Herbert
|
14cef94a53
|
Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation
|
2019-03-29 12:59:26 +09:00 |
|
Dean Herbert
|
785433bb74
|
Merge branch 'master' into universal-playfield-adjust
|
2019-03-29 11:25:54 +09:00 |
|
Dean Herbert
|
7715606188
|
Merge branch 'master' into sprite-icon-compatibility
|
2019-03-29 11:15:34 +09:00 |
|
Dean Herbert
|
8642886ffa
|
Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust
|
2019-03-29 00:39:51 +09:00 |
|
Dean Herbert
|
09a7950a3b
|
Fix handlers for other rulesets
|
2019-03-28 15:09:06 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Dean Herbert
|
ed3746e166
|
Make PlayfieldAdjustmentContainer universal
|
2019-03-26 13:32:44 +09:00 |
|
Dean Herbert
|
39df8cce19
|
Fix incorrect usage of InternalChildren
Could cause overwriting of components added by base DrawableHitObjcet class (such as samples)
|
2019-03-25 13:48:55 +09:00 |
|
Dean Herbert
|
9bf48863b0
|
Fix DrawableRuleset drawable creation method's name
|
2019-03-25 00:00:29 +09:00 |
|
tangalbert919
|
00c659a5ca
|
Merge all changes from 2019.321.0 to android
|
2019-03-20 11:00:27 -05:00 |
|
Dean Herbert
|
7b6d882ce6
|
Remove double-generic type
|
2019-03-20 11:29:16 +09:00 |
|
Dean Herbert
|
3b7a76aa4e
|
Fix typo
|
2019-03-20 11:22:34 +09:00 |
|
Dean Herbert
|
baea7230bc
|
Rename RulesetContainer to DrawableRuleset
|
2019-03-19 23:47:31 +09:00 |
|
Dean Herbert
|
68f28326a2
|
Refactor RulesetContainer for readability
|
2019-03-19 20:21:31 +09:00 |
|
tangalbert919
|
e865ac2086
|
Merge remote-tracking branch 'origin/master' into android
|
2019-03-17 09:39:34 -05:00 |
|
Dean Herbert
|
1617e2a729
|
Merge branch 'master' into mania-judgemetns
|
2019-03-13 18:17:42 +09:00 |
|
David Zhao
|
527b77b07d
|
Make all inheritors of drawablejudgement use new method
|
2019-03-12 19:52:44 +09:00 |
|
Albert Tang
|
7f30fce3fe
|
Merge branch 'master' into android
|
2019-03-08 10:39:24 -06:00 |
|
Dean Herbert
|
48e54c84c1
|
Merge branch 'master' into mod-wind
|
2019-03-08 20:23:02 +09:00 |
|
Dean Herbert
|
1f44dde96b
|
Fix autoplay tests not working
|
2019-03-07 18:34:56 +09:00 |
|
tangalbert919
|
1e6cb3e7d8
|
Merge remote-tracking branch 'upstream/master' into android
|
2019-03-05 17:56:13 -06:00 |
|
LeNitrous
|
c271a3a781
|
remove ruleset specific mods
|
2019-03-04 17:36:44 +08:00 |
|
LeNitrous
|
ecc2c28a62
|
mod rule changes
|
2019-03-03 16:22:00 +08:00 |
|
Dean Herbert
|
0788a7e9f1
|
Merge branch 'master' into more-inspections
|
2019-02-28 14:32:57 +09:00 |
|
Dean Herbert
|
42be7857d1
|
Use expression body for property get/set where possible
|
2019-02-28 13:58:19 +09:00 |
|
Dean Herbert
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31:40 +09:00 |
|
smoogipoo
|
d8c55bc729
|
Adjust namespaces
|
2019-02-21 19:05:52 +09:00 |
|
smoogipoo
|
bca347427f
|
Update with framework bindable changes
|
2019-02-21 18:56:34 +09:00 |
|
smoogipoo
|
7e41fbc29b
|
Remove LegacyDifficultyCalculator
|
2019-02-21 13:12:37 +09:00 |
|
Dean Herbert
|
2c76a039ca
|
Remove unnecessary folder reference
|
2019-02-20 10:46:25 +09:00 |
|
smoogipoo
|
5ff890434c
|
Add beatmap argument
|
2019-02-19 17:57:29 +09:00 |
|
smoogipoo
|
c264a9cc74
|
Fix mods not being populated
|
2019-02-19 17:46:40 +09:00 |
|
smoogipoo
|
0ef15f5bd5
|
Update with PopulateAttributes() removal
|
2019-02-19 17:45:16 +09:00 |
|
smoogipoo
|
7ba0d090fc
|
Fix post-merge errors
|
2019-02-19 16:40:52 +09:00 |
|
smoogipoo
|
7f4643a83d
|
Adjust naming
|
2019-02-18 14:55:39 +09:00 |
|
smoogipoo
|
46b979a412
|
Fix colour changes not being reset
|
2019-02-18 14:55:20 +09:00 |
|
smoogipoo
|
cb17cbcdc4
|
Fix taiko nullrefing
|
2019-02-18 14:54:35 +09:00 |
|
smoogipoo
|
25d85b6eb4
|
Implement new difficulty calculator for Rulesets.Taiko
|
2019-02-18 14:54:21 +09:00 |
|
smoogipoo
|
a8faa942a6
|
Implement new difficulty calculator structure
|
2019-02-18 14:49:43 +09:00 |
|
smoogipoo
|
aa0bb7ca11
|
Add taiko difficulty calculator tests
|
2019-02-15 14:44:26 +09:00 |
|
tangalbert919
|
7349a6c527
|
Merge remote-tracking branch 'upstream/master' into android
|
2019-02-12 20:41:54 -06:00 |
|
HoLLy
|
ae9d5f999c
|
Use correct DifficultyAttributes where possible
|
2019-02-06 21:28:42 +01:00 |
|
Dean Herbert
|
2d7c23dd9f
|
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
|
2019-02-04 12:15:53 +09:00 |
|
tangalbert919
|
80006109a2
|
Merge remote-tracking branch 'upstream/master' into android
|
2019-01-29 18:13:43 -06:00 |
|
LeNitrous
|
03e57d0423
|
fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp
|
2019-01-26 20:15:19 +08:00 |
|
LeNitrous
|
0f8c5bcbd7
|
actually the last whitespace
|
2019-01-26 13:50:27 +08:00 |
|
LeNitrous
|
73dbf5712d
|
add license headers
|
2019-01-26 13:43:27 +08:00 |
|
LeNitrous
|
1427c9f576
|
trim whitespaces
|
2019-01-26 13:11:08 +08:00 |
|
LeNitrous
|
c6e26a92ec
|
add wind up and wind down mods
|
2019-01-26 12:15:45 +08:00 |
|
Dean Herbert
|
014ea972d9
|
Merge remote-tracking branch 'origin/master' into samah-ios
|
2019-01-25 11:51:44 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
tangalbert919
|
5835ccc04c
|
Merge changes up to 2019.108.0
|
2019-01-08 17:53:57 -06:00 |
|
Shane Woolcock
|
a267a1a085
|
Merge branch 'master' into samah-ios
|
2019-01-08 17:09:26 +10:30 |
|
Dean Herbert
|
8edec10e5f
|
Merge branch 'master' into fix-replay-import-statistics
|
2019-01-08 11:26:12 +09:00 |
|
tangalbert919
|
47268898be
|
Expose internals for Android test projects
|
2019-01-06 00:04:25 -06:00 |
|
Roman Kapustin
|
4b5fc85875
|
Use Find instead of FirstOrDefault
|
2019-01-05 19:35:33 +03:00 |
|
Dean Herbert
|
aec3753863
|
Fix imported replays having excess statistics
|
2019-01-03 14:01:20 +09:00 |
|
Shane Woolcock
|
32ffcb9865
|
Merge branch 'master' into samah-ios
# Conflicts:
# osu.Game/osu.Game.csproj
|
2018-12-29 20:09:00 +10:30 |
|
Shane Woolcock
|
a83bee9461
|
Add ruleset visual tests
|
2018-12-29 20:05:37 +10:30 |
|
smoogipoo
|
b64932f6db
|
Implement hit windows
|
2018-12-27 22:39:15 +09:00 |
|
Ivan Pavluk
|
d8b409f81f
|
Merge branch 'master' of https://github.com/pavlukivan/osu
|
2018-12-12 17:18:32 +07:00 |
|
Ivan Pavluk
|
28b033bd99
|
Autodetect LowestSuccessfulHitResult
|
2018-12-12 17:15:59 +07:00 |
|
Ivan Pavluk
|
77e0d7ed8e
|
Fix formatting
|
2018-12-12 07:57:37 +00:00 |
|
Ivan Pavluk
|
e49e2fda9e
|
Rename SuccessfulHitResult->LowestSuccessfulHitResult
|
2018-12-12 13:24:58 +07:00 |
|
Ivan Pavluk
|
a2d1c2c096
|
Fix formatting
|
2018-12-10 05:05:03 +00:00 |
|
Ivan Pavluk
|
839e177d2a
|
Docstring change
|
2018-12-10 04:59:35 +00:00 |
|
Ivan Pavluk
|
8457324044
|
SuccessfulHitWindow->SuccessfulHitResult
|
2018-12-10 09:04:12 +07:00 |
|
Ivan Pavluk
|
94f01b6678
|
Remove unused using directives
|
2018-12-06 20:05:03 +07:00 |
|
Ivan Pavluk
|
394c038c33
|
Removed unnecessary JudgementResult casts
|
2018-12-06 19:52:16 +07:00 |
|
Ivan Pavluk
|
407f9d2e78
|
Comment cleanup
|
2018-12-06 19:33:42 +07:00 |
|
Ivan Pavluk
|
cb2444e01c
|
Remove Meh from TaikoHitWindows
|
2018-12-06 19:04:54 +07:00 |
|
Ivan Pavluk
|
8cae549541
|
Remove unused TaikoScoreProcessor constants
|
2018-12-06 15:58:03 +07:00 |
|
Ivan Pavluk
|
1b6658f4ee
|
Move HealthIncreaseFor to Judgement
|
2018-12-06 15:09:42 +07:00 |
|
Ivan Pavluk
|
b5277de3f4
|
Remove extra newline
|
2018-12-06 14:08:32 +07:00 |
|
Ivan Pavluk
|
6d7e71c003
|
Fix switch stetement order 2
|
2018-12-05 16:28:36 +07:00 |
|
Ivan Pavluk
|
6c38db04ee
|
Fix switch statement order in taiko judgements
|
2018-12-04 21:48:22 +07:00 |
|
Ivan Pavluk
|
f2b806d303
|
Remove swell miss HP from TaikoScoreProcessor
|
2018-12-04 21:36:43 +07:00 |
|
Ivan Pavluk
|
1975e11fcc
|
Yet Another Whitespace Fix
|
2018-12-04 21:28:36 +07:00 |
|
Ivan Pavluk
|
7d692939fc
|
Fixed being able to miss taiko objects by hitting them too early
Revamped taiko HP system
|
2018-12-04 21:20:44 +07:00 |
|
Ivan Pavluk
|
fbb7dc4507
|
Merge branch 'master' into master
|
2018-12-01 00:38:24 +07:00 |
|
smoogipoo
|
8eff49bccd
|
Remove User from Replay
|
2018-11-30 18:25:14 +09:00 |
|
Dean Herbert
|
831cd3ed59
|
ScoreInfo scoreInfo -> ScoreInfo score
|
2018-11-30 15:18:52 +09:00 |
|
Ivan Pavluk
|
743598a1ac
|
Decrease taiko swell HP drain
|
2018-11-30 01:33:04 +07:00 |
|
Ivan Pavluk
|
6b07d4581a
|
Fixed too strong HP drain
|
2018-11-30 01:07:15 +07:00 |
|
Ivan Pavluk
|
4184f17709
|
...Revert AffectsHP->AffectsHp, add HP abbrev
|
2018-11-29 23:12:02 +07:00 |
|
Ivan Pavluk
|
13a166a645
|
rename TaikoJudgement.AffectsHP to AffectsHp
|
2018-11-29 22:26:23 +07:00 |
|
Ivan Pavluk
|
d30ab4f77c
|
fixed whitespace
|
2018-11-29 22:12:01 +07:00 |
|
Ivan Pavluk
|
2ca9864301
|
Fixed taiko swell hp and scoring
|
2018-11-29 22:05:13 +07:00 |
|
Ivan Pavluk
|
a378c50544
|
Fix TaikoDrumRollJudgement visibilityy
|
2018-11-29 09:47:12 +07:00 |
|
Ivan Pavluk
|
ce1e6d93e4
|
Update TaikoScoreProcessor.cs
|
2018-11-29 09:45:57 +07:00 |
|