Dean Herbert
28a1baa07e
Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation
2019-03-08 20:13:58 +09:00
Dean Herbert
93a999396e
LegacyFinalTick -> LegacyLastTick to match existing variable
2019-03-08 20:13:11 +09:00
Dean Herbert
165a353a83
Add extensive commenting about LegacyLastTick usage
2019-03-08 20:12:48 +09:00
Dean Herbert
f59b9e933e
Merge branch 'master' into extract-slider-tick-creation
2019-03-08 20:00:12 +09:00
Dean Herbert
355705f0a5
Fix legacy tick handling
2019-03-08 19:57:30 +09:00
Dean Herbert
973f29b765
Apply review
2019-03-08 15:14:57 +09:00
Dean Herbert
2c98ba1c0c
Split out consumption and creation into two separate code paths
2019-03-08 14:59:45 +09:00
Dean Herbert
3ccc76e18f
Merge remote-tracking branch 'upstream/master' into cursor-in-playfield
2019-03-08 14:50:46 +09:00
Dean Herbert
551380dd42
Extract slider tick creation so it can be shared with osu!catch
2019-03-08 14:46:26 +09:00
Dan Balasescu
d1c18c52ab
Merge branch 'master' into fix-cursor-in-scale-container
2019-03-08 12:43:57 +09:00
Dan Balasescu
101009c92e
Merge branch 'master' into fix-autoplay-tests
2019-03-08 12:14:40 +09:00
Dean Herbert
340997f505
Rename remaining usage of PathWidth naming convention
2019-03-07 20:21:59 +09:00
Dean Herbert
5ab9f45a8f
Merge branch 'drawnode-changes'
2019-03-07 20:10:42 +09:00
Dean Herbert
1f44dde96b
Fix autoplay tests not working
2019-03-07 18:34:56 +09:00
smoogipoo
04d756524d
Adjust with shader changes
2019-03-07 18:30:18 +09:00
smoogipoo
e430b8a640
Merge remote-tracking branch 'nekodex/master' into drawnode-changes
2019-03-07 18:15:12 +09:00
David Zhao
b3e046c4d1
Rename PathWidth to PathRadius
2019-03-07 17:39:19 +09:00
Dean Herbert
62716851a1
Revert some unnecessary changes
2019-03-06 17:41:54 +09:00
Dean Herbert
7aa30ca3f6
Change method of cursor creation
2019-03-06 17:41:54 +09:00
Dean Herbert
18826b3a59
Adjust cursor scale for its new surroundings
2019-03-06 17:41:54 +09:00
Dean Herbert
acf518c208
Move cursor inside playfield
2019-03-06 17:41:54 +09:00
Dean Herbert
5411c63093
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-06 17:14:08 +09:00
Dean Herbert
d70b373af9
Merge branch 'master' into mod-wind
2019-03-06 14:04:04 +09:00
tangalbert919
1e6cb3e7d8
Merge remote-tracking branch 'upstream/master' into android
2019-03-05 17:56:13 -06:00
Dean Herbert
fc0b297232
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-05 18:06:24 +09:00
smoogipoo
0322bd8812
Make config nullable, removing testcase code
2019-03-05 14:40:27 +09:00
smoogipoo
78596dfe80
Merge remote-tracking branch 'origin/master' into move-osu-settings
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
2019-03-05 13:25:03 +09: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
smoogipoo
bf8360636a
Adjust drawnodes to use the new shared data structure
2019-03-01 17:25:15 +09:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching
2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07
Use pattern matching wherever possible
2019-02-28 14:35:00 +09: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
Dean Herbert
c8793911a8
Enable more stringent inspectcode style inspections
2019-02-27 21:25:40 +09:00
smoogipoo
c13a5184f3
Add more explanation
2019-02-27 16:35:11 +09:00
smoogipoo
32bf940aa5
Adjust comment for readability
2019-02-27 15:43:20 +09:00
smoogipoo
a07d797d75
Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization
2019-02-27 12:08:43 +09:00
smoogipoo
d06f38b3f3
Cleanup
2019-02-25 15:57:07 +09:00
Dean Herbert
7f5780c615
Simplify SliderBall and fix incorrect key up handling
...
Was not processing timeToAcceptAnyKeyAfter when cursor was outside valid tracking area, but should have been.
2019-02-23 14:38:53 +09:00
Dan Balasescu
5fdd7f9bff
Fix typo in comment
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-23 14:14:34 +09:00
Dean Herbert
3a57ff40cd
Add comment about other cases, rewind handling
2019-02-23 14:14:34 +09:00
Dean Herbert
8e52e2330e
Add extensive commenting
2019-02-23 14:14:34 +09:00
Dean Herbert
1c75ee4e82
Add fixes
2019-02-23 14:14:34 +09:00
Dean Herbert
7566fcf536
Slider press fix
2019-02-23 14:14:34 +09:00
Dean Herbert
367bc53a06
Revert some more instances of 'e' variable names
2019-02-22 20:15:25 +09:00
smoogipoo
d61dfe888e
Fix venera fonts not being correctly specified
2019-02-22 19:42:09 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +09:00
Dean Herbert
3fe4b8fd1c
Update variable names
...
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
...
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +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
c96a2ac853
Fix non-conforming filename
2019-02-20 21:08:52 +09:00
smoogipoo
0693ab8e7d
Merge remote-tracking branch 'origin/master' into osu-fontusage
...
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb
Adjust sprite texts in-line with framework changes
2019-02-20 15:03:20 +09:00
smoogipoo
0380293098
Add beatmap argument
2019-02-19 17:58:02 +09:00
smoogipoo
21f9c813b2
Fix mods not being populated
2019-02-19 17:46:18 +09:00
smoogipoo
8459cf6ed0
Missed argument
2019-02-19 17:43:12 +09:00
smoogipoo
f19a52b960
Rename argument
2019-02-19 17:40:35 +09:00
smoogipoo
37f9ac6eca
Populate mods too
2019-02-19 17:39:30 +09:00
smoogipoo
847f7d8658
Adjust with PopulateAttributes() removal
2019-02-19 17:38:33 +09:00
Dean Herbert
9a60f3b0de
Merge branch 'master' into new-diffcalc-osu
2019-02-19 15:56:12 +09:00
Dean Herbert
151388dfad
Merge branch 'master' into diffcalc-merging-2
2019-02-19 15:42:15 +09:00
smoogipoo
ade5763160
Fix post-merge errors
2019-02-19 14:34:02 +09:00
smoogipoo
93b7b51d0a
timeRate -> clockRate
2019-02-19 14:29:23 +09:00
Dan Balasescu
b1bdab8c36
Merge branch 'master' into mod-grow
2019-02-18 16:47:16 +09:00
Dan Balasescu
c9c8cccd68
Merge branch 'master' into use-lifetime-optimization
2019-02-18 15:22:34 +09:00
smoogipoo
659ec267b6
Fix spinners increasing strain
2019-02-18 14:58:33 +09:00
smoogipoo
c930cc5fb5
Fix incorrect OsuDifficultyHitObject instantiation
2019-02-18 14:58:13 +09:00
smoogipoo
fd70269021
Implement new difficulty calculator for Rulesets.Osu
2019-02-18 14:58:03 +09:00
smoogipoo
a8faa942a6
Implement new difficulty calculator structure
2019-02-18 14:49:43 +09:00
Dean Herbert
42dc7644f2
Merge branch 'master' into diffcalc-testcases
2019-02-17 21:06:42 +09:00
smoogipoo
8becd7ff92
Add a slider-spinner test case
2019-02-15 12:49:48 +09:00
Dean Herbert
810175235d
Fix incorrect application of scaling in some cases
...
Isolates different usages of hitcircle scale so they can't ever cause regressions.
2019-02-14 18:47:05 +09:00
Dean Herbert
1b61ec4ef4
First pass clean-up
2019-02-14 18:05:23 +09:00
Dean Herbert
d366370113
Merge branch 'master' into mod-grow
2019-02-14 17:44:45 +09:00
smoogipoo
f50a0be29d
Add osu! difficulty calculator test
2019-02-14 16:22:14 +09:00
tangalbert919
7349a6c527
Merge remote-tracking branch 'upstream/master' into android
2019-02-12 20:41:54 -06:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work
2019-02-11 16:30:12 +09:00
Dean Herbert
5b1f111922
Rollback other fallthrough regressions
2019-02-05 18:14:43 +09:00
Dean Herbert
2f8f4fac64
Fix combo colour fallbacks when skin is not providing any
2019-02-05 17:54:14 +09:00
Dan Balasescu
40e4a3f725
Merge branch 'master' into fix-replay-import-statistics
2019-02-04 15:32:29 +09:00
Kyle Chang
cf91b882c8
Fix slider tail evaluation in osu difficulty calculator
...
The slider tail circle was already included as a nested hit object and is judged before the end of the slider's actual duration, so using the slider end time leads to an inaccurate travel distance and end position.
2019-02-03 23:49:05 -05:00
Dean Herbert
2d7c23dd9f
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-02-04 12:15:53 +09:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
tangalbert919
52110e5dc0
Merge remote-tracking branch 'upstream/master' into android
2019-01-31 11:19:03 -06:00
Dean Herbert
cea82708ee
Merge branch 'master' into use-lifetime-optimization
2019-01-31 20:20:40 +09:00
LeNitrous
7e2f4af00d
remove whitespaces
2019-01-31 17:58:09 +08:00
LeNitrous
a8d30f6aee
remove unused using
2019-01-31 17:05:50 +08:00
LeNitrous
902be0d059
add grow mod
2019-01-31 17:03:43 +08:00
smoogipoo
581544e1d6
Fix TD mod not being ranked
2019-01-31 11:59:36 +09:00
smoogipoo
e9ddf232f0
Add touchdevice mod to performance calculation
2019-01-31 11:51:40 +09:00
tangalbert919
80006109a2
Merge remote-tracking branch 'upstream/master' into android
2019-01-29 18:13:43 -06:00
Dean Herbert
8d4232af45
Formatting and minor optimisations
2019-01-29 16:35:20 +09:00
Dean Herbert
18512458e8
Merge branch 'master' into xexxar-angles
2019-01-29 15:59:04 +09:00
ekrctb
504e79b968
Merge branch 'master' into use-lifetime-optimization
2019-01-29 12:15:02 +09:00
Nitrous
ea4e79751e
Merge branch 'master' into mod-wind
2019-01-28 17:48:57 +08:00
Dean Herbert
354a99f5e1
Merge branch 'master' into samah-ios
2019-01-28 15:34:46 +09:00
ProgrammaticNajel
2058604ef3
Typo fix
2019-01-26 23:10:13 +08:00
ProgrammaticNajel
0797f5d644
Update SliderPlacementBlueprint.cs
2019-01-26 22:56:31 +08:00
ProgrammaticNajel
e71b13683a
Add null check
2019-01-26 22:55:33 +08:00
LeNitrous
03e57d0423
fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp
2019-01-26 20:15:19 +08:00
ProgrammaticNajel
e939f75f4b
Transform screen mouse coordinates to local space coordinates.
2019-01-26 18:19:01 +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
Unknown
77763fde8b
revert accidentally renamed variables
2019-01-25 11:22:05 +01:00
Unknown
4a916b2dee
replace license headers with new ones
2019-01-25 11:17:48 +01:00
Unknown
8ddff673b7
revert previous rename and rename ruleset specific classes instead
2019-01-25 11:14:37 +01:00
Unknown
5446c99f22
Merge branch 'master' into move-osu-settings
2019-01-25 10:57:04 +01: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
e3ce203c68
Merge remote-tracking branch 'upstream/master' into android
2019-01-23 17:45:46 -06:00
Unknown
481f33d17b
add setting to toggle the gameplay cursor trail
2019-01-23 14:27:39 +01:00
Unknown
33b46dc4e8
adjust year in license header to match CFS's expectations
2019-01-23 13:17:29 +01:00
Unknown
cf147083cd
move osu! settings into its ruleset
2019-01-23 13:17:29 +01:00
Unknown
4a9bcf4937
rename OsuConfigManager to GameConfigManager
...
also OsuSetting to GameSetting
2019-01-23 13:17:29 +01:00
Shane Woolcock
728c744e4d
Merge branch 'master' into samah-ios
2019-01-23 22:19:49 +10:30
Dean Herbert
8160162cde
Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics
2019-01-21 20:58:17 +09:00
smoogipoo
baae53d784
Merge branch 'diffcalc-fixes' into xexxar-angles
2019-01-20 22:19:50 +09:00
smoogipoo
3db23898df
Merge remote-tracking branch 'origin/master' into diffcalc-fixes
2019-01-20 13:27:42 +09:00
Shane Woolcock
10b91e18bd
Merge branch 'master' into samah-ios
...
# Conflicts:
# osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
smoogipoo
a8e9adafdb
Fix final section not being saved
2019-01-17 12:51:49 +09:00
smoogipoo
e44bc57a3d
Fix minDistanceFromEnd using seconds rather than milliseconds
...
Velocity in stable is defined as distance per SECOND, while lazer defines it as distance per MILLISECOND.
2019-01-15 19:18:56 +09:00
smoogipoo
117c514479
Fix lazy slider calculation inaccuracy
...
What were we doing... On /b/1221540 stable's repeat points happen 90% through the length of each span! We should use lazer's more accurate calculations.
2019-01-15 19:07:25 +09:00
Shane Woolcock
a6c54a9675
Merge branch 'master' into samah-ios
2019-01-12 00:16:09 +10:30
Unknown
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01:00
Dean Herbert
17bc933db2
Revert unnecessary changes
2019-01-10 19:01:41 +09:00
Dean Herbert
8cd058ed9a
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-10 18:38:20 +09:00
VINXIS
a09615144e
Kill White Space
2019-01-09 01:47:39 -07:00
VINXIS
dfe35f850c
Add rebalances to lazer performance calc
2019-01-09 01:42:48 -07: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
Dean Herbert
881b10a18f
Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini
2019-01-08 11:01:04 +09:00
Dean Herbert
7eed3ffe75
Merge branch 'master' into moreOptionsFromSkin.ini
2019-01-08 10:02:06 +09:00
Dean Herbert
4cee21f356
Make skinning better
2019-01-07 20:12:39 +09:00
Dean Herbert
ca98caf84b
Merge pull request #4001 from UselessToucan/linq_temp
...
Use Find instead of FirstOrDefault
2019-01-07 18:50:59 +09:00
Dean Herbert
8914585021
Fix implementation of conditional cursor expanding
2019-01-07 18:28:26 +09:00
smoogipoo
b57c1af084
Only update stacking if there are hitobjects
2019-01-07 18:15:44 +09:00
smoogipoo
c6c22b352f
More verbose exceptions
2019-01-07 18:13:40 +09:00
Dean Herbert
13b077c83b
Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini
2019-01-07 18:11:17 +09:00
smoogipoo
351ab6e9bd
Shortcut O(n^2) calculation
2019-01-07 18:01:44 +09:00
smoogipoo
1c5ab6a906
Implement stacking by index
2019-01-07 18:00:59 +09:00
Dean Herbert
e73845172c
Merge branch 'master' into fix-replay-import-statistics
2019-01-07 13:44:01 +09:00
tangalbert919
4da5ca02eb
Merge branch 'master' into android
2019-01-06 00:06:56 -06: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
smoogipoo
722210d8bb
Merge remote-tracking branch 'origin/master' into xexxar-angles
2019-01-04 23:52:23 +09:00
smoogipoo
3fa5a33fb1
Inline const
2019-01-03 18:58:07 +09:00
smoogipoo
273b14b19c
Add a maximum length for slider ticks to be generated
2019-01-03 18:51:47 +09:00
smoogipoo
c56d8b75c1
Cache slider's endposition
2019-01-03 17:43:10 +09: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
5c1280c092
Fix missing hitwindows
2018-12-28 00:14:00 +09:00
Dean Herbert
fb10d15870
Populate statistics for all rulesets' scores
2018-12-27 21:52:09 +09:00
smoogipoo
77e6f4ab92
Rebalance
2018-12-27 18:41:42 +09:00
VINXIS
227c63dd1c
numtotalhits -> totalHits
2018-12-23 22:23:43 -07:00
VINXIS
8020ac26fb
MBMasher's FL change
2018-12-23 22:14:28 -07:00
smoogipoo
5f0ab0ed7f
Update with vinxis' latest code
2018-12-24 12:41:04 +09:00
smoogipoo
c43c15a557
Multiply previous travel distance by 8
2018-12-23 16:28:19 +09:00
smoogipoo
9fcc727e0d
Fix TravelDistance not being calculated
2018-12-23 16:26:23 +09:00
smoogipoo
d9b8df1595
Merge remote-tracking branch 'origin/master' into user-registration
2018-12-22 17:19:28 +09:00
smoogipoo
c848c83d0d
Refactor for readability + performance
2018-12-22 09:56:33 +09:00
Dean Herbert
f0dfc75bb2
Change osu! default keys back to Z/X
...
A/S was no better as far as keyboard layout agnostic-ness. And people are confused if we change the defaults. Need to take a step back and reassess.
2018-12-22 09:49:09 +09:00
smoogipoo
8546fedd4f
Implement vinxis/xexxar's adjustments
2018-12-22 09:31:30 +09:00
Poyo
08d7c2df70
Fix extra hard-rock flipping for sliders
2018-12-21 16:08:08 -08:00
smoogipoo
be476c58d7
Adjust with latest rebalancings
2018-12-21 22:52:27 +09:00
smoogipoo
5bd16f9a7c
Add scaling factor
2018-12-21 15:16:00 +09:00
smoogipoo
38441759a7
Use angle projections
2018-12-21 14:52:43 +09:00
smoogipoo
3acbf75beb
Adjust threshold
2018-12-21 13:48:10 +09:00
Dean Herbert
ef9d93ff6b
Remove mod multipliers
...
We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.
2018-12-20 19:46:39 +09:00
Dean Herbert
d3368df94d
Simplify changes to RulesetContainer
2018-12-20 19:35:32 +09:00
Dean Herbert
bb850da200
Remove skinnability for now
...
Not sure if we want this going forward.
2018-12-20 15:48:45 +09:00
smoogipoo
1c44e19066
Adjust scaling factor
2018-12-19 13:53:47 +09:00
smoogipoo
0fee76c95c
Fix merge error
2018-12-19 13:45:33 +09:00
smoogipoo
1972f1f279
Fix incorrect angle being used (at object vs into object)
2018-12-19 13:45:33 +09:00
smoogipoo
162774ce27
Make angles unsigned
2018-12-19 13:45:33 +09:00
smoogipoo
434d7d1809
Replace piecewise linear function + rebalance
2018-12-19 13:45:33 +09:00
smoogipoo
9ad7970167
Adjust computations to return sane values
2018-12-19 13:45:33 +09:00
smoogipoo
f4eabacd15
Implement angle assessment
2018-12-19 13:45:33 +09:00
smoogipoo
e7da5b0400
Add the [200 .. 300] bpm speed bonus
2018-12-19 13:45:33 +09:00
smoogipoo
00a4d60e89
Make sure distance is clamped to sane values
2018-12-19 13:45:33 +09:00
smoogipoo
47721f7a07
Adjust base value
2018-12-19 13:45:33 +09:00
smoogipoo
d74652a4f7
Replace piecewise linear function
2018-12-19 13:45:33 +09:00
ekrctb
6f8a2e6ff2
Use LifetimeManagementContainer
...
This is a significant performance boost for gameplay,
especially for long or stroyboard-heavy maps.
2018-12-13 15:23:06 +09:00
Dragicafit
c6c4bcccc3
relocate SkinnableCursor
2018-12-12 11:17:09 +01:00
Dragicafit
4b073aed83
remove spaces
2018-12-11 21:02:12 +01:00
Dragicafit
bfe3b03945
using SkinReloadableDrawable
2018-12-11 18:06:41 +01:00
Dragicafit
fb7d767909
adjust if position
2018-12-11 00:38:03 +01:00
Dragicafit
506f27a92e
cursorExpand is now a bool
2018-12-07 23:52:57 +01:00
Dragicafit
ec3c87dbea
Make Slider's CustumColors skinnable
2018-12-07 22:24:24 +01:00
Dragicafit
0816eaacb8
Make CursorExpand skinnable
2018-12-07 22:22:40 +01:00
Dean Herbert
4f34d42b33
Major code refactors
2018-12-07 21:11:35 +09:00
Dean Herbert
d379d02761
Remove unnecessary base class
2018-12-07 20:12:56 +09:00
WebFreak001
6eff7d9acc
Style fixes
2018-12-06 14:34:10 +01:00
WebFreak001
a14de5bd1b
Remove blinds random NPC
2018-12-06 12:52:39 +01:00
WebFreak001
46b98702e1
make target animation call more obvious
2018-12-06 12:48:11 +01:00
WebFreak001
3cb91979bd
Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
2018-12-06 12:14:48 +01:00
Dean Herbert
1a974f64de
Initial design for user registration dialog
2018-12-05 12:57:26 +09:00
smoogipoo
8eff49bccd
Remove User from Replay
2018-11-30 18:25:14 +09:00
Dean Herbert
d97a15a504
Add IMod and change ShortenedName to Acronym
2018-11-30 17:16:00 +09:00
Dean Herbert
831cd3ed59
ScoreInfo scoreInfo -> ScoreInfo score
2018-11-30 15:18:52 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase
2018-11-30 14:59:58 +09:00
Dean Herbert
5254b07680
Merge remote-tracking branch 'upstream/master' into inter-column-movements
2018-11-30 11:57:53 +09:00
smoogipoo
aea84f737b
Fix taiko hitobjects potentially disappearing before being judged
2018-11-29 12:12:29 +09:00
smoogipoo
52bc47499f
Fix spinners not having proper lifetimes
2018-11-29 12:11:45 +09:00
smoogipoo
b8e60afa69
Move replays to an wrapping Score class
2018-11-28 18:45:17 +09:00
smoogipoo
219929eb47
Score -> ScoreInfo
2018-11-28 18:33:01 +09:00
smoogipoo
2ee181daf7
Re-namespace replay-related classes
2018-11-28 17:20:37 +09:00
smoogipoo
09b79d736b
Remove unused usings
2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77
Re-namespacing
2018-11-28 16:12:57 +09:00
smoogipoo
f9f300b215
Fix drag breaking if scrolling while dragging
2018-11-26 16:08:56 +09:00
smoogipoo
56032a4522
Merge branch 'mania-selection-movement' into inter-column-movements
...
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
# osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
MaxOhn
8a3425948d
Merge branch 'master' of https://github.com/ppy/osu into deflate-branch
2018-11-26 03:45:35 +01:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
55edeb095d
SelectionBox -> SelectionHandler
2018-11-19 16:58:11 +09:00
Dean Herbert
dd21daa635
Merge branch 'master' into fix-mask-disposal
2018-11-18 21:18:00 +09:00
smoogipoo
4cbda97b1e
Move positional adjustment to SelectionBox
2018-11-16 17:12:24 +09:00
smoogipoo
df7515b66f
Pass all selected hitobjects to the selection blueprints
2018-11-15 21:01:09 +09:00
jorolf
41a0f9896e
Merge branch 'master' into flashlight-mod
2018-11-15 00:35:42 +01:00
jorolf
7d2958b7b0
split shader, remove unnecessary clutter and fix some bugs
2018-11-15 00:33:13 +01:00
Dean Herbert
1501e05c04
Merge branch 'master' into fix-mask-disposal
2018-11-14 21:27:37 +09:00
Dean Herbert
84d16ee71b
Merge branch 'master' into placement-hiding
2018-11-14 16:59:41 +09:00
smoogipoo
050af88be9
Fix post-merge issues
2018-11-14 14:29:22 +09:00
smoogipoo
29422345f7
Merge remote-tracking branch 'origin/master' into fix-mask-disposal
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs
# osu.Game.Rulesets.Osu/Objects/Slider.cs
2018-11-14 14:03:25 +09:00
smoogipoo
819cba31ce
Fix spinners not starting placement with the first click
2018-11-13 12:52:44 +09:00
smoogipoo
fbc20d2d4d
Hide placement when cursor is not in the playfield
2018-11-13 12:52:04 +09:00
smoogipoo
f3ba429701
Make sure control points is internally initialised
2018-11-12 17:14:06 +09:00
smoogipoo
d594ce3530
Revert "Make SliderPath.ControlPoints read-only"
...
This reverts commit 3b88d94793
2018-11-12 16:20:38 +09:00
smoogipoo
3aba462e52
Make Path.Distance a property again
2018-11-12 14:07:48 +09:00
smoogipoo
3b88d94793
Make SliderPath.ControlPoints read-only
2018-11-12 14:03:54 +09:00
smoogipoo
51e4feeda7
Adjust to new path structure
2018-11-12 13:55:14 +09:00
smoogipoo
54ab256c8e
Instantiate a new path rather than setting properties on it
...
# Conflicts:
# osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs
# osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
# osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/SliderPath.cs
2018-11-12 13:50:19 +09:00
jorolf
023924396d
Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time
2018-11-11 18:38:12 +01:00
smoogipoo
13279f707b
Cleanups
2018-11-09 14:19:50 +09:00
smoogipoo
cc8531790a
Use bindables for hitobject events
2018-11-09 13:58:46 +09:00
smoogipoo
c6350c6efd
Remove IHasEditablePosition
2018-11-08 13:03:11 +09:00
jorolf
5c09662c14
Allow flashlight size to be variant
2018-11-07 23:40:33 +01:00
smoogipoo
5d51719572
Make selection blueprints handle position adjustments
2018-11-07 16:21:32 +09:00
smoogipoo
2612fd3099
Adjust ruleset-specific namespaces
2018-11-07 16:10:21 +09:00
jorolf
2cffce805a
add flashlight mod
2018-11-07 00:48:54 +01:00
smoogipoo
85f96ad62f
Fix a few missed renames
2018-11-06 18:07:53 +09:00
smoogipoo
bd775af274
PlacementMask -> PlacementBlueprint
2018-11-06 18:04:03 +09:00
smoogipoo
11be820efe
CreateMaskFor -> CreateBlueprintFor
2018-11-06 18:03:21 +09:00
smoogipoo
f2a5f28ea2
SelectionMask -> SelectionBlueprint
2018-11-06 17:56:04 +09:00
smoogipoo
a4caaf56ef
Merge remote-tracking branch 'origin/master' into fix-slider-samples
...
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
# osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
# osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2018-11-05 16:38:28 +09:00
Dean Herbert
63cbc8e0e8
Merge branch 'master' into slider-placement
2018-11-02 19:45:34 +09:00
Dean Herbert
ad49dca86e
Merge branch 'master' into spinner-placement-2
2018-11-02 19:32:52 +09:00
Dean Herbert
e6ee3dc73e
Use framework helper functions for path approximation
2018-11-02 19:26:29 +09:00
Dean Herbert
7f1ee3bcb4
Disallow spinner movement for now
2018-11-02 12:06:53 +09:00
smoogipoo
2ac4f2b6af
Lock spinners to centre of screen
2018-11-01 19:24:58 +09:00
smoogipoo
d78348f178
Reduce duplicate code
2018-11-01 19:23:37 +09:00
smoogipoo
1aae123ff5
Make approximators share an interface
2018-11-01 19:16:44 +09:00
Dean Herbert
1265d5ac0b
Merge branch 'master' into spinner-placement-2
2018-11-01 18:05:44 +09:00
Dean Herbert
c1304eca1b
Merge remote-tracking branch 'upstream/master' into slider-placement
2018-11-01 17:59:37 +09:00
Dean Herbert
5fd21d35dc
Merge branch 'master' into spinner-selection
2018-11-01 17:47:59 +09:00
Dean Herbert
bb2f8deb18
ControlPoint -> PathControlPoint
...
Also Curve -> Path.
2018-11-01 03:56:51 +09:00
smoogipoo
ffec532079
Fix segment control points not changing in unison
2018-10-31 19:02:47 +09:00
smoogipoo
d2fbf05137
Reduce size of control point
2018-10-31 18:01:53 +09:00
WebFreak001
cbd14d5b0e
Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
2018-10-29 19:28:21 +01:00
smoogipoo
aec1d95f04
Implement spinner placement
2018-10-29 18:37:28 +09:00
smoogipoo
e04ad8357d
Make spinner piece respond to scale changes
2018-10-29 18:37:12 +09:00
smoogipoo
af1de01ed6
Add a spinner selection mask
2018-10-29 18:23:23 +09:00
smoogipoo
2ae7b42244
Fix control points disappearing if moved offscreen
2018-10-29 16:15:15 +09:00
smoogipoo
5998d6454b
Use ControlPointVisualiser instead of custom implementation
2018-10-29 15:56:17 +09:00
smoogipoo
08b16be3b8
Merge branch 'slider-controlpoint-masks' into slider-placement
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/SliderMasks/Components/SliderBodyPiece.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
2018-10-29 15:55:38 +09:00
smoogipoo
c1fffde10d
Fix broken conditional
2018-10-29 15:52:28 +09:00
smoogipoo
acd703c27b
Make sliders respond to control point changes
2018-10-29 15:36:43 +09:00
smoogipoo
b0f5ace0e8
Implement slider control point visualisation
2018-10-29 15:29:34 +09:00
smoogipoo
660cd24750
Make sliders respond to scale changes
2018-10-29 15:26:28 +09:00
smoogipoo
a9f1484e8b
Fix some post-rebase issues
2018-10-29 15:26:28 +09:00
smoogipoo
4fa511043e
Use common body piece
2018-10-29 15:26:28 +09:00
smoogipoo
b28f44087d
Bring up to date with further placement changes
2018-10-29 15:26:28 +09:00
smoogipoo
6310c183fa
Modify slider position directly
2018-10-29 15:26:07 +09:00
smoogipoo
8fa783b4c5
Use begin/end placement methods
2018-10-29 15:26:07 +09:00
smoogipoo
a491fb42df
Set slider start time when head is placed
2018-10-29 15:26:07 +09:00
smoogipoo
9540e53e32
Initial controlpoint implementation
2018-10-29 15:26:07 +09:00
smoogipoo
2c4616dbb1
Adjust visual display of the placement curve
2018-10-29 15:26:07 +09:00
smoogipoo
402950b132
Implement path drawing
2018-10-29 15:26:07 +09:00
smoogipoo
bd915e8dca
Implement initial slider placement (linear)
2018-10-29 15:26:06 +09:00
smoogipoo
38ce8f8af1
Refactor SliderSelectionMask
2018-10-29 15:26:06 +09:00
smoogipoo
9b19050faf
Update with slider body changes
2018-10-29 15:25:20 +09:00
smoogipoo
619a0dfd59
Merge branch 'separate-slider-body' into editor-mask-placement
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
2018-10-29 15:24:15 +09:00
smoogipoo
dd5a3ad59c
Fix SliderMask not working
2018-10-29 15:17:45 +09:00
smoogipoo
86e09a68f7
Separate slider body to bypass snaking logic
...
The snaking logic contains a lot of caching/optimisations and offsetting of the path which is tedious to re-compute when the path changes.
2018-10-29 15:15:29 +09:00
Dean Herbert
4f65d67e2b
Merge branch 'master' into skinnable-spritetext
2018-10-28 08:35:25 -07:00
WebFreak001
72e82b660d
Adjust blinds animations based on player feedback
2018-10-28 01:14:16 +02:00
WebFreak001
3b08ad0742
Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
...
Changes how OsuModBlinds passes the playfield and how DrawableOsuBlinds
handles the restrictTo parameter.
2018-10-27 16:34:48 +02:00
smoogipoo
22c545ea8c
Make circle piece respond to hitobject scale
2018-10-26 15:26:19 +09:00
smoogipoo
4a507c66ee
Cleanup
2018-10-26 15:26:08 +09:00
smoogipoo
f674fcf2c8
Merge branch 'mask-separation' into editor-mask-placement
...
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
# osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
# osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs
2018-10-26 14:05:30 +09:00
smoogipoo
ea3c960b5b
Mask -> Piece for components
2018-10-26 13:51:03 +09:00
smoogipoo
9656186b64
Make the hitobject masks move within their placement/selection
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/Components/HitCircleMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCircleMasks/HitCircleSelectionMask.cs
# osu.Game.Rulesets.Osu/Edit/Masks/HitCirclePlacementMask.cs
# osu.Game/Rulesets/Edit/PlacementMask.cs
2018-10-26 13:45:31 +09:00
smoogipoo
4051864bb4
Re-namespace
2018-10-26 13:39:19 +09:00
smoogipoo
e1db2bbc25
Split visuals of HitCircleSelectionMask into HitCircleMask
2018-10-26 13:31:44 +09:00
smoogipoo
677d0d4a19
Renamespace ruleset masks
2018-10-26 13:31:38 +09:00
smoogipoo
8703db5cc1
Rename HitObjectMask -> SelectionMask
2018-10-26 13:31:23 +09:00
smoogipoo
e14719e440
Mask -> Piece for non-mask components
2018-10-25 18:28:10 +09:00
smoogipoo
d19f80835b
Adjust namespaces
2018-10-25 18:26:28 +09:00
smoogipoo
ea6db8b793
Make the hitobject masks move within their placement/selection
2018-10-25 18:16:25 +09:00
Dean Herbert
a9e5a4351e
Merge branch 'master' into fix-diffcalc-slider-distance
2018-10-21 20:33:50 +09:00
Dean Herbert
f19cc98e6a
Add slightly more explanation
2018-10-20 23:10:33 +09:00
Dean Herbert
0952c20c84
Adjust comment slightly
2018-10-20 23:06:48 +09:00
Dan Balasescu
d284f29637
Add comment describing the speed multiplier
2018-10-18 14:16:46 +09:00
Dean Herbert
cd718812b2
Merge branch 'master' into tighten-diffcalc-tolerances
2018-10-18 14:01:47 +09:00
smoogipoo
1cf6cd10bb
Fix slider travel distances sometimes not being considered
2018-10-18 11:29:50 +09:00
smoogipoo
f42f9cffe3
Make HitCirclePlacementMask directly modify hitcircle position
2018-10-17 18:16:34 +09:00
smoogipoo
d36ac59ca2
Reduce complexity of creating edit ruleset containers
2018-10-17 18:06:00 +09:00
smoogipoo
08e3fe1def
Add PlacementStarted event, rename placement methods
2018-10-17 14:37:45 +09:00
smoogipoo
e8ce5a7e6c
Fix crashes when manually creating sliders
2018-10-16 18:27:09 +09:00
smoogipoo
f384c7228e
Fix post-merge issues
2018-10-16 17:28:23 +09:00
smoogipoo
70f1d17b7e
Merge remote-tracking branch 'origin/master' into editor-mask-placement
...
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
# osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
# osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
smoogipoo
47be95ce0b
Fix slider nodes using the wrong samples
2018-10-16 17:10:24 +09:00
smoogipoo
5095fbcdf7
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
2018-10-16 10:27:18 +09:00
smoogipoo
657bd5e371
Add some xmldocs
2018-10-15 12:32:59 +09:00
smoogipoo
2f943e77aa
Make Velocity and TickDistance private set
2018-10-15 12:31:52 +09:00
smoogipoo
26b91c96fb
Fix wrong number of ticks on some legacy beatmaps
2018-10-15 12:27:58 +09:00
MaxOhn
69775f62db
Merge remote-tracking branch 'upstream/master' into deflate-branch
2018-10-12 21:34:44 +02:00
MaxOhn
a876beeada
Variable adjustments
2018-10-12 21:34:24 +02:00
MaxOhn
19efa1cafb
Added TestCase, first RepeatPoint now deflates aswell
2018-10-12 20:55:42 +02:00
Dean Herbert
468f7fd1ea
Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework
2018-10-12 19:25:08 +09:00
Jan Jurzitza
460c943958
Merge branch 'master' into mod-fl2
2018-10-12 11:44:55 +02:00
Dean Herbert
8e66f9a85d
Merge branch 'master' into tighten-diffcalc-tolerances
2018-10-12 17:35:33 +09:00
smoogipoo
f585684038
Merge branch 'tighten-diffcalc-tolerances' into optimise-diffcalc
2018-10-12 16:51:37 +09:00
smoogipoo
72c8ae8705
Port the old stacking algorithm
2018-10-12 16:47:27 +09:00
Dean Herbert
d6043a6cd3
Merge remote-tracking branch 'upstream/master' into smooth-path
2018-10-12 16:03:36 +09:00
smoogipoo
e130204a3b
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
2018-10-12 12:26:15 +09:00
smoogipoo
ec9f23ab73
Make IBeatmap.HitObjects an IReadOnlyList
2018-10-11 19:53:07 +09:00
smoogipoo
83fd251c7b
Pass sub-controlpoints as span slices
2018-10-11 17:44:25 +09:00
smoogipoo
7d20efed2c
Fix missing stack position
2018-10-11 13:53:29 +09:00
smoogipoo
f675c93935
Stably-sort hitobjects
2018-10-10 23:11:28 +09:00
Dean Herbert
aac95523ec
Merge branch 'master' into skinnable-spritetext
2018-10-10 20:26:27 +09:00
Dean Herbert
e0a8157d92
Merge branch 'master' into mod-fl2
2018-10-10 19:48:46 +09:00
Dean Herbert
1b6f37f3eb
Merge branch 'master' into wiggle-repeat-points
2018-10-10 19:42:10 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format
2018-10-10 19:19:36 +09:00
smoogipoo
4e37b5c4a7
50ms cap shouldn't be included in the strain decay
2018-10-10 18:53:54 +09:00
smoogipoo
d8f77feddd
Fix using the wrong slider's travel distance
2018-10-10 18:52:57 +09:00
smoogipoo
03a9511399
Apparently stable does use stacking
2018-10-10 18:08:46 +09:00
smoogipoo
b56d09c83b
Set hitobject placement time manually
2018-10-10 15:32:59 +09:00
smoogipoo
d6784c818e
Fix jump/travel distances in some scenarios
2018-10-10 11:49:54 +09:00
MaxOhn
85190079e3
Merge branch 'master' of https://github.com/ppy/osu into deflate-branch
2018-10-10 01:38:41 +02:00
MaxOhn
951ac30de8
ArmedState now considered, SliderBody now deflates (TODO: handle slider's nested objects)
2018-10-10 01:36:37 +02:00
MaxOhn
edb69463fd
Trimming whitespace from comment......
2018-10-09 18:52:34 +02:00
MaxOhn
954bcd8c12
Treat non-DrawableHitCircle's similar to OsuModHidden
2018-10-09 18:36:12 +02:00
MaxOhn
1366b53a71
Added traceable mod + HideButApproachCircle function for DrawableHitCircle
2018-10-09 13:16:27 +02:00
Dan Balasescu
a2838d32bf
Merge branch 'master' into skinnable-spritetext
2018-10-09 16:23:43 +09:00
smoogipoo
0a3be0d253
Adjust comments slightly
2018-10-09 12:03:47 +09:00
smoogipoo
9facf707be
Add diffcalc beatmap decoder
2018-10-09 11:49:24 +09:00
Fayne Aldan
edf87bfdd8
Merge branch 'master' into wiggle-repeat-points
2018-10-08 15:23:45 -06:00
smoogipoo
f8eaccddda
Stable doesn't use stacked positions
2018-10-08 18:37:49 +09:00
smoogipoo
0116db95d0
Fix progress calculation
2018-10-08 18:37:30 +09:00
smoogipoo
35f45e74dc
Calculate scaled positions prior to square-rooting
2018-10-08 17:39:10 +09:00
smoogipoo
1ad5090ad6
Separate travel distance from jump distance
2018-10-08 17:38:12 +09:00
smoogipoo
61e7ada977
Use ints + fix position calculation
2018-10-08 17:36:06 +09:00
smoogipoo
da97600076
Fix inaccurate section lengths for first hitobject
2018-10-08 16:46:58 +09:00
smoogipoo
42664f1c19
Make SliderBody use the new SmoothPath
2018-10-05 15:45:45 +09:00
smoogipoo
ff559a3a1b
Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
...
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
smoogipoo
d0007c047a
PlayfieldLayer -> PlayfieldAdjustmentContainer
2018-10-05 10:39:18 +09:00
smoogipoo
e931aa3d9e
Move positional modifications to HitCirclePlacementMask
2018-10-04 13:43:50 +09:00
smoogipoo
6a65802528
Fix hitcircle selections not responding to stacking changes
2018-10-04 12:19:11 +09:00
smoogipoo
1cd11a6e5b
Fix StackHeight changes not causing position updates
2018-10-03 17:06:18 +09:00
smoogipoo
3420e0c7eb
Re-implement composition tools + implement placement masks
2018-10-03 16:27:26 +09:00
smoogipoo
540a010fbb
Implement an intermediary EditRulesetContainer
2018-10-03 15:36:24 +09:00
smoogipoo
28b0ab6123
Split visuals of HitCircleSelectionMask into HitCircleMask
2018-10-03 14:35:26 +09:00
smoogipoo
1164108a95
Renamespace ruleset masks
2018-10-03 13:45:41 +09:00
smoogipoo
4cdb6dcea5
Rename HitObjectMask -> SelectionMask
2018-10-03 13:28:00 +09:00
ekrctb
68980fc477
Adjust usage of Handle(Non)PositionalInput to follow framework update
2018-10-02 14:45:33 +09:00
ekrctb
50091252e2
Adapt signature change of event handlers
2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af
Change signature to new event handler
2018-10-02 12:02:47 +09:00
MaxOhn
0ae9c78c38
set drawableOnApplyCustomUpdateState private to make AppVeyor happy :)
2018-10-01 12:29:21 +02:00
MaxOhn
01a4c8d92b
Add deflate mod to OsuRuleset.cs
2018-10-01 12:11:19 +02:00
MaxOhn
0f0ee48bfd
Merge with ppy/osu master
2018-10-01 12:10:42 +02:00
Kyle Chang
846b06fce1
Merge branch 'master' into spin-in
2018-09-30 11:39:08 -04:00
MaxOhn
8b09935c37
previous commit only added scaling-up (oops), this one includes fading
2018-09-30 14:49:52 +02:00
MaxOhn
98042eb7d4
add the default fadeout-while-scaling-up to clicked objects
2018-09-30 14:46:36 +02:00
MaxOhn
cf8e6cf0ec
Merge remote-tracking branch 'origin/deflate-branch' into deflate-branch
2018-09-30 14:30:57 +02:00
MaxOhn
9a5127d506
fixed object scale upon hit
2018-09-30 14:29:55 +02:00
smoogipoo
0d8276c5f8
Implement skinnable sprite text
2018-09-27 17:40:28 +09:00
Dean Herbert
2ed7785cfc
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-26 19:50:48 +09:00
smoogipoo
a8f156584b
Update framework with positional/non-positional changes
2018-09-26 14:01:15 +09:00
Kyle Chang
2069467434
Use HitObject scale to determine judgement size
2018-09-24 21:18:55 -04:00
Kyle Chang
7a43677849
Make judgements scale with cs
2018-09-22 22:54:38 -04:00
Kyle Chang
3cc75bac34
Adjust easings
2018-09-21 20:26:01 -04:00
smoogipoo
0bc2bcaf14
Remove GetAspectAdjustedSize() and PlayfieldArea
2018-09-21 15:14:49 +09:00
smoogipoo
26094ea325
Simplify + rename playfield layers in Osu/Catch
2018-09-21 15:01:58 +09:00
smoogipoo
a166d03ede
Remove duplicate implementation of the Osu playfield layer
2018-09-21 14:43:38 +09:00
smoogipoo
368ceec47c
Simplify creation of a playfield
2018-09-21 14:35:50 +09:00
smoogipoo
826dc6ceb7
Make Playfield not a ScalableContainer
2018-09-21 14:02:32 +09:00
Kyle Chang
3cb33e53cc
Hid approach circles after rewinding replays
2018-09-21 00:07:09 -04:00
Kyle Chang
bfa430ad8c
Fix judgement backgrounds without breaking other things
2018-09-20 23:51:43 -04:00
Kyle Chang
ece4da0435
Revert "Fix judgement backgrounds not appearing properly"
...
This reverts commit 58e989f
2018-09-20 23:49:15 -04:00
Kyle Chang
58e989fb9d
Fix judgement backgrounds not appearing properly
2018-09-20 21:08:31 -04:00
Kyle Chang
51d26fb648
Now spin in mod; circles spin in
2018-09-20 19:09:58 -04:00
Kyle Chang
3a0d376645
Merge remote-tracking branch 'upstream/master' into zoom-in
2018-09-20 17:13:11 -04:00
Kyle Chang
1e3599bdde
Disable fade in
2018-09-20 00:23:54 -04:00
Kyle Chang
dbc2eb4771
Create ZoomIn Mod
2018-09-19 00:03:00 -04:00
ekrctb
a3e6973b41
Replace usage of now removed TriggerKeyPress and similar methods.
2018-09-19 11:36:55 +09:00
WebFreak001
8a01fc1bff
Make random in blinds mod the same every replay
2018-09-17 20:31:50 +02:00
WebFreak001
2de3b33780
Readonly fixes
2018-09-16 16:57:43 +02:00
WebFreak001
c9ea5ce817
Made blinds open during breaks and start
2018-09-16 16:51:18 +02:00
WebFreak001
633e8fafee
Style & const fix
2018-09-16 12:57:54 +02:00
WebFreak001
91b25870ef
Make fruit catcher enter and leave what's behind the blinds
2018-09-16 12:48:36 +02:00
Fayne Aldan
d855e5957a
Don't wiggle repeat points independently
2018-09-15 16:16:37 -06:00
WebFreak001
5f3c0549c9
Sprites in blinds mod & gameplay improvements
...
There are now skinnable actual blinds (shoji screen panels)
The black overlay is still behind them to avoid cheating with skins
The blinds don't open linearly anymore, they are health squared now
When easy mod is on, there is always a little gap open
2018-09-15 23:44:22 +02:00
WebFreak001
040a44d42c
Merge branch 'master' of github.com:WebFreak001/osu into mod-fl2
2018-09-15 20:12:06 +02:00
Joehu
f99eff1192
Use consistent terminology format
2018-09-15 07:30:11 -07:00
Paul Teng
1a8665864c
Remove redundant explicit array type info
2018-09-15 08:55:29 -04:00
Paul Teng
3e02a36938
Make Wiggle incompatible with Transform
2018-09-15 08:43:22 -04:00
Paul Teng
92c6b570ea
Make Transform incompatible with Wiggle
2018-09-15 08:42:04 -04:00
Dean Herbert
14c2aec53e
Merge remote-tracking branch 'upstream/master' into ArrangeMod
2018-09-14 18:48:32 +09:00
Dean Herbert
ec6185cd31
Reduce random allocations
2018-09-14 18:21:12 +09:00
Dean Herbert
ef31698f56
Further code tidying
2018-09-14 18:21:12 +09:00
Dean Herbert
00daaef27a
Use a slightly more suiting icon
2018-09-14 18:21:12 +09:00
Dean Herbert
9d94aa4e62
Fix formatting and constants
2018-09-14 18:21:12 +09:00
MaxOhn
b1f6828a1a
Added OsuModWiggle class and adjusted OsuRuleset.cs
2018-09-14 18:21:11 +09:00
Dean Herbert
da8b838438
Merge branch 'master' into ArrangeMod
2018-09-14 17:20:04 +09:00
Dean Herbert
02ef8ef418
Merge branch 'master' into deflate-branch
2018-09-14 17:19:32 +09:00
Dean Herbert
7cca990be4
Merge remote-tracking branch 'upstream/master' into framework-image-changes
2018-09-07 18:56:00 +09:00
Dean Herbert
a1780fddc9
DrawInfo -> DrawColourInfo
2018-09-06 18:02:04 +09:00
Dean Herbert
9f67119ba9
Fix potential nullref in IsPresent override
2018-09-06 18:01:32 +09:00
Dean Herbert
4ff66bf531
Update in line with framework Image changes
2018-09-06 13:28:44 +09:00
MaxOhn
b72d44b1e8
Added OsuModDeflate class and adjusted OsuRuleset.cs
2018-09-05 22:54:07 +02:00
miterosan
4c42d40314
Correct the comment from explosion to object
2018-09-05 21:09:09 +02:00
Dean Herbert
34c42aed89
Merge branch 'master' into ArrangeMod
2018-09-05 02:33:00 +09:00
Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
Dean Herbert
68a79f895a
Fix mania throwing an exception on start of map
2018-08-30 14:58:00 +09:00
smoogipoo
1b279d383f
Use GetAsync on all textures
2018-08-27 17:26:44 +09:00
miterosan
726a510189
remove not needed usings
2018-08-24 22:33:14 +02:00
miterosan
8b016f05e6
Remove unessesary nl
2018-08-24 22:24:57 +02:00
miterosan
8112a51d5f
Only apply the transformation once and make the distance and theta dynamic.
2018-08-24 22:23:27 +02:00
Dean Herbert
ffcad6e0f1
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
...
# Conflicts:
# osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
2018-08-24 15:26:36 +09:00
miterosan
0a48f8eadd
remove empty object ctar args
2018-08-22 21:39:59 +02:00
miterosan
6600f7b30e
correct the namings and styling
2018-08-22 21:27:20 +02:00
miterosan
957a026c08
Merge branch 'ArrangeMod' of https://github.com/miterosan/osu into ArrangeMod
2018-08-22 21:20:49 +02:00
miterosan
5c5191b9c3
Rename the mod class to transform.
2018-08-22 21:19:28 +02:00
miterosan
173d12c1ec
rename arrange to transform
2018-08-22 21:17:18 +02:00
miterosan
c374755cc8
only affect spinner, hitcircle and slider and nothing else.
2018-08-22 21:16:45 +02:00
miterosan
d070a3e2d8
Only affect hitcicles, slider and spinner
2018-08-22 20:46:03 +02:00
smoogipoo
d14dad64e8
Fix hitobject stacking being applied too early
2018-08-21 16:01:28 +09:00
Dean Herbert
1984ae6d0b
Merge pull request #3266 from smoogipoo/remove-override
...
Remove sliderball's ReceiveMouseInput override
2018-08-21 13:04:04 +09:00
smoogipoo
34b1abeca3
Remove sliderball's input override
2018-08-21 12:24:48 +09:00
Dan Balasescu
c4264794e0
Merge branch 'master' into relax
2018-08-21 12:11:10 +09:00
Dean Herbert
e628e78f24
Update uniform usage
2018-08-20 13:39:22 +09:00
Dean Herbert
6a4ff19c90
Merge branch 'master' into relax
2018-08-17 23:17:07 +09:00
Dean Herbert
41f8609e0f
Also handle OnScroll
2018-08-17 20:13:14 +09:00
Dean Herbert
442f6795bc
Block user input
2018-08-17 19:33:14 +09:00
smoogipoo
557a2ee39d
Add more comprehensive tests
2018-08-17 10:04:00 +09:00
smoogipoo
eb6f1ae72c
Fix spinners providing one extra combo
2018-08-17 09:16:28 +09:00
Dean Herbert
bc22a28fef
Clean up logic and variables
2018-08-16 18:18:15 +09:00
Dean Herbert
870f6bea47
Only process alive objects
2018-08-16 18:18:08 +09:00
Dean Herbert
ff0dfa7acf
Merge branch 'master' into relax
2018-08-16 17:36:24 +09:00
smoogipoo
31f324945e
Implement combo offsets
2018-08-15 11:47:31 +09:00
smoogipoo
da3e2cfee2
Catch/osu! spinners should have combo
2018-08-15 11:13:23 +09:00
miterosan
82054cde38
Merge branch 'master' into ArrangeMod
2018-08-14 21:57:10 +02:00
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework
2018-08-06 12:30:46 +09:00
smoogipoo
3a7488767c
Make HitObject not store the judgement
2018-08-06 11:50:18 +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
5fd4ed2f4e
Rename judgement-related methods/events + commenting
2018-08-06 10:55:25 +09:00
miterosan
89a18e4aac
remove nl and add comment for -1 and +1
2018-08-05 15:39:12 +02:00
miterosan
d1ffb7c2d7
Use timepreempt and put appeartime and move duration into their own vars.
2018-08-05 15:38:27 +02:00
miterosan
8ad8c2b6d0
Reset the ScoreMultiplier to 1
2018-08-05 15:16:25 +02:00
miterosan
7653ce80cd
add a period after EVERYTHING
2018-08-05 15:16:10 +02:00
miterosan
d32ffc1ebc
Swtich order of the moveto and the movetooffset.
2018-08-05 15:14:52 +02:00
miterosan
876d410fa1
Add missing ;
2018-08-05 15:13:04 +02:00
miterosan
f02d1f9013
move the 250 appear disance to a const var.
2018-08-05 15:10:42 +02:00
WebFreak001
b33954d9db
Implement blinds mod
2018-08-05 14:20:56 +02:00
tgi74000
924bf9174c
Fix overclick in certain situations
2018-08-05 09:58:15 +02:00
tgi74000
b1d1a2400b
Remove IUpdatableByHitObject completely
2018-08-05 09:52:19 +02:00
miterosan
546bdf0618
remove default value init .-.
2018-08-04 00:36:59 +02:00
miterosan
25791b6317
remove space.
2018-08-04 00:30:46 +02:00
miterosan
159ce8e93e
Add license header
2018-08-04 00:29:32 +02:00
miterosan
67c64ac459
Put the arrange mod into the fun section.
2018-08-04 00:26:26 +02:00
miterosan
5bb12b574b
The arrange mod is not ranked I think.
2018-08-04 00:26:06 +02:00
miterosan
3457bc08e5
Merge branch 'master' of https://github.com/ppy/osu into ArrangeMod
2018-08-04 00:21:48 +02:00
tgi74000
07d6a75e23
Rename variables to be human readable
2018-08-04 00:18:09 +02:00
tgi74000
7310c38df9
Add relax mod
2018-08-03 14:03:11 +02:00
smoogipoo
2a4994e5ce
Make hitobjects only have one judgement + result
2018-08-03 15:38:48 +09:00
smoogipoo
8d81e66f88
Fix osu score processor crashing
2018-08-02 21:07:11 +09:00
smoogipoo
4548d2c87f
Make Rulesets.Osu use the new judgement result structure
2018-08-02 20:36:38 +09:00
smoogipoo
462f1033c0
Migrate Rulesets.Osu to the new judgement system
2018-08-02 15:21:23 +09:00
Dean Herbert
3c06655672
Split out Special mods into Automation and Conversion
2018-07-31 18:00:42 +09:00
Dean Herbert
51506efd1a
Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation
2018-07-31 16:49:31 +09:00
Dean Herbert
ea6cab498e
Add comment
2018-07-31 16:47:13 +09:00
Dan Balasescu
04252293a7
Merge branch 'master' into fix-repeat-arrow-interpolation
2018-07-31 16:21:15 +09:00
Dean Herbert
874b5636e4
Merge remote-tracking branch 'upstream/master' into tgi74-more-skinning
2018-07-31 16:15:27 +09:00
Dean Herbert
976653fdf9
Minor formatting fixes
2018-07-31 16:13:52 +09:00
Dean Herbert
132241424d
Apply FollowPoint alpha to inner container (should not affect legacy skins)
2018-07-31 15:59:06 +09:00
Dan Balasescu
0a7a2c83a8
Merge branch 'master' into fix-follow-circle-size
2018-07-31 15:41:15 +09:00
Dean Herbert
a98bb057e2
Fix follow circle being scaled far larger than it should be
2018-07-31 15:27:21 +09:00
tgi74000
36afae5a24
Remove the inner followcircle fade, Fade the entire followcircle instead
2018-07-30 13:43:02 +02:00
Dean Herbert
21f3ff6e77
Fix slider repeat points appearing far too late
2018-07-30 18:51:25 +09:00
Dean Herbert
f4cda695e6
Improve rotation handling in edge cases
2018-07-30 18:50:59 +09:00
miterosan
4d306ef837
Add comments and clean up code.
2018-07-30 11:39:21 +02:00
miterosan
23a37d06cf
Implement the arrange mod.
2018-07-30 11:34:20 +02:00
tgi74000
c6aabc6d2d
Move the FollowCircle border to its own container
2018-07-30 10:52:37 +02:00
Dean Herbert
a39188f762
Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation
2018-07-30 17:29:21 +09:00
tgi74000
84135c49ca
Fix small FollowPoint rotation bug
2018-07-29 23:21:05 +02:00
tgi74000
18096490b6
Add support for followpoint skinning
2018-07-29 23:20:37 +02:00
tgi74000
4322475ad2
Add support for sliderb skinning (single frame only)
2018-07-29 22:29:07 +02:00
tgi74000
257c035f30
Add support for sliderfollowcircle skinning
2018-07-29 21:28:13 +02:00
tgi74000
52d9461f03
Add support for reversearrow skinning
2018-07-29 20:51:06 +02:00
tgi74000
2a9818a128
Add support for sliderscorepoint skinning
2018-07-29 20:42:05 +02:00
smoogipoo
ff2a3a6e92
Fix hitobjects not properly expiring if scrolling in the editor
2018-07-26 20:07:16 +09:00
Dean Herbert
10656be954
Add interpolation to repeat point during sliding
2018-07-23 16:55:38 +02:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display
2018-07-23 02:58:49 +09:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
3fc7f33e90
Merge branch 'master' into centralise-judgement-display
2018-07-20 17:29:15 +09:00
smoogipoo
1139f0dbf2
Centralise method of disabling playfield judgements
2018-07-20 17:04:33 +09:00
Dean Herbert
ffd3040fe2
Fix GameplayCursor state not restoring correctly after Show/Hide
2018-07-18 19:59:04 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if
2018-07-17 16:44:57 +09:00
Dean Herbert
825941aff1
Use switch with type matching in place of if-else where possible
2018-07-17 14:35:09 +09:00
Dean Herbert
b967fe714b
Fix lead-in time now being long enough in many cases
2018-07-17 14:29:22 +09:00
smoogipoo
2d8e2dc5f7
Merge remote-tracking branch 'origin/master' into osu-default-bindings
2018-07-13 19:32:40 +09:00
Ethan Yang
157ca8b2a4
Change osu key bindings
2018-07-08 11:47:39 -07:00
Dean Herbert
79af5cb0a0
Limit shake duration to ensure it doesn't overlap miss window
2018-07-06 17:24:30 +09:00
Dean Herbert
e041352690
Add comment regarding add/clear/remove overrides
2018-07-06 13:19:43 +09:00
Dean Herbert
48d90a67ae
xmldoc and formatting
2018-07-06 12:13:23 +09:00
Dean Herbert
aa96d91762
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
2018-07-06 11:57:32 +09:00
Dean Herbert
d453414070
Forward shakes from slider head objects to sliders
2018-07-06 11:52:58 +09:00
tgi74000
558b2622a7
Move the Shake logic to a new ShakeContainer
2018-07-05 15:48:54 +02:00
Dean Herbert
1d6609d9f3
Add common custom words to dotsettings dictionary
...
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
smoogipoo
45a4187923
Tidy up lookups to NestedHitObjects
2018-07-02 16:10:56 +09:00
Dean Herbert
831b11ff97
Remove unnecessary null checks
2018-07-02 14:28:56 +09:00
Dean Herbert
c04bfb96e1
Merge remote-tracking branch 'upstream/master' into UselessToucan-null_coalescing_quickfix
2018-07-02 14:26:41 +09:00
Dean Herbert
812929fa05
Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess
2018-07-02 13:10:42 +09:00
Dan Balasescu
f35ea18755
Merge branch 'master' into hit-shake
2018-06-29 17:38:02 +09:00
tgi74000
3d50050089
Move shake duration to a constant
2018-06-29 10:36:00 +02:00
Dan Balasescu
e3317b5145
Make method protected
2018-06-29 17:31:13 +09:00
Dean Herbert
098aeabc9e
Merge branch 'master' into catch-scoring
2018-06-29 17:16:14 +09:00
Dean Herbert
c0b65a6a73
Change default IsBonus definition and remove unnecessary overrides
2018-06-29 17:07:08 +09:00
Dean Herbert
cacabeb67e
Remove unused field
2018-06-29 17:00:41 +09:00
Dean Herbert
0940715631
Merge branch 'master' into catch-scoring
2018-06-29 14:59:15 +09:00
smoogipoo
756cabd5d0
Add a preprocess method to BeatmapProcessor
2018-06-29 12:45:48 +09:00
Dean Herbert
9d4bc7b630
Fix combo index being wrong
2018-06-29 01:34:47 +09:00
Dean Herbert
0a945e4709
Check whether initialised first
2018-06-28 22:44:40 +09:00
tgi74000
59e03fa528
Move Shake to DrawableOsuHitObject, Clean up Shake()
2018-06-28 15:33:59 +02:00
tgi74000
61c416dc16
Trigger Shake if HitCircles are hit too early
2018-06-28 13:41:23 +02:00
Dean Herbert
e197ebe4c5
Fix slider heads displaying in incorrect colour
2018-06-28 01:55:09 +09:00
Dean Herbert
10220a61a5
Use playfield size constants where possible
2018-06-27 12:18:00 +09:00
smoogipoo
0e6cc78d9a
Add slider ticks conversion test
2018-06-27 12:09:40 +09:00
smoogipoo
6f65ad33f0
Output one value per slider nested hitobject
2018-06-27 12:09:40 +09:00
smoogipoo
0366b0f081
The tail circle will always be the last hitobject
2018-06-27 12:09:40 +09:00
smoogipoo
80501de4b9
Add legacy slider offsets
2018-06-27 12:09:21 +09:00
Roman Kapustin
2a72062c33
Perhaps the '??' operator works in a different way than it was expected. Its priority is lower than priority of other operators in its left part.
2018-06-26 00:53:31 +03:00
Dean Herbert
22138d39ca
Merge branch 'master' into more-diffcalc-attributes
2018-06-25 19:53:22 +09:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
smoogipoo
48989df6eb
Make sure that 0 SR is returned when there are no hitobjects
2018-06-21 12:04:14 +09:00
Dan Balasescu
bf11a61d52
Merge branch 'master' into more-diffcalc-attributes
2018-06-21 09:26:50 +09:00
Dan Balasescu
77e03a59a9
Merge branch 'master' into ruleset-container
2018-06-19 21:47:10 +09:00
Tom Arrow
ad883e087a
RulesetContainer<TObject> cannot be derived
2018-06-19 14:31:24 +02:00
Dan Balasescu
0b1b3319aa
Merge branch 'master' into update-framework
2018-06-19 20:57:19 +09:00
Dean Herbert
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
Tom Arrow
4aa89de2d7
Fix reverse arrow displayed with incorrect angle
2018-06-18 17:22:01 +02:00
smoogipoo
41abd5990c
Move osu! difficulty attributes to OsuDifficultyCalculator
2018-06-14 16:27:05 +09:00
smoogipoo
af218b3d8d
No need to use properties
2018-06-14 16:13:21 +09:00
smoogipoo
8f7334874c
Fix up performance calculators
2018-06-14 16:04:48 +09:00
smoogipoo
47fc18d7c4
Adjust OsuDifficultyCalculator in-line with changes
2018-06-14 15:45:16 +09:00
Dean Herbert
f4cb0d7d8d
Fix memory leak due to incorrect binding
2018-06-13 14:16:58 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs
2018-06-12 13:13:18 +09:00
Dan Balasescu
9994c69d58
Merge branch 'master' into fix-object-ordering
2018-06-11 17:53:33 +09:00
smoogipoo
f4fbf27d42
Give ruleset settings a ruleset-specific config manager
2018-06-11 13:28:50 +09:00
Crusensis
fbc0cd6f5f
Split AffectsCombo into IsBonus
2018-06-09 18:14:33 -07:00
Dean Herbert
aaa65c428f
Merge branch 'master' into diffcalc-modtypes
2018-06-09 23:35:17 +09:00
smoogipoo
ff60f69f47
Explicitly construct local beatmaps rather than using GetBoundCopy
2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
smoogipoo
83ff47ec80
Rewrite difficulty mod combinations
2018-06-06 16:20:17 +09:00
Dean Herbert
3567823759
Reverse order of exposed objects in HitObjectContainer
...
Closes #2740 .
2018-06-06 15:03:47 +09:00
smoogipoo
8274623ad6
Cleanup multi mod constructions
2018-06-06 14:07:50 +09:00
Dean Herbert
f253828d49
Fix regressions
2018-06-06 13:51:51 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting
2018-06-06 12:09:12 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
smoogipoo
2ccffb9ac4
Add difficulty calculation mod types
2018-06-03 10:59:56 +09:00
Dean Herbert
2f21b9c4ea
Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits
2018-05-31 12:36:37 +09:00
smoogipoo
a3470f9ec3
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
smoogipoo
d850e34003
Actually cast to int
2018-05-26 09:25:16 +09:00
smoogipoo
215cc9fba7
Change all performance calculators to use int hitwindows
...
Has a pretty large (>6) effect on pp for some maps.
2018-05-25 20:07:14 +09:00
smoogipoo
765a50d007
Remove 0.5 offsets
...
Checked up against DB values + server-side build versions, and these 0.5s don't seem to exist. Brings calculations more in-line with osu!stable.
2018-05-25 20:05:53 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
Dean Herbert
cea935ea40
Merge branch 'master' into osu-hd-setting
2018-05-21 15:21:09 +09:00
smoogipoo
1f37dca7b7
Fix HR / EZ being applied twice to AR
2018-05-19 14:47:06 +09:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows
2018-05-18 11:59:16 +09:00
Vidalee
6a1abf4084
Merge branch 'master' into osu-hd-setting
2018-05-17 19:39:17 +02:00
smoogipoo
eba1d309b6
Fix incorrect namespace of OsuPerformanceCalculator
2018-05-17 16:58:22 +09:00
smoogipoo
f67d263596
Move ruleset-specific hitwindows to post-converted hitobjects
2018-05-17 13:35:15 +09:00
smoogipoo
c1d9fcc140
Make OsuPerformanceCalculator use the new hitresult namings
2018-05-16 12:46:31 +09:00
smoogipoo
cf08293be1
Remove extra newline
2018-05-15 21:49:44 +09:00
smoogipoo
4101b8ddde
Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements
2018-05-15 21:31:58 +09:00
smoogipoo
22f3bee55a
Fix incorrect iteration over difficulty sections
2018-05-15 21:26:06 +09:00
smoogipoo
bc197a88e1
Fix slider length calculation including slider head
2018-05-15 21:25:33 +09:00
smoogipoo
1b5c151e0e
Fix DeltaTime being capped incorrectly
2018-05-15 21:25:02 +09:00
smoogipoo
49c36787d7
Remove triangle pattern and remove not-implemented reading strain
2018-05-15 21:24:41 +09:00
Dean Herbert
0e0cc8bb69
Merge branch 'master' into namespace-cleanup
2018-05-15 18:10:48 +09:00
smoogipoo
995fda9b6f
Move base classes to osu.Game.Rulesets.Difficulty namespace
2018-05-15 17:38:08 +09:00
smoogipoo
9fd972e0a3
Rename OsuDifficulty -> Difficulty
2018-05-15 17:36:29 +09:00
Dean Herbert
e39af1c906
Merge branch 'master' into convert-object-hitwindows
2018-05-15 17:33:27 +09:00
smoogipoo
10e2f74538
Port osu-performance HD AR fix
2018-05-15 11:53:11 +09:00
smoogipoo
a81921118d
Strip whitespaces
2018-05-14 11:54:11 +09:00
smoogipoo
6e1d651087
Merge remote-tracking branch 'origin/master' into convert-object-hitwindows
2018-05-14 11:17:39 +09:00
smoogipoo
ce6b4cc2d3
Add more attributes to OsuPerformanceCalculator's output
2018-05-14 11:15:37 +09:00
smoogipoo
e1b8a1589b
Fix TimeRate not being considered for performance calculation
2018-05-14 11:15:14 +09:00
Dean Herbert
f6df704deb
Merge branch 'master' into diffcalc-fixes
2018-05-12 22:16:20 +09:00
smoogipoo
416ed72597
Port osu-performance changes into OsuPerformanceCalculator
2018-05-12 15:46:25 +09:00
smoogipoo
a337248999
Fix incorrect count
2018-05-11 22:06:16 +09:00
smoogipoo
224f1a0810
Fix incorrect osu! difficulty calculator combo count
2018-05-11 21:49:16 +09:00
smoogipoo
faa82f17cc
Pass original hitobject HitWindows during conversion
2018-05-11 15:30:50 +09:00
Vidalee
16bcd6c3ed
Appvtests ( #1 )
...
* Resolving AppVeyor's errors
2018-05-08 14:33:26 +02:00
smoogipoo
251bdfdee8
Simplify statistics in osu ruleset
2018-05-07 15:51:08 +09:00
smoogipoo
5f74dc2c17
Simplify osu-ruleset statistics
2018-05-07 15:51:08 +09:00
smoogipoo
5489976c20
Implement ruleset-specific beatmap statistics
2018-05-07 15:51:08 +09:00
smoogipoo
268c14813b
Fix resharper warnings
2018-05-07 11:38:41 +09:00
smoogipoo
9128e64c9a
Rename OriginalBeatmap back to Beatmap
2018-05-07 10:29:38 +09:00
smoogipoo
4ecdea8b2e
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
2018-05-07 10:17:54 +09:00
smoogipoo
77e661489d
Merge branch 'i-beatmap' into beatmap-conversion-rework
2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65
Merge remote-tracking branch 'origin/master' into i-beatmap
2018-05-07 09:58:53 +09: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
0dce7a5b61
Update framework + fix CI errors
2018-04-20 18:19:17 +09:00
smoogipoo
c9e4a07e12
Merge remote-tracking branch 'origin/master' into remove-approachcircle-hax
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs
# osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
2018-04-20 18:04:43 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7
Use IBeatmap wherever possible
2018-04-19 20:44:38 +09:00
tgi74000
9b36cf2066
Review changes
2018-04-16 14:14:40 +02:00
tgi74000
b23b0a445b
Add support for replay mods
2018-04-13 15:41:35 +02:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
cea3e1c7f5
Remove now unnecessary approachcircle proxy disables
...
Prereqs:
- [ ] ppy/osu-framework#1505
2018-04-09 18:44:50 +09:00
Dan Balasescu
1895111c75
Merge branch 'master' into dynamic-assembly-update
2018-04-06 20:16:13 +09:00
Dean Herbert
acbdbcc3df
Update AssemblyInfo in line with framework changes
2018-04-06 13:17:26 +09:00
Dean Herbert
6c125683d4
Merge branch 'master' into selectionlayer-rewrite
2018-04-04 20:47:36 +09:00
Dean Herbert
b7325d73e8
Don't inherit VisbilityContainer
2018-04-04 20:44:11 +09:00
smoogipoo
d4cb00e08f
Don't display judgements in OsuEditPlayfield
2018-04-04 17:12:41 +09:00
Dean Herbert
788bfde002
Merge branch 'master' into selectionlayer-rewrite
2018-04-04 15:38:27 +09:00
Dean Herbert
ddba7254ca
Merge remote-tracking branch 'upstream/master' into linq
2018-04-03 13:05:08 +09:00
Dean Herbert
d40ccbd70a
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 12:03:11 +09:00
Dean Herbert
77189073b2
Merge branch 'master' into scalablecontainer-size-fix
2018-04-03 11:29:36 +09:00
Dean Herbert
57b4cdaf85
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 03:05:42 +09:00
Dan Balasescu
d7b61b3c09
Merge branch 'master' into Small-Clean-Up
2018-04-02 14:13:15 +09:00
Huo Yaoyuan
b842f682eb
Use Linq.Append and Prepend.
2018-04-02 12:06:34 +08:00
smoogipoo
551ba6ac4b
Fix ScalableContainer irrepairably altering content size
2018-04-02 13:06:06 +09:00
Joseph Madamba
ee14ca7cc5
Merge branch 'master' into score-multiplier-edits
2018-03-31 10:43:58 -07:00
Dan Balasescu
824201336a
Merge branch 'master' into hr-on-mania-is-unranked
2018-03-30 16:35:00 +09:00
smoogipoo
4ad776bfde
Make slider circle masks not handle mouse input at all
2018-03-30 14:15:46 +09:00
Joseph Madamba
0887dafa2c
Revert changes on hard rock mod
2018-03-29 20:36:52 -07:00
Dean Herbert
e1123c5a95
Merge branch 'master' into selectionlayer-rewrite
2018-03-30 12:29:58 +09:00
smoogipoo
3129c2cc75
Fix slider circle masks blocking input for now
2018-03-29 22:41:49 +09:00
smoogipoo
d9c5a0c6d1
Fix position editing not working
2018-03-29 22:38:44 +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
smoogipoo
187a025d36
Make hitobjects sorted by their start times
2018-03-29 16:07:31 +09:00
Joseph Madamba
af9e3a849f
Merge branch 'master' into score-multiplier-edits
2018-03-28 20:42:35 -07:00
Dean Herbert
9aae568bbe
Tidy up csproj further
2018-03-28 15:19:56 +09:00
Dean Herbert
9667d54ecb
Add missing licence headers
2018-03-28 14:48:08 +09:00
Dean Herbert
0026b94cd3
Consolidate and move ruleset test projects
2018-03-28 14:41:25 +09:00
Dean Herbert
1a8aa87469
Make everything better
2018-03-27 18:56:54 +09:00
Dean Herbert
b290d2d039
Move NUnit includes to individual projects
2018-03-27 15:07:09 +09:00
smoogipoo
dd5bbbbd9f
Define testable projects
2018-03-26 19:11:23 +09:00
smoogipoo
5159127bce
Fix SQLite failing to initialize on test projects
2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6
Only compile with net461 in visual studio
2018-03-26 15:44:55 +09:00
smoogipoo
3f9b14704e
Fix extra semicolon
2018-03-26 13:30:58 +09:00
smoogipoo
96901b6498
Add msbuild/dotnet build + launch targets
2018-03-26 10:52:54 +09:00
Joseph Madamba
90d763fda5
Apply review changes and suggestions
2018-03-25 10:00:30 -07:00
Joseph Madamba
78a7564acd
Score multiplier edits
2018-03-24 16:00:18 -07:00
smoogipoo
31920f1866
Fix ruleset resources not getting included in build
2018-03-25 02:12:01 +09:00
smoogipoo
d28de89e50
Add net461 target to test projects for nunit discovery
...
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632 ).
2018-03-25 01:35:50 +09:00
John Neijzen
7b39447213
Update OsuAutoGenerator.cs
2018-03-24 18:34:56 +08:00
John Neijzen
bee9af8500
Update OsuAutoGenerator.cs
2018-03-24 18:30:36 +08:00
John Neijzen
9d96aeb347
Update OsuAutoGenerator.cs
2018-03-24 17:53:50 +08:00
John Neijzen
12f785bf40
Change duplicate condition to HitResult.Good instead of HitResult.Meh
2018-03-24 17:48:43 +08:00
John Neijzen
97be022e22
Remove duplicate condition
2018-03-24 16:55:39 +08:00
smoogipoo
c29f7a4333
Merge remote-tracking branch 'origin/master' into netstandard
2018-03-24 14:49:46 +09:00
Dean Herbert
9d3529ce7b
Merge branch 'master' into cursor-skinning
2018-03-22 21:07:16 +09:00
Dean Herbert
af65f2dd48
Move AccentColour changes local to rulesets which rely on it
2018-03-22 18:53:16 +09:00
Dan Balasescu
ab9505652b
Merge branch 'master' into skin--completion
2018-03-22 16:44:00 +09:00
smoogipoo
4ccaf143b5
Give sliders a default accent colour
2018-03-22 15:50:19 +09:00
Dean Herbert
78a8f60b39
IHasComboIndex -> IHasComboInformation
2018-03-22 12:35:17 +09:00
Vidalee
505a7c14fc
was persuaded I changed the if statement...
2018-03-21 21:14:17 +01:00
Dean Herbert
d909cce8d6
Add the ability to skin the gameplay cursor
2018-03-21 20:06:10 +09:00
Vidalee
8159e219fd
increaseFirstObjectVisibility now cannot be null
2018-03-20 22:23:27 +01:00
Vidalee
cdbe6bf22d
cleared comment
2018-03-20 21:55:35 +01:00
Vidalee
4068be1293
cleared comment
2018-03-20 21:54:44 +01:00
Vidalee
9252203916
build fix
2018-03-20 18:23:41 +01:00
Dean Herbert
fb3d319d0e
Make fallback bool into a function
...
Allows correct handling now that beatmap skins are also a thing.
2018-03-20 16:40:11 +09:00
Dean Herbert
c38c26eacb
Move combo index processing to BeatmapProcessor
2018-03-20 15:57:43 +09:00
Dean Herbert
cb3d0db555
Move combo colours completely out of HitObjects
2018-03-20 15:50:12 +09:00
Vidalee
fea8f868d7
Fixing hidden test bug
2018-03-17 13:22:58 +01:00
Dean Herbert
7e7f8ed7a2
Merge branch 'master' into drawable-composite-hit-object
2018-03-16 15:53:16 +09:00
Dean Herbert
23ffee3d38
Merge branch 'master' into drawable-composite-hit-object
2018-03-16 15:38:52 +09:00
Dean Herbert
46f5c0fc19
Merge branch 'master' into mod-fixes
2018-03-16 15:38:41 +09:00
Dan Balasescu
cdc61d5f0d
Merge branch 'master' into fix-combo-colours
2018-03-16 14:59:45 +09:00
Dean Herbert
7ed84465fb
Merge branch 'master' into mod-fixes
2018-03-16 11:27:39 +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
Dean Herbert
8d433cb4bf
Merge branch 'master' into cursor-trail
2018-03-15 11:14:21 +09:00
Dean Herbert
a0691168cb
Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement
2018-03-14 15:35:24 +09:00
Dean Herbert
81f82d98a1
Rework a lot of naming and structure
2018-03-14 15:18:21 +09:00
Joseph Madamba
d122aa80e4
Edit mods description, multiplier, and code
2018-03-13 20:07:03 -07:00
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail
2018-03-14 11:42:40 +09:00
Vidalee
8a86766324
Changes requests
2018-03-13 23:21:47 +01:00
Dean Herbert
c55d70ec13
Merge branch 'master' into fix-combo-colours
2018-03-13 19:19:45 +09:00
Dean Herbert
e43de68ad3
Move colour parsing to LegacyDecoder
2018-03-13 19:13:50 +09:00
smoogipoo
0c705b0397
Rename to EditorTestCase
2018-03-13 15:57:05 +09:00
Dean Herbert
b93e83e3d2
Merge branch 'master' into base-editor-testcase
2018-03-13 15:53:33 +09:00
Dean Herbert
107ad8cfff
Merge remote-tracking branch 'FreezyLemon/master' into more-skinning
2018-03-12 22:01:59 +09:00
smoogipoo
d2859d779d
Create a base TestCaseEditor for rulests to derive
2018-03-12 19:43:52 +09:00
smoogipoo
8c4bcb4a04
Only accept drag movement on the overlays
2018-03-12 17:33:10 +09:00
smoogipoo
212142429f
Derive from IHasPosition
2018-03-12 17:25:34 +09:00
smoogipoo
2d9fcdcbd0
Fix slider circle overlays moving with the endpoints
2018-03-12 17:18:50 +09:00
Dean Herbert
eb643b690a
Merge branch 'master' into more-skinning
2018-03-12 11:55:50 +09:00
Dean Herbert
d27cf16bf9
Merge remote-tracking branch 'ppy/master' into more-skinning
2018-03-12 10:46:37 +09:00
Dan Balasescu
8ba87dfdbd
Merge branch 'master' into fix-duplicate-judgements
2018-03-12 10:29:50 +09:00
Vidalee
6d9e78a3a3
Review changes
2018-03-11 22:40:49 +01:00
Vidalee
9516bec13d
Fix naming rule
2018-03-11 21:45:15 +01:00
Vidalee
eed0f3a1de
Added setting to not hide the first object in Hidden mod
2018-03-11 21:02:14 +01:00
Dean Herbert
ccc3c573ab
Fix resharper not fixing
2018-03-11 02:20:00 +09:00
Dean Herbert
5092fe5596
Adjust cursor trail display length
...
In line with shader change at ad5ddec7b2
2018-03-11 02:11:56 +09:00
Dean Herbert
df2815f19e
Add TestCase for GameplayCursor
2018-03-11 02:11:25 +09:00
Dean Herbert
487a03d0d7
Merge branch 'master' into cursor-trail
2018-03-11 02:07:05 +09:00
smoogipoo
92b302971f
Trim whitespace
2018-03-10 01:23:53 +09:00
smoogipoo
24501c37dd
Merge branch 'drawableslider-cleanup' into editor-hitobject-movement
2018-03-10 01:15:24 +09:00
smoogipoo
8ed5fce43a
Split out the slider head into a separate drawable hitobject
2018-03-10 01:13:59 +09:00
smoogipoo
376f6eec58
SetPosition -> OffsetPosition
2018-03-10 00:02:13 +09:00
smoogipoo
4a48136e4f
Make hitobject positions adjustable
2018-03-09 23:12:34 +09:00
Dean Herbert
81b778fdcf
Merge branch 'master' into cursor-trail
2018-03-08 09:31:42 +09:00
Dean Herbert
04f5563238
Match HP drain harshness closer to stable
...
Based on number of misses before fail on two arbitrary tests. Obviously not final, just making the game more playable for the time being.
2018-03-07 19:37:26 +09:00
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
Dean Herbert
f2d7621df3
Add skin support for explode/flash layers
...
Basically to hide them for legacy skins, though.
2018-03-07 18:21:05 +09:00
Dean Herbert
05eb678654
Add skin support for judgements
2018-03-07 18:21:05 +09:00
Dan Balasescu
1375ee8408
Merge branch 'master' into slider-tick-transform-cleanup
2018-03-07 16:59:04 +09:00
Dean Herbert
4dfd3a61cc
Remove alpha setting
2018-03-06 18:40:39 +09:00
Dean Herbert
7cf1d4450a
SliderTick transform improvements
2018-03-06 18:28:36 +09:00
Dean Herbert
e82cadc811
Make LegacyID nullable
...
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
Dean Herbert
d1a115f4ec
Merge remote-tracking branch 'upstream/master' into cursor-trail
2018-03-05 23:34:04 +09:00
Dean Herbert
3ddaf1879d
CursorTrail always present, just to be safe
2018-03-05 20:20:06 +09:00
Dean Herbert
f4965ee7d6
Use high precision updating on CursorTrail
...
Avoids bloackage
2018-03-05 20:20:06 +09:00
Dean Herbert
69c0e95d9d
Use a better fade effect for the gameplay cursor
2018-03-05 20:20:06 +09:00
Dean Herbert
60f851df3e
Add support for DrawInfo alpha when drawing CursorTrail
2018-03-05 20:15:07 +09:00
Dean Herbert
ea6e3938c0
Fix hard crash due to spinner spin requirement being zero
...
Resolves #2133 .
2018-03-04 03:01:47 +09:00
Dean Herbert
0e928429d4
Merge branch 'master' into ruleset-replayframes
2018-03-04 01:57:43 +09:00
Dean Herbert
06cf9cbd63
Merge branch 'master' into fix-perfectcurve
2018-03-02 21:49:33 +09:00
Dean Herbert
bd9d26921a
Less BeaIBeatmapConvertereatmapConverters
2018-03-02 20:39:43 +09:00
Dean Herbert
22cbbcc639
Merge branch 'master' into beatmap-conversion-testcases
2018-03-02 20:21:41 +09:00
smoogipoo
a2c239d5e3
Rename to IBeatmapConverter, move to separate file
2018-03-02 20:19:47 +09:00
smoogipoo
9fef8a3977
Prettify json
2018-03-02 20:13:48 +09:00
smoogipoo
71755f5363
Prettyfy some JSON
2018-03-02 20:12:29 +09:00
Dean Herbert
ca8e52289b
Merge branch 'master' into fix-hr
2018-03-02 19:37:48 +09:00
smoogipoo
401d3fff7b
Add colinear perfect curve test case
2018-03-02 18:38:57 +09:00
smoogipoo
820a852caf
Remove unnecessary .osu properties
2018-03-02 18:37:38 +09:00
smoogipoo
cdca7371a3
Replace testcases with a basic test suite
2018-03-02 18:20:33 +09:00
Dan Balasescu
4aff659272
Merge branch 'master' into beatmap-conversion-testcases
2018-03-02 16:04:32 +09:00
smoogipoo
3d5fefae8c
Add TestFixtureAttribute to all tests
2018-03-02 15:34:31 +09:00
smoogipoo
6fff6da751
Ignore broken testcases
2018-03-02 14:01:34 +09:00
smoogipoo
2e3ee00c19
Remove unnecessary changes
2018-03-02 13:13:01 +09:00
smoogipoo
573d6d1b5f
Allow multiple mappings to be generated for a single hitobject
2018-03-02 13:13:01 +09:00
smoogipoo
4e363664fd
Add beatmap parameter to beatmapconverter creation
2018-03-02 13:13:01 +09:00
smoogipoo
6f5acaa8f9
Remove unnecessary explicit JsonProperties
2018-03-02 13:13:01 +09:00
smoogipoo
e87be213d5
Adjust lenience a little bit
2018-03-02 13:13:01 +09:00
smoogipoo
797d03a65f
Implement basic structure for beatmap conversion testing
2018-03-02 13:13:00 +09:00
smoogipoo
cb39a88c51
Fix HR not affecting slider repeats and ticks
2018-03-02 00:25:14 +09:00
smoogipoo
49b24c2bbf
Fix HR not properly applying to sliders
2018-03-02 00:19:09 +09:00
Dean Herbert
c54c1699bf
Merge branch 'master' into ruleset-replayframes
2018-03-01 22:26:16 +09:00
Dean Herbert
0704d823a9
Fix slider selection point not being set to new origin
2018-03-01 22:03:00 +09:00
smoogipoo
e62fab6cc2
Fix overlay positions/sizes due to sliders now being fixed
2018-03-01 14:34:31 +09:00
smoogipoo
d5d4bcb558
Merge branch 'master' into editor-hitobject-overlays
2018-03-01 14:04:38 +09:00
smoogipoo
195b6642e6
Reimplement important frames
2018-03-01 02:28:15 +09:00
smoogipoo
cf42d5bbd5
Remove mostly-unused Score parameter
2018-03-01 02:28:14 +09:00
smoogipoo
c9c65cab53
CreateReplayFrame -> CreateConvertibleReplayFrame
2018-03-01 02:28:14 +09:00
smoogipoo
222ae70062
Populate rulesets with their replay frames
2018-03-01 02:28:14 +09:00
smoogipoo
a3c7755ade
Implement a conversion process for ReplayFrames
2018-03-01 02:28:14 +09:00
Dean Herbert
e2f57ae346
Merge branch 'master' into parser-sanity-checks
2018-03-01 00:38:44 +09:00
Dean Herbert
3609c685d1
Fix approach circle fading
2018-02-28 20:35:15 +09:00
Dean Herbert
065630487a
Fix slider heads fading out too late
2018-02-28 20:12:16 +09:00
Dean Herbert
5b4fef0180
Add bare minimum sanity checking of beatmap input values to make broken maps load
...
Resolves ppy/osu#1988 .
2018-02-28 18:12:24 +09:00
Dean Herbert
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays
2018-02-26 17:53:50 +09:00
Dean Herbert
1218a75b7f
Improve vector conditional
2018-02-26 16:11:26 +09:00
Dean Herbert
9cbed461c4
Merge branch 'master' into sliderbody-rework
2018-02-26 15:00:18 +09:00
Dean Herbert
f1ddfa0581
Fix sliders never getting a correct lifetime set
2018-02-25 16:25:56 +09:00
smoogipoo
50d1183ec2
Division-by-zero safety + reference our own size
2018-02-24 02:53:02 +09:00
smoogipoo
066abfbdbc
Rename PositionAt -> CurvePositionAt to represent its new meaning
2018-02-24 02:43:36 +09:00
smoogipoo
996e605e61
Remove temporary testcase
2018-02-24 02:39:44 +09:00
smoogipoo
1e1df2aaff
Fix up testcases
2018-02-23 21:04:19 +09:00
smoogipoo
8c90abe0dc
Make slider control points relative to start position
2018-02-23 20:59:27 +09:00
smoogipoo
08bb25347c
Make DrawableSlider contain the slider body
2018-02-23 20:27:05 +09:00
Dean Herbert
84b707f4f8
Add basic hitcircle skinning
2018-02-23 13:38:12 +09:00
Dan Balasescu
6cc54a464c
Merge branch 'master' into editor-hitobject-overlays
2018-02-22 14:25:27 +09:00
smoogipoo
844e87aafe
Use the true head position rather than capturing current position
2018-02-22 14:25:10 +09:00
Dean Herbert
a3336f2577
Merge branch 'master' into fix-editor-osu-scale
2018-02-22 14:14:41 +09:00
smoogipoo
604b0fa20a
Fix post-merge issues
2018-02-22 14:11:06 +09:00
smoogipoo
ded2644df8
Merge branch 'master' into editor-hitobject-overlays
2018-02-22 14:08:36 +09:00
Dean Herbert
b74cfffc6f
Merge branch 'master' into editor-hitobject-movement
2018-02-22 13:19:39 +09:00
Dean Herbert
3b4e4bd110
Merge remote-tracking branch 'upstream/master' into general-slider-improvements
2018-02-22 12:28:33 +09:00
smoogipoo
5faec5c2f1
Add a separate property to control playfield area
2018-02-21 20:54:33 +09:00
smoogipoo
08e52e8c15
Remove unnecessary schedules
2018-02-21 18:02:52 +09:00
smoogipoo
9cd9c83f2c
Allow changing accentcolour/bordercolour post-load
2018-02-21 18:00:46 +09:00
smoogipoo
0d60a65c94
Fix OsuAutoGenerator not considering stacking
2018-02-21 17:53:16 +09:00
smoogipoo
f903e6d241
Fix stacking not working with sliders
...
Fixes #2093 .
2018-02-21 17:46:45 +09:00
smoogipoo
f877b642da
Clean up and document better what "progress" means
2018-02-21 17:10:18 +09:00
Dean Herbert
50d0278cbd
Merge branch 'master' into general-slider-improvements
2018-02-21 11:28:45 +09:00
smoogipoo
9a9f53ddfd
Remove 0.75 scale from osu! playfield in the editor
2018-02-21 11:10:43 +09:00
smoogipoo
4934ef7429
Add playfield aspect ratio + scaling modifications to composer layers
2018-02-21 11:07:42 +09:00
smoogipoo
7fe0989427
Merge branch 'general-slider-improvements' into editor-hitobject-overlays
2018-02-20 23:51:47 +09:00
smoogipoo
ee055b8e5c
Allow customizing the snake-ability of sliders
2018-02-20 20:53:06 +09:00
smoogipoo
8270e4d758
Add BorderColour to SliderBody
2018-02-20 20:51:28 +09:00
smoogipoo
ad2f556133
Add hitobject overlays to selected hitobjects
2018-02-20 18:01:45 +09:00
Dan Balasescu
3d7f998c9b
Merge branch 'master' into osu-rulesetcontainer-aspect
2018-02-20 14:07:04 +09:00
smoogipoo
8f25a5da66
Add playfield aspect ratio + scaling modifications to composer layers
2018-02-20 14:01:33 +09:00
smoogipoo
4898c321f8
Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement
2018-02-19 17:07:03 +09:00
smoogipoo
cd2c9a9de6
Adjust xmldoc and rename to GetAspectAdjustedSize
2018-02-19 17:04:18 +09:00
smoogipoo
ef11ce3dd1
Remove Size override from OsuPlayfield
2018-02-19 17:02:27 +09:00
Dean Herbert
58af66bfc0
Merge branch 'master' into editor-hitobject-movement
2018-02-16 13:59:11 +09:00
Dan Balasescu
9f7736fab3
Merge branch 'master' into restore-ruleset-tests
2018-02-14 22:48:29 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement
2018-02-13 18:56:16 +09:00
smoogipoo
87baa6febd
Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments
2018-02-12 19:08:13 +09:00
smoogipoo
cfb2b3f1e8
Rework SelctionLayer to support click-selections
2018-02-12 16:02:42 +09:00
Aergwyn
c3ce015869
fade slider ticks with hidden mod
2018-02-11 11:03:01 +01:00
smoogipoo
b500b76407
Merge branch 'master' into update-branch
2018-02-08 23:35:48 +09:00
Dean Herbert
534eb223b3
Merge branch 'master' into unified-hitwindows
2018-02-08 17:46:29 +09:00
smoogipoo
c213e58eff
Make slider tails not play hitsounds
2018-02-08 14:40:35 +09:00
smoogipoo
46284c61ae
Return HitResult.None instead of null
2018-02-08 14:25:59 +09:00
smoogipoo
beaecbafbd
Merge branch 'master' into unified-hitwindows
2018-02-08 13:22:44 +09:00
smoogipoo
ccc948a0b9
Update framework (testing)
2018-02-08 12:45:51 +09:00
Dean Herbert
67bd375bfa
Merge remote-tracking branch 'upstream/master' into raw-input-fixes
2018-02-07 22:05:44 +09:00
Dean Herbert
62547dba51
Remove redundant test method
2018-02-06 18:15:21 +09:00
Dean Herbert
3d0ef8b3bd
Move property back to local variable
...
Never used elsewhere
2018-02-06 18:14:08 +09:00
Dean Herbert
27fd42fb17
Adjust appear animations of repeats and ticks
2018-02-06 18:10:15 +09:00
Dean Herbert
e417aaa23f
Adjust scale out effect
2018-02-06 17:46:56 +09:00
Dean Herbert
60fb78e49d
Simplify iteration code
2018-02-06 17:46:45 +09:00
Dean Herbert
dfc344b47a
Update OpenTK version
2018-02-06 13:47:54 +09:00
Dean Herbert
6b35ef7063
Update OpenTK version
2018-02-05 16:13:30 +09:00
ColdVolcano
bf26fc94d8
Merge branch 'master' into repeat-points
2018-02-03 23:56:40 -06:00
smoogipoo
b15f184261
Make osu! use HitWindows
2018-02-02 20:33:59 +09:00
smoogipoo
13f16077d4
Implement Catmull-Rom curve approximator
2018-02-01 20:04:41 +09:00
Dan Balasescu
cf665b717f
Merge branch 'master' into starrating-fix
2018-02-01 18:44:04 +09:00
Dan Balasescu
39e626f29e
Merge branch 'master' into fix-ticks-appearing-late
2018-02-01 18:28:42 +09:00
Dean Herbert
b8f6dcffaf
Merge remote-tracking branch 'upstream/master' into repeat-points
2018-02-01 13:32:53 +09:00
ColdVolcano
b656858ee6
Fix typos
2018-01-31 21:32:10 -06:00
ColdVolcano
06b615c474
Merge branch 'master' into repeat-points
2018-01-31 21:30:28 -06:00
smoogipoo
00001364c3
Better judgement visualisations in testcase
2018-01-30 18:10:14 +09:00
smoogipoo
cd4a0612c0
Properly construct slider ends using HitObject.AddNested
2018-01-30 16:53:19 +09:00
smoogipoo
4b63d25871
Add hit/miss display to TestCaseSlider
2018-01-30 16:45:48 +09:00
smoogipoo
27357e100a
Simplify condition
2018-01-30 16:28:38 +09:00
smoogipoo
702c4efb88
Give Slider a tail hitobject to make slider ends counts towards score
2018-01-30 16:28:14 +09:00
smoogipoo
b293408147
Construct the head of sliders from Slider
2018-01-30 15:50:48 +09:00
Aergwyn
f6501e73e3
remove unwanted using
2018-01-29 12:08:03 +01:00
Aergwyn
373b3871f9
update SliderTick calculation + more ticks in tests
...
math is hard >_<
2018-01-29 12:03:44 +01:00
Thomas Tan
33c5fdcedb
AppVeyor fix
2018-01-29 16:30:46 +08:00
Thomas Tan
c36859ea3a
Create Slider.StackedPositionAt method
2018-01-29 16:22:14 +08:00
Thomas Tan
f66ecae3ff
Merge remote-tracking branch 'upstream/master' into starrating-fix
2018-01-29 16:19:11 +08:00
FreezyLemon
8f0ab2040f
Add Jetbrains.Annotations NuGet package
2018-01-26 12:46:28 +01:00
Thomas Tan
b04e2cbb5c
Fix osu star rating calculation
...
The main bug was that the beatmap was not being processed prior to
having its Skill values calculated, causing stacking to be ignored in
difficulty calculation. The fix involves processing the beatmap with
OsuBeatmapProcessor.
Another minor bug was that sliders were not taking into account the
stacked position midway through the slider (PositionAt does not return
stacked position.), so I corrected by adding StackOffset.
2018-01-26 03:39:19 +08:00
Aergwyn
214938b98d
fix SliderTicks appearing too late
2018-01-25 10:52:03 +01:00
ColdVolcano
8eef81e24d
Add more cases to TestCase
2018-01-24 16:16:46 -06:00
ColdVolcano
1f51149da8
Add xmldoc
2018-01-24 15:41:51 -06:00
ColdVolcano
cee8bb50c9
Fix reference points being wrongly selected
2018-01-24 15:34:52 -06:00
Aergwyn
52c4d22c41
review changes
...
- use doubles instead of floats
- simplify logic
2018-01-24 09:44:50 +01:00
Aergwyn
4baadfdd16
fix oversight
2018-01-23 16:44:33 +01:00
ColdVolcano
efae00c149
make repeat points look better
2018-01-23 04:31:37 -06:00
Aergwyn
24b7d91f5b
Merge branch 'master' into fix-repeats-appearing-early
2018-01-23 09:04:45 +01:00
smoogipoo
33c52ba30f
Fix off-by-ones in RepeatPoint code
2018-01-23 13:58:43 +09:00
smoogipoo
d37844c068
Clean up off-by-one offsets from repeat-related properties
2018-01-23 13:37:25 +09:00
Aergwyn
b726f90c37
remove unnecessary variable
2018-01-22 12:44:55 +01:00
Aergwyn
66176f2882
fix RepeatPoint animations
...
- FadeIn and -Out for RepeatPoints are now calculated instead of fixed values
- TimePreempt is now cut down if too long for RepeatPoints following the first one to only show up to two RepeatPoints at any given time
2018-01-22 12:36:38 +01:00
Shawdooow
29466438a3
fix values
2018-01-19 20:58:43 -05:00
Shawdooow
c29eea870d
correct values
2018-01-19 20:56:41 -05:00
Shawdooow
e109d5fe20
fix slider heads
2018-01-19 11:13:49 -05:00
Shawdooow
4d1142a0ce
overall difficulty
2018-01-19 11:11:28 -05:00
smoogipoo
6908597b95
Fix inverted ternary
...
See #1935 - repeat index 1 is at the end of the slider, not the start.
2018-01-18 23:44:00 +09:00
Dan Balasescu
46ba2cda10
Remove unused using
2018-01-18 21:19:06 +09:00
Dean Herbert
1a83770a06
Fix incorrect math
2018-01-18 21:16:15 +09:00
Dean Herbert
065d2a4887
Add licence header
2018-01-18 21:12:53 +09:00
Dean Herbert
01ff1584c2
Fix repeat points not following slider snaking correctly
2018-01-18 21:06:47 +09:00
Dean Herbert
e2965e1682
Remove unused using
2018-01-18 20:46:57 +09:00
Dean Herbert
063767e381
Prioritise hit normal
...
It's always first but not strictly guaranteed anywhere yet.
2018-01-18 20:37:46 +09:00
Dean Herbert
97884e1d05
Remove unnecessary null checks
2018-01-18 19:57:49 +09:00
Dean Herbert
b4f2bea37b
Fix slider samples playing twice when additions are present
2018-01-18 19:50:26 +09:00
Dean Herbert
9b33499fe7
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
2018-01-16 20:04:34 +09:00
smoogipoo
c309cc9454
Privatise OnJudgements as much as possible
2018-01-16 15:37:32 +09:00
smoogipoo
8c5ef0a330
Remove base OnJudgement from Playfield to properly accomodate nested playfields
2018-01-15 20:48:57 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering
2018-01-15 15:54:18 +09:00
smoogipoo
5952f1e7f1
Adjust transforms for cursor transitions
2018-01-12 19:34:14 +09:00
smoogipoo
512e4d2c9f
Rewrite the way that cursor overrides are done game-wide
2018-01-12 18:13:17 +09:00
Dean Herbert
e5056e11f4
Remove extra newline
2018-01-12 18:07:40 +09:00
Dean Herbert
d0881e443b
Merge remote-tracking branch 'upstream/master' into approach-rate
2018-01-12 18:05:16 +09:00
Dean Herbert
58626e3b30
Allow rulesets to create their own instantiation info
2018-01-10 17:04:07 +09:00
Dan Balasescu
9c602f8770
Merge branch 'master' into drawable-fruit-improvements
2018-01-09 22:06:16 +09:00
Dean Herbert
b8bb0a52e3
Move mod implementations to individual files
2018-01-09 14:08:18 +09:00
TocoToucan
ae032cbf23
Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties
2018-01-07 23:40:00 +03:00
Aergwyn
54c0197eb0
remove early fadeout of sliderball on hidden
...
it shouldn't have been done because it makes fast sliders unplayable as they never appear in the first place, ooops
2018-01-07 09:08:33 +01:00
Aergwyn
006b63eb42
remove unnecessary change of spinner end sequence
...
it wasn't really visible anyways *shrug*
2018-01-07 09:05:36 +01:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
smoogipoo
36e9232472
Merge master into netstandard
2018-01-05 00:42:48 +09:00
Dean Herbert
0cc8516aa3
Remove empty cases, add initial ball scale adjust.
2018-01-04 20:53:33 +09:00
Dean Herbert
717b263b77
Comment and better stacking of FadeOuts
2018-01-04 20:47:42 +09:00
Dean Herbert
1f62fe19d5
Make animation a bit more subtle
2018-01-04 20:43:42 +09:00
Dean Herbert
ffc7f7ecf4
Add a better slider "hit" state fade out animation
2018-01-04 20:16:10 +09:00
Dean Herbert
bde957940d
Disallow SliderBall from contracting after EndTime
2018-01-04 20:09:58 +09:00
Shawdooow
94f81a1784
fix
2018-01-03 10:04:36 -05:00
Shawdooow
9122eaa28e
Merge branch 'master' into approach-rate
2018-01-03 10:02:55 -05:00
Shawdooow
23f3cb6467
address review
2018-01-03 10:01:28 -05:00
Aergwyn
1ce6219293
remove unnecessary override
2018-01-03 13:55:24 +01:00
Aergwyn
d94c313947
fix slider follow circle instantly disappearing on slider ends
2018-01-03 08:13:58 +01:00
Dean Herbert
31865b4d96
Rename conflicting variable
2018-01-03 15:12:27 +09:00
Aergwyn
9ddbed6729
crop slider length to not go out of bounds on small screens/ratios
...
+ use correct methods for short and fast sliders, ooops
2018-01-02 17:10:05 +01:00
Aergwyn
737a53d826
clean up RequiredTypes
2018-01-02 17:04:00 +01:00
Shawdooow
e0beefdfd5
make this a float
2018-01-01 10:30:55 -05:00
Shawdooow
1df79c2f1b
Move stackThreshold up where possible
2018-01-01 10:30:09 -05:00
Aergwyn
80be40ed34
ignore new test classes
2018-01-01 12:08:44 +01:00
Aergwyn
481a16b491
extended hitobject tests
2018-01-01 11:55:30 +01:00
Shawdooow
1502fde1b0
fix slider start circles
2017-12-31 12:04:31 -05:00
Shawdooow
064758b96d
fixes
2017-12-31 11:30:58 -05:00
Shawdooow
3ba5dce052
new Approach to approach rate
2017-12-31 11:15:14 -05:00
Aergwyn
ccb69d16d9
move HitResult in Scoring namespace to replace HitCount
2017-12-30 21:23:18 +01:00
Aergwyn
138d78309f
add HitCount enum and replace string usage with enum
2017-12-30 18:07:30 +01:00
Dean Herbert
233904ddef
Merge branch 'master' into scaling-repeat-points
2017-12-30 18:09:32 +09:00
Aergwyn
1f71bd3425
scale the correct part of the repeat point
2017-12-30 09:05:40 +01:00
Dean Herbert
0bd1b75d0b
Fix test case
2017-12-30 15:38:10 +09:00
Dean Herbert
7f54778fed
Merge branch 'master' into hitobject-constructor-safety
2017-12-30 15:32:36 +09:00
Dean Herbert
a2840d2519
Fix FadeInDuration not being passed down to sliders' InitialCircle
2017-12-30 15:21:25 +09:00
Dean Herbert
a0966305d4
Remove unnecessary new event
2017-12-30 14:46:44 +09:00
smoogipoo
b99e0a0439
Fix DrawableHitCircle accepting a base OsuHitObject parameter
...
Fixes #1778 .
2017-12-30 14:15:42 +09:00
Aergwyn
52dd5ddba6
fix repeat points not scaling properly
2017-12-29 20:03:43 +01:00
Aergwyn
0a2e41884e
add more required types for test slider
2017-12-29 20:01:26 +01:00
Aergwyn
5e887240ae
actually use option to override values...
2017-12-29 18:04:40 +01:00
Aergwyn
6c6fa08a06
added some colour to testsliders
...
gray just wasn't sticking out well
2017-12-29 17:56:48 +01:00
Aergwyn
07040f9fd1
rename field
2017-12-29 17:52:28 +01:00
Aergwyn
5c3b67bcef
remove unnecessary values
2017-12-29 17:51:59 +01:00
Aergwyn
f547c7986d
created option to override values before UpdateState is called
2017-12-29 17:50:55 +01:00
Aergwyn
a58b5ff5f2
simplify sequence
2017-12-29 17:46:22 +01:00
Aergwyn
ca9f014714
add required types to testclasses
2017-12-29 17:44:38 +01:00
Aergwyn
b200134a18
fix spinner easing with hidden
2017-12-29 17:44:10 +01:00
Dean Herbert
db8228f69d
Don't think we need this expire call
2017-12-29 18:57:38 +09:00
Dean Herbert
a4f941cdf1
Move lifetime adjustment to DrawableHitCircle
2017-12-29 18:51:14 +09:00
Dean Herbert
dd2ae3f701
SImplify everything
2017-12-29 18:48:10 +09:00
Dean Herbert
0ae00cbd17
Rename one more variable
2017-12-29 18:28:16 +09:00
Dean Herbert
ced2d9749d
Adjust presets and rename more
2017-12-29 18:25:33 +09:00
Dean Herbert
c9d4da65d2
Simplify and rename time variables
2017-12-29 18:06:41 +09:00
Dean Herbert
27cb445c24
Always recrusively apply custom sequence to nested hitobjects
2017-12-29 17:48:05 +09:00
Dean Herbert
2c61ebbcd9
Remove unnecessary local derived classes
2017-12-29 17:10:33 +09:00
Dean Herbert
b74248a705
Rename application method
2017-12-29 16:22:06 +09:00
Dean Herbert
3f8f778004
Merge branch 'master' into standard-hd-support
2017-12-29 15:56:38 +09:00
Dean Herbert
2ca10b28c6
Use a non-broken opentk library
2017-12-29 15:42:51 +09:00
Aergwyn
ca650e8d48
extend TestCaseSpinner with new steps
...
- Hidden, Size and Scale
2017-12-28 18:21:08 +01:00
Aergwyn
8d5f4d4f19
extend TestCaseSlider with new steps
...
- Hidden, Size and Scale
- made Repeats an SliderStep instead
2017-12-28 18:09:35 +01:00
Aergwyn
cd237da6d3
extend TestCaseHitCircle with new steps
...
- Hidden, Size and Scale
- also fix Auto still missing because no judgement was created
2017-12-28 17:06:15 +01:00
Aergwyn
0b23ceb781
fix slider fade out to be eased
...
+ move duration calculation to not be done twice
+ made Slider / Spinner private again as they are not accessed externally anymore
2017-12-28 15:36:27 +01:00
Aergwyn
dbcf87267d
Merge branch 'master' into standard-hd-support
2017-12-27 21:26:39 +01:00
Aergwyn
e42fa7205b
adjust spinner sequence to the new fadeout speed
2017-12-27 21:23:56 +01:00
Aergwyn
7d29c076d2
fix circles and slider sequences
...
+ minor cleanup
2017-12-27 21:12:02 +01:00
smoogipoo
7b06c16e70
Display larger hitcircles
2017-12-27 23:44:51 +09:00
smoogipoo
7a793eaded
Merge master into netstandard
2017-12-27 20:48:53 +09:00
smoogipoo
6fe20bb910
Ignore test cases for CI
2017-12-27 20:41:59 +09:00
smoogipoo
1a5cf98e0c
Fix repeat points always being placed at end position of th slider
...
PositionAt is clamped to [0, 1] where 0 denotes the beginning of the curve and 1 denotes the end of the curve. It has no concept of repeats.
2017-12-27 20:40:38 +09:00
smoogipoo
c18fd5da48
Simplify creation of repeat points
2017-12-27 20:37:28 +09:00
smoogipoo
5b45d36fef
Decomission TestCaseHitObjects
2017-12-27 20:09:33 +09:00
smoogipoo
4c032df677
Move sliderbars to the end of the testcase buttons
2017-12-27 20:08:33 +09:00
smoogipoo
ccaf63a437
Add a Spinner testcase
2017-12-27 20:01:20 +09:00
smoogipoo
fdafc2107e
Cleanups + add auto to TestCaseHitCircle
2017-12-27 19:47:55 +09:00
smoogipoo
4d5216da00
Finish up implementation of TestCaseSlider
2017-12-27 19:47:42 +09:00
smoogipoo
cb18baa4d8
Add HitCircle/Slider testcases
2017-12-27 17:34:07 +09:00
smoogipoo
ce18a0705d
Merge remote-tracking branch 'origin/master' into sliderbouncers-fix
2017-12-27 16:48:04 +09:00
smoogipoo
5b529511ec
Update OpenTK nuget package
...
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
Aergwyn
4c2554595e
implement hidden (mostly)
...
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00
Aergwyn
f5d4ed2a22
add interface to adjust DrawableHitObjects
2017-12-26 11:49:42 +01:00
smoogipoo
d288d8a51f
Remove SampleInfoList
2017-12-25 15:40:01 +09:00
Shawdooow
72b5a370da
dont play the same sound twice at once
2017-12-23 23:13:53 -05:00
Shawdooow
af2a2781e7
fix the fix harder
2017-12-23 23:12:10 -05:00
Shawdooow
d333fc5efe
fix the fix
...
silly me, that was configured for vitaru!
2017-12-23 23:08:55 -05:00
Shawdooow
a656656403
the fix
2017-12-23 22:47:32 -05:00
Aergwyn
47c75d01ce
access list with index instead of using LINQ
2017-12-23 13:30:44 +01:00
Aergwyn
c5aba9f247
add Samples to RepeatPoint construction
2017-12-23 12:32:21 +01:00
Dean Herbert
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
Dean Herbert
4d40004e97
Merge branch 'master' into beatmap-serialization
2017-12-22 22:45:00 +09:00
smoogipoo
def2e5bd17
Make editor discard approach circles
...
Temporary solution for now.
2017-12-22 22:16:54 +09:00
smoogipoo
6a29f6020a
Make HitObjects construct nested hit objects
2017-12-22 21:42:54 +09:00
Dan Balasescu
a3d947301b
Merge branch 'master' into beatmap-serialization
2017-12-22 07:38:05 +09:00
Dean Herbert
0121692919
Ignore bugged inspectcode inspection
2017-12-21 23:14:42 +09:00
smoogipoo
ac1d27e925
Fix possible nullref exceptions
2017-12-21 23:02:46 +09:00
smoogipoo
d80079a73a
Merge remote-tracking branch 'origin/master' into beatmap-serialization
2017-12-21 20:15:01 +09:00
smoogipoo
a3fcc0b60c
Back to using SortedLists
2017-12-21 19:40:41 +09:00
smoogipoo
cb7e192aff
Determine SampleInfo defaults in DrawableHitObject
2017-12-21 16:02:33 +09:00
Dean Herbert
020d272636
Make all TestCases public
2017-12-20 21:51:00 +09:00
smoogipoo
2c1a83f82e
Merge branch 'master' into editor-selection-tool
2017-12-15 13:36:47 +09:00
Aergwyn
f329b1ed72
add Spinner Count to BeatmapInfoWedge
...
- added Tooltips to the respective InfoLabels
- made the TestCase internal like all others
2017-12-14 19:55:15 +01:00
smoogipoo
6a690908cf
Fix up possible nullref due to early access of Parent
2017-12-14 20:24:24 +09:00
smoogipoo
9c59db4be3
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-14 14:20:49 +09:00
smoogipoo
345b67ac85
Remove unnecessary .Except
2017-12-14 12:46:02 +09:00
Aergwyn
d4cd835419
correctly count HitObjects for their type
...
also legacy classes are internal again
2017-12-13 16:32:32 +01:00
Aergwyn
c6eaaf658e
fix BeatmapInfoWedge not counting Circles/Sliders correctly
2017-12-12 13:24:18 +01:00
smoogipoo
a303bf71cf
Give control over screen space conversion to DrawableHitObject
2017-12-11 22:19:02 +09:00
smoogipoo
7189446943
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-11 16:34:27 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname
2017-12-11 15:41:11 +09:00
smoogipoo
ed81ed7c54
Add back HandleInput disable overrides
2017-12-11 15:19:00 +09:00
Dean Herbert
de1f51269d
Merge branch 'master' into HandleInput
2017-12-11 13:53:33 +09:00
TocoToucan
219bdbc4e1
Populate HandleInput automatically
2017-12-09 22:21:17 +03:00
FreezyLemon
4a723f7382
Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files
2017-12-08 11:05:00 +01:00
Dean Herbert
679134c030
Add ShortName to rulesets
2017-12-08 18:55:25 +09:00
smoogipoo
f41af191ed
Merge remote-tracking branch 'origin/master' into editor-selection-tool
2017-12-08 15:13:18 +09:00
Dean Herbert
a78441bc5a
Apply changes in line with framework input adjustments
2017-12-07 13:16:59 +09:00
Dean Herbert
7957e55710
Merge branch 'master' into editor-composer
2017-12-03 14:47:07 +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
a30270658d
Merge remote-tracking branch 'origin/master' into netstandard
2017-12-01 18:50:28 +09:00
smoogipoo
677f3653eb
Hide osu! playfield cursor
2017-11-30 19:19:34 +09:00
smoogipoo
efa39f38ca
CI fixes
2017-11-30 18:49:08 +09:00
smoogipoo
456bbe25f3
Implement toolbox into HitObjectComposer
2017-11-30 16:58:14 +09:00
smoogipoo
fd3049fd65
Merge remote-tracking branch 'origin/master' into editor-composer
2017-11-30 13:47:47 +09:00
smoogipoo
36be171c29
Fix up/clean up csprojs for C#7 support
2017-11-30 02:06:03 +09:00
smoogipoo
a0c3349935
Add LangVer.props and osu.Game.props for common csproj properties
2017-11-30 00:45:37 +09:00
smoogipoo
267bb75458
Merge remote-tracking branch 'Aergwyn/master' into netstandard
2017-11-29 23:45:29 +09:00
smoogipoo
309eb4edd7
Integrate HitObjectComposer into Compose
...
Also removes the other rulesets' HitObjectComposers for now.
2017-11-29 17:46:21 +09:00
smoogipoo
8c30fd490c
Add HitObjectComposer class
2017-11-29 16:22:11 +09:00
smoogipoo
f807d26cae
Use ranked property of mods rather than checking for individual mods
2017-11-28 21:46:13 +09:00
smoogipoo
7db7fb91dd
Ignore ruleset testcases from CI
2017-11-28 21:45:24 +09:00
smoogipoo
de7c571be3
Merge remote-tracking branch 'origin/master' into netstandard
2017-11-22 19:46:17 +09:00
smoogipoo
f9ad4b6acb
Make categoryDifficulties return doubles to improve decimal accuracy
2017-11-21 19:55:09 +09:00
smoogipoo
decee415dd
Calculate real AR based on PreEmpt time
2017-11-21 19:54:08 +09:00
smoogipoo
0f8d4a455a
Merge remote-tracking branch 'origin/master' into performance-calculator
2017-11-21 19:18:06 +09:00
smoogipoo
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +09:00
Dean Herbert
a2fc5b67ec
Formatting fix
2017-11-21 12:42:28 +09:00
smoogipoo
aac41d2de6
Disable resharper inspections on case-by-case basis
2017-11-20 18:55:48 +09:00
smoogipoo
756f6f2d16
Remove net461 targets
2017-11-20 10:10:28 +09:00
smoogipoo
067c018422
Cleanups
2017-11-19 17:31:35 +09:00
smoogipoo
d2ab0621f3
Make osu.Game + rulesets compile with netstandard
2017-11-19 13:46:51 +09:00
smoogipoo
eb03b0db30
Consider slider lengths as part of Distance
2017-11-17 21:28:59 +09:00
smoogipoo
9260f5b64e
Rework to avoid access to modified closures
2017-11-17 20:57:45 +09:00
smoogipoo
c221cfd30c
Fix slider cursor positions not being taken into account
2017-11-17 20:28:41 +09:00
smoogipoo
c7ffe6fe58
Fix timeRate dividing incorrectly
2017-11-17 20:28:15 +09:00
smoogipoo
5d753427f6
Fix up DT not affecting hitobject densities
2017-11-17 17:28:22 +09:00
smoogipoo
bf44b3d0ef
Cleanups
2017-11-17 16:54:50 +09:00
smoogipoo
825aa6570e
Fix rebase issues
2017-11-17 14:37:19 +09:00
smoogipoo
1e023f0419
Implement PerformanceCalculator testcase
2017-11-17 14:37:19 +09:00
smoogipoo
38fe95d94a
Add basic display for pp in TestCasePerformancePoints
2017-11-17 14:37:19 +09:00
smoogipoo
95fd323c6b
Fix ManiaDifficultyCalculator possibly failing due to nullref
2017-11-17 14:37:06 +09:00
smoogipoo
ac6213d1fa
CI fixes
2017-11-17 14:26:33 +09:00
smoogipoo
7892eefd68
Fix up mod application + beatmap/hitobject references
2017-11-17 14:23:52 +09:00
smoogipoo
18f2e92a48
Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator
2017-11-17 12:36:13 +09:00
smoogipoo
62155e6dd5
Make DifficultyCalculator support mod applications
...
Fixes https://github.com/ppy/osu/issues/476 .
2017-11-17 12:36:07 +09:00
smoogipoo
f461f03b08
Make osu! compile with framework changes
2017-11-16 14:51:31 +09:00
smoogipoo
66ee9d1631
Update in-line with framework changes
2017-11-09 17:04:04 +09:00
smoogipoo
348083f589
Update with framework state transformation
...
Removes explicit initial state setting in DrawableOsuHitObjects.
2017-11-09 14:05:05 +09:00
smoogipoo
c7426ebed8
Fix spinners showing very weird numbers after rewinding
...
Fixes #1462
2017-11-06 17:22:22 +09:00
smoogipoo
4854302aaa
Fix follow points not showing up again after rewinding
...
Fixes #1463 .
2017-11-04 01:02:33 +09:00
smoogipoo
5fd3115142
Fix slider ball not animating fade/scale after rewinding
...
Fixes #1455
2017-11-03 15:58:12 +09:00
smoogipoo
60048e6cd1
Fix slider ticks not showing up again once replayed
...
Fixes #1456
2017-11-03 15:33:24 +09:00
smoogipoo
06a62edeb6
Make DrawableRepeatPoints show up when replayed
...
Fixes #1458
2017-11-03 15:30:46 +09:00
smoogipoo
70ea3e5025
Fix up initial scale of DrawableRepeatPoint
2017-11-03 15:29:16 +09:00
smoogipoo
240997e4fb
Remove duplicate property
2017-11-02 21:56:18 +09:00
smoogipoo
fe00ac7e41
Make DrawableHitObject/ScoreProcessor support rewinding
2017-11-02 21:21:07 +09:00
smoogipoo
6883b3742f
Make initial DrawableOsuHitObject initial states not use transforms
2017-11-02 20:23:28 +09:00
Dean Herbert
bbc5c05055
Disable ruleset-level tests for now
2017-10-23 21:25:54 +09:00
Dean Herbert
ad685bd919
Merge branch 'master' into sliderbouncers
2017-10-22 14:12:03 +09:00
Dean Herbert
36af0dc809
Update app config for rulesets
2017-10-19 14:59:11 +09:00
Dean Herbert
5d5ea5fb2e
Fix all remaining db structure issues
2017-10-19 14:05:11 +09:00
Dean Herbert
179542daf1
Standardise AssemblyInfos
2017-10-14 15:02:20 +09:00
Dean Herbert
c5046f6b3c
Add back osu.Desktop project
...
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.
This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
Shawdooow
a0cb624c9d
start at 1
2017-10-12 10:28:55 -04:00
Dean Herbert
1b031ca328
Fix potential read from empty queue in SPM counter
2017-10-12 18:28:26 +09:00
Dean Herbert
2b309be3c2
Merge remote-tracking branch 'upstream/master' into spm-counter
2017-10-11 11:23:09 +09:00
Dean Herbert
e76961a932
Remove unnecessary bool
2017-10-11 11:23:02 +09:00
Dean Herbert
1fc16693d6
Formatting
2017-10-11 11:20:44 +09:00
Dean Herbert
d5892cf54e
Add a bool to specify whether judgements should be visible for certain DrawableHitObjects
2017-10-09 20:17:05 +09:00
Huo Yaoyuan
09093013a7
Move spm calculation into counter.
2017-10-07 15:58:53 +08:00
Huo Yaoyuan
a876ab9b90
Move spm counter to a seperated control.
2017-10-07 15:31:42 +08:00
Huo Yaoyuan
404c4917dc
Use single queue for spinning record.
2017-10-06 20:42:24 +08:00
Huo Yaoyuan
29f9c8143d
Use RotationAbsolute to calculate spm.
2017-10-05 20:08:45 +08:00
Huo Yaoyuan
ee8746b848
Fade in spm texts.
2017-10-05 20:07:33 +08:00
Huo Yaoyuan
24187cc53a
Move spm text out of scaled parts.
2017-10-05 19:55:20 +08:00
Huo Yaoyuan
134e1299bb
Update spm value when spinner not active.
2017-10-05 19:23:58 +08:00
Huo Yaoyuan
3de42ee405
Smooth spm values into a time range.
2017-09-30 15:23:10 +08:00
Huo Yaoyuan
e2e26c91af
Show SPM value basically.
2017-09-29 22:30:41 +08:00
Huo Yaoyuan
40a27c810a
Calculate SPM in spinner disc.
2017-09-29 19:24:14 +08:00
Shawdooow
cfb1804aa1
address review
2017-09-27 11:28:44 -04:00
Shawdooow
4e8944de04
fix maps ending early
2017-09-26 22:54:33 -04:00
Shawdooow
801fa39145
remove old SliderBouncer
2017-09-26 12:23:13 -04:00
Shawdooow
b5ad6ae735
appveyor fixes
2017-09-26 12:21:39 -04:00
Shawdooow
adebe166d4
slider bouncers
2017-09-26 12:13:34 -04:00
Dean Herbert
e0911f014e
Fix ruleset target path for release builds
2017-09-19 22:50:36 +09:00
Dean Herbert
d192c2d83b
Merge remote-tracking branch 'upstream/master' into ctb-improvements
2017-09-19 20:54:39 +09:00
Dean Herbert
99b512cce5
Output ruleset assemblies to the game folder rather than adding special logic
2017-09-19 19:27:14 +09:00
Dean Herbert
1f20c5eb69
Optimise project references
2017-09-19 16:07:00 +09:00
Dean Herbert
8fa76557db
Avoid unnecessary dll copies
2017-09-19 16:06:59 +09:00
Dean Herbert
6db705a3a8
Update relative paths
2017-09-19 16:06:58 +09:00
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
Dean Herbert
8ccbc07dec
Remove unnecessary constructor
2017-09-15 20:54:46 +09:00
Dean Herbert
b78c516b74
Merge branch 'master' into scoring-revamp
2017-09-13 20:47:14 +09:00
Dean Herbert
25f2a102f4
Fix CI issue
2017-09-13 20:35:44 +09:00
Dean Herbert
fb7740a3ab
Update all dependencies in line with framework
2017-09-13 20:25:40 +09:00
smoogipooo
5e32d95ad2
Remove Ruleset's CreateScoreProcessor method
2017-09-13 16:37:05 +09:00
smoogipooo
093d82ac45
Set depths from playfield add methods instead of DrawableHitObject
2017-09-13 16:17:01 +09:00
smoogipooo
e146bcacf1
Make BasePortion and ComboPortion constants
2017-09-13 16:13:27 +09:00
smoogipooo
ba3e44cd71
Simplify standardized scoring to BasePortion (raw scoring) + ComboPortion (highest combo)
2017-09-13 15:17:32 +09:00
smoogipooo
7b30fc8a09
Fix osu! slider initial circles being placed at the wrong depth.
2017-09-13 00:43:30 +09:00
smoogipooo
3386dbb243
Fix incorrect HitResult for slider ticks.
2017-09-13 00:37:18 +09:00
smoogipooo
7b44ad300f
Remove accurateHits, make Accuracy once again tied to comboScore
2017-09-13 00:33:01 +09:00
smoogipooo
b5f48c2368
Add storeResults as a parameter to Reset
...
Whether to store the current state of the ScoreProcessor for future use.
2017-09-12 22:27:27 +09:00
smoogipooo
2e0218f388
Move AllObjectsJudged into ScoreProcessor as AllJudged
...
Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.
2017-09-12 22:01:08 +09:00
smoogipooo
cc6bb81a73
Reimplement Exponential scoring with a simpler and more intuitive calculation
...
Default for all rulesets for now.
2017-09-12 21:47:09 +09:00
smoogipooo
d0774c7bc6
ComputeTargets -> SimulateAutoplay + improve xmldoc
2017-09-12 21:16:47 +09:00
smoogipooo
abab2a4878
Revamp score processing to once more unify scoring methods
2017-09-12 21:05:50 +09:00
smoogipooo
0b94939474
Make Accuracy = 1, Health = 1 the default for ScoreProcessor
2017-09-12 20:53:26 +09:00
smoogipooo
d070fb8063
Actually make DrawableSliderTick return an OsuJudgement now
2017-09-12 19:48:35 +09:00
smoogipooo
c7677d896a
Remove SliderTickJudgement
2017-09-12 19:47:44 +09:00
Dean Herbert
86de4fa2e2
Apply CI fixes
2017-09-12 18:36:19 +09:00
Dean Herbert
f32d444d68
Remove generics from Playfield (fixes catch)
2017-09-12 18:19:28 +09:00
Dean Herbert
d7ac02d090
Ensure judgements aren't updated when ArmedState is not idle
2017-09-12 18:00:41 +09:00
Dean Herbert
1194e46ef1
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-12 17:46:21 +09:00
smoogipooo
58c875bdca
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 15:02:12 +09:00
Dean Herbert
5ce76d8023
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-11 14:36:51 +09:00
Dean Herbert
7170fbd087
Target .NET 4.6.1
2017-09-11 12:39:00 +09:00
Dean Herbert
3cacee300a
Fix a false resharper positive
2017-09-11 11:41:29 +09:00
smoogipooo
cde22865b9
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 02:42:23 +09:00
MrTheMake
a7f874e5b6
Merge branch 'master' into leaderboard-scores
2017-09-07 18:25:33 +02:00
smoogipooo
19db7a8f72
Update in line with framework changes.
2017-09-07 22:46:21 +09:00
smoogipooo
0cc443e618
Remove all generic judgements.
2017-09-06 18:05:51 +09:00
smoogipooo
29941019a5
Hacky way to make osu! and taiko work again.
2017-09-06 17:44:51 +09:00
smoogipooo
ac8ec31b61
Make judgements able to be "added" plus make everything compile and run.
2017-09-06 17:02:13 +09:00
Dean Herbert
84c22df3f5
Combine Judgement.HitResults into one.
2017-09-06 17:01:48 +09:00
Dean Herbert
081b98ef39
"Use" the hitobject
...
Obviously temporary.
2017-09-05 21:41:20 +09:00
Dean Herbert
0fc2e49ce6
Remove second calculateScore call
2017-09-05 19:33:20 +09:00
Dean Herbert
d69b8d7784
Add basic combo score factor to osu! ruleset
2017-09-05 17:09:58 +09:00
Dean Herbert
ed0f2a654b
Rename variable
2017-09-04 18:51:50 +09:00
Akash Mozumdar
c6b226b017
refactor
2017-09-01 15:32:03 -04:00
Akash Mozumdar
080bdf808c
Merge branch 'master' of https://github.com/Artikash/osu
2017-08-31 21:35:59 -04:00
Akash Mozumdar
472710e5db
trim whitespace
2017-08-31 21:35:30 -04:00
Akash Mozumdar
04596fee61
Update OsuScoreProcessor.cs
2017-08-31 08:26:06 -04:00
Akash Mozumdar
af2f45a980
slight edits
2017-08-31 04:44:00 -04:00
Akash Mozumdar
cbc35e0cf3
implemented hp
2017-08-31 04:31:48 -04:00
Akash Mozumdar
d252af8ab4
basic implementation of hp
2017-08-31 02:36:25 -04:00
Dean Herbert
1b0a1dd410
Add missing licence header
2017-08-24 20:37:03 +09:00
Dean Herbert
a7a7e0323f
Update autoplay and replay handling to result in actions, not keys
2017-08-24 15:36:42 +09:00
smoogipooo
56292bd7f0
Use constant definition.
2017-08-23 16:54:06 +09:00
smoogipooo
42e6865493
Flip hit objects.
2017-08-23 16:35:30 +09:00
Dean Herbert
ea450fecf5
Merge branch 'master' into action-key-counter
2017-08-21 16:25:44 +09:00
Dean Herbert
16e96888ab
Update KeyCounterCollection to support action-based buttons
2017-08-21 12:39:22 +09:00
smoogipooo
6a7b410bc3
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
2017-08-21 11:58:54 +09:00
Dean Herbert
09b5eef26e
Fix incorrect osu! defaults
2017-08-20 21:56:28 +09:00
Dean Herbert
aebda8b032
Merge branch 'master' into fix-slider-tracking-outside-follow-circle
2017-08-20 18:27:38 +09:00
Shane Woolcock
71ddbd22a1
Convert ReceiveMouseInputAt override to lambda syntax, and make Tracking property private set
2017-08-20 14:00:53 +09:30
Shane Woolcock
51af233d66
Fix sliders not checking the correct cursor position once it moves out of the follow circle
2017-08-19 12:19:37 +09:30
Dean Herbert
f829caf197
Fix custom logic still existing in OsuInputManager
2017-08-19 07:24:29 +09:00
MrTheMake
6d401b5f21
Merge branch 'master' into leaderboard-scores
2017-08-19 00:00:40 +02:00
Dean Herbert
a8996b8b5f
Merge branch 'master' into fix-sliders-ignoring-actions
2017-08-19 00:30:40 +09:00
Dean Herbert
d6249e7a63
Add support for binding mouse buttons to actions
2017-08-18 20:01:41 +09:00
Shane Woolcock
7e0fe6cbcb
Fix slider tracking to use pressed actions rather than directly querying the mouse buttons
2017-08-18 20:19:23 +09:30
Shane Woolcock
9558d2a161
Remove unnecessary using
2017-08-18 19:39:28 +09:30
Shane Woolcock
44feef78f1
Simplify OsuActionInputManager property
2017-08-18 19:32:08 +09:30
Shane Woolcock
529732ea47
More CI fixes
2017-08-18 16:58:01 +09:30
Shane Woolcock
90dacd9861
Trim whitespace
2017-08-18 16:49:10 +09:30
Shane Woolcock
9628c0b6d6
Change spinner to check currently pressed actions rather than implementing IKeyBindingHandler
2017-08-18 16:46:00 +09:30
Shane Woolcock
9c6ca2d159
Add lazy weak property to DrawableOsuHitObject to find and cache the containing OsuInputManager, if it exists
2017-08-18 16:34:01 +09:30
Shane Woolcock
f951120775
Merge branch 'master' into fix-spinner-ignoring-actions
2017-08-18 16:25:26 +09:30
Dean Herbert
a44ff5a2c2
Fix regression causing global hotkeys to no longer work
2017-08-17 17:47:44 +09:00
Dan Balasescu
f7ccc81875
Merge branch 'master' into fix-spinner-ignoring-actions
2017-08-17 12:33:18 +09:00
Shane Woolcock
b1abf83fee
Change spinner action checks to switches
2017-08-16 17:51:57 +09:30
Shane Woolcock
9448e2f192
Remove unnecessary OnMouseDown/Up from SpinnerDisc
2017-08-16 17:25:48 +09:30
Dean Herbert
89987229de
Merge remote-tracking branch 'origin/is-alive' into key-config-settings
2017-08-16 15:49:43 +09:00
Shane Woolcock
9e5deb63d1
Fix spinner not handling left/right action bindings
2017-08-15 16:42:26 +09:30
Dean Herbert
97ac8e1a64
Update usages of IsAlive/IsLoaded in line with framework changes
2017-08-15 13:57:48 +09:00
Dean Herbert
7c9d6c9c83
Initial refactoring of key binding logic
2017-08-14 20:19:25 +09:00
MrTheMake
81289db33b
CI fix, fixed nullref and removed abstraction of GetAutoplayMod
2017-08-13 20:12:01 +02:00
MrTheMake
d9c26f98c7
Suggested changes
2017-08-13 19:54:07 +02:00
MrTheMake
4c2d7bf343
Parse the mods of a leaderboard's score
2017-08-13 17:41:13 +02:00
Dean Herbert
99458aab48
Propagate framework updates
2017-08-12 19:54:07 +09:00
Dean Herbert
48d4ed55e9
Move a lot of code to framework
2017-08-11 16:11:46 +09:00
Dean Herbert
798fff00b2
Remove shortcomings, remove InputState.Data usage, make everything amazing
...
No more casting!
2017-08-10 19:28:24 +09:00
Dean Herbert
1fe273cbc0
Move GameplayCursor to osu! ruleset and make work with OsuActions
2017-08-10 18:37:41 +09:00
Dean Herbert
e9a11ebc9f
Use new population methods and implement osu! ruleset actions
2017-08-10 18:31:12 +09:00
Dean Herbert
723e27353c
HitRenderer -> RulesetContainer
2017-08-09 13:28:29 +09:00
Dean Herbert
7c0e7ebcd0
Give HitRenderer a reference to Ruleset
...
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
Dean Herbert
b88f37de45
Add custom actions for Catch
...
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
smoogipooo
cae21869d0
Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍 .
2017-08-08 17:37:11 +09:00
Huo Yaoyuan
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e
Provide Autoplay mod in Ruleset.
2017-08-04 00:25:24 +08:00
Dean Herbert
0d9ea97828
Allow Rulesets to create a non-FontAwesome icon
...
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
598b3f051e
Address CI concerns and update framework
2017-07-22 11:15:45 +02:00
Thomas Müller
0f2bcb2904
Update framework
2017-07-21 18:23:01 +02:00
Thomas Müller
a7dc8a892b
Update framework
2017-07-21 17:24:09 +02:00
Thomas Müller
440878945e
Remove remaining usages of AddDelay
2017-07-17 18:16:15 +03:00
Thomas Müller
546efc0181
Get rid of AddDelay & ResetDelay in osu.Game.Rulesets.Osu
2017-07-17 17:05:24 +03:00
Thomas Müller
87bcd526f3
Get rid of raw AddDelay calls within osu.Game
2017-07-17 16:51:21 +03:00
Thomas Müller
19fb03e737
Try different formatting style
2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b
ApplyDelay -> AddDelay
2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4
Replace several usages of BeginDelayedSequence with LINQ-style
2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee
Delay -> ApplyDelay; DelayReset -> ResetDelay
2017-07-16 14:06:46 +03:00
Thomas Müller
6063219b72
Update framework
2017-07-16 13:59:26 +03:00
Thomas Müller
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Dean Herbert
d3f5de9bf9
Move to UI namespace
2017-07-13 15:44:42 +09:00
Dean Herbert
25344d2345
Fix incorrect header
2017-07-13 15:43:18 +09:00
Dean Herbert
fc28617099
Merge remote-tracking branch 'upstream/master' into ruleset-settings
2017-07-13 15:35:53 +09:00
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
Jorolf
f7c9e449d4
add ruleset settings
2017-07-11 20:25:24 +02:00
Dean Herbert
0e2dc9388a
More changes in-line with framework changes.
2017-07-10 12:55:47 +09:00
Dean Herbert
7952e7caa9
Fix typos
2017-07-10 03:22:08 +09:00
Dean Herbert
2c8b8c3f9c
Update loop logic in line with framework changes
2017-07-09 18:23:34 +09:00
Thomas Müller
bb15bc0467
Use ReceiveMouseInputAt whenever possible
2017-06-30 09:54:03 +03:00
Dean Herbert
7baa2b7421
Fix CI issues
2017-06-25 14:46:59 +09:00
Thomas Müller
e3489928b7
Remove now obsolete InternalContains
2017-06-24 09:21:08 +02:00
Thomas Müller
f5829860a2
Get rid of AlwaysReceiveInput
2017-06-23 18:02:24 +02:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
Dean Herbert
41d4aee4f5
Update nuget packages
...
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
smoogipooo
ffbb46f668
Update in line with framework.
2017-06-12 12:48:47 +09:00
Drezi126
9d915a691d
Fix comment placement.
2017-06-08 00:17:58 +02:00
Péter Nemes
a0bdab9f0d
Aaand docs again.
2017-06-07 20:29:03 +02:00
Péter Nemes
1f311cca06
Fix cref in comment.
2017-06-06 19:09:26 +02:00
Péter Nemes
93f654a539
More docs, better docs.
2017-06-06 18:59:46 +02:00
Péter Nemes
ce0d70d651
Whitespace fix.
2017-06-06 15:52:33 +02:00
Péter Nemes
01585027b1
OsuDifficultyBeatmap enumeration logic made clearer, more documentation added.
2017-06-06 15:39:37 +02:00
Péter Nemes
afb4443763
Capitalised protected members, added readonly modifiers.
2017-06-06 01:08:34 +02:00
Péter Nemes
f9441a7419
Fix typo and whitespace.
2017-06-06 00:07:00 +02:00
Péter Nemes
c624712f2f
Refactor ppv2 to allow integration of pp+ features.
2017-06-05 23:45:22 +02:00
Shawdooow
ecc0d0b11c
Daycore mod
2017-05-30 12:49:06 -04:00
Dean Herbert
5cb6963940
Make spinners easier for now
...
The underlying spin counting doesn't match stabnle, so they have been near impossible to complete until now.
2017-05-24 22:08:46 +09:00
smoogipooo
836bf930a0
More cleanups.
2017-05-23 15:29:38 +09:00
smoogipooo
3cdfd2eef5
Split ControlPoint into different types.
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
Dean Herbert
82cf94bbff
Move spinner colours to local definition for now
...
We don't want to start polluting the OsuColours namespace with non-UI colours.
2017-05-22 09:50:45 +09:00
Dean Herbert
8f3ab79918
Simplify SpinnerTicks & CI fixes
2017-05-21 17:31:35 +09:00
Dean Herbert
95498fe6df
Adjust spinner colours making use of EdgeEffect.Hollow
2017-05-21 17:21:49 +09:00
Dean Herbert
da31d129ee
Merge branch 'master' into mania-beatmap-conversion
2017-05-19 18:18:59 +09:00
smoogipooo
7b05930fc2
Revert "Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects."
...
This reverts commit 6821197a6a
2017-05-19 17:38:06 +09:00
smoogipooo
6821197a6a
Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects.
2017-05-19 16:40:01 +09:00
smoogipooo
67cf64062a
Add flag to determine whether the beatmap requested for conversion is for the current ruleset.
2017-05-19 16:02:40 +09:00
Dean Herbert
85339ace02
Merge branch 'master' into auto-fix
2017-05-19 13:54:32 +09:00
Dean Herbert
3004a44b98
Further colour adjustments
2017-05-18 22:21:41 +09:00
Dean Herbert
c78dfb4a13
Oops colours were wrong
2017-05-18 21:56:19 +09:00
Dean Herbert
e3ae2bca6d
Design improvements
...
paired with smoogi
2017-05-18 21:38:19 +09:00
Dean Herbert
4100c4fe9f
Fix order of methods
2017-05-18 21:04:09 +09:00
Dean Herbert
ae676b48b2
Fix whitespace
2017-05-18 19:51:45 +09:00
Dean Herbert
9cd41c0e87
Spinner design refresh
2017-05-18 19:42:20 +09:00
MrTheMake
58ebb24032
Use the end position of a previous note stack rather than the start position.
2017-05-18 02:17:49 +02:00
MrTheMake
91859042e8
Fix not all cases of the auto replay generator fix being covered.
2017-05-18 02:15:16 +02:00
MrTheMake
817bae3219
Fixes the auto mod not hitting stacks of notes on certain maps.
2017-05-18 01:54:17 +02:00
Dean Herbert
240d73bbf1
Merge branch 'master' into mod_fix
2017-05-15 11:59:19 +09:00
Dean Herbert
622b155fda
OsuConfig -> OsuSetting
2017-05-15 10:56:27 +09:00
EVAST9919
7055c99df0
Added default value
2017-05-14 09:36:09 +03:00
EVAST9919
a4d5660e41
Cast SpinsRequired value to int
2017-05-14 09:22:49 +03:00
EVAST9919
ef23405733
Applied suggested changes
2017-05-14 06:45:35 +03:00
EVAST9919
6d9e11a74f
CI fixes
2017-05-13 03:10:13 +03:00
EVAST9919
5532d3ec49
storing OD value only
2017-05-13 03:04:40 +03:00
EVAST9919
86ebd9d663
spinner's progress depends on current map OD now
2017-05-13 02:51:58 +03:00
EVAST9919
19728b3d98
Fixed IncompatibleMods for OsuModAutoplay
2017-05-12 15:13:02 +03:00
Huo Yaoyuan
4f8549f220
Standardise usages of exceptions.
2017-05-07 00:38:17 +08:00
Thomas Tan
6ea6130fee
CodeFactor fixes
2017-04-29 02:41:20 +08:00
Thomas Tan
d742092d9d
CI fixes
2017-04-29 02:30:34 +08:00
Thomas Tan
9b8b88601f
Create "AutoGenerator" base class and interface.
2017-04-29 02:08:48 +08:00
Thomas Tan
2af6c7aa00
Fix build errors o.o
2017-04-29 00:21:33 +08:00
Thomas Tan
fede3de8a0
Merge branch 'master' into autoreplay-refactor-squashed
2017-04-29 00:17:18 +08:00
Thomas Tan
18897235fa
Remove tab characters
2017-04-29 00:15:53 +08:00
Thomas Tan
e56bd3430a
Move some common functionality to OsuAutoReplayBase.cs
2017-04-28 23:19:15 +08:00
Dean Herbert
220c602218
Fix incorrect modifier order.
2017-04-28 13:27:20 +09:00
Thomas Tan
6392fcbc5d
Merge branch 'master' into autoreplay-refactor-squashed
2017-04-27 23:04:52 +08:00
Dean Herbert
12c0a17711
Make FollowPoints dumb; use absolute sequence at renderer level.
2017-04-27 18:07:10 +09:00
Dean Herbert
4ab636cbb8
Update osu! drawables to use TransformSequences.
2017-04-27 17:37:38 +09:00
Dan Balasescu
df5a95b675
Merge branch 'master' into fix-mouse-button-disable
2017-04-26 19:53:13 +09:00
Dean Herbert
f48d497737
Fix disabling mouse buttons causing auto to stop working.
2017-04-26 18:56:20 +09:00
smoogipooo
28f7e0cdba
Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings.
2017-04-26 14:12:21 +09:00
Dan Balasescu
99db871e6c
Update OsuDifficultyCalculator.cs
2017-04-22 20:59:35 +09:00
smoogipooo
1bb0b96ddc
Make IHasCurve not depend on a SliderCurve object.
2017-04-22 20:43:20 +09:00
Thomas Tan
9432f9879d
Refactor OsuAutoReplay.cs
...
- Some trivial refactors
Rename targetPosition to startPosition, move frameDelay and
reactionTime to private readonly fields, and added 2 comments
- Split main loop into 2 functions.
One is the function to add a delay from the previous hit object if the
current one hasn't appeared yet for auto to "see and react to"
- The other function does everything else.
- Rename and comment stuff in spinner startPosition alg.
- Move movement to start of hitobject logic out
- Rename the functions I took out
- Move spinner start pos calc out.
- Move clicking object logic out
- Fix formatting
- Add private keyword
- Change ref to out
- Change some outdated comments
2017-04-22 10:38:20 +08:00
smoogipooo
d7477955ac
CI fixes.
2017-04-21 20:42:13 +09:00
smoogipooo
5cdbb226f8
Remove CurvedHitObject to make RepeatSamples not tied to curve.
2017-04-21 20:40:11 +09:00
smoogipooo
748f13501a
Remove HeadSamples and TailSamples, combine into RepeatSamples.
2017-04-21 20:04:40 +09:00
smoogipooo
a999c42d8a
Split slider samples into head + tail + repeats + body (the original HitObject.Samples).
2017-04-21 18:49:49 +09:00
smoogipooo
ca824de91c
Implement RepeatSamples in IHasRepeats.
2017-04-21 16:18:34 +09:00
smoogipooo
b65b2bdf4c
Simplify assignment.
2017-04-20 18:29:55 +09:00
smoogipooo
61090d918c
Temporary for taiko lagging on auto replays due to inImportantSection.
...
Note that this isn't a full "as intended" fix, because the full fix is quite big. I'll be saving it for a separate branch/pull-req.
2017-04-20 15:26:42 +09:00
Dean Herbert
2d5f0f6b76
Fix off-by-one counts.
2017-04-20 11:23:40 +09:00
Dean Herbert
a47870b376
Apply Ruleset to Scores. Reduce complexity of score creation.
2017-04-20 11:16:08 +09:00
Dean Herbert
6cf026e5c1
Remove OsuScore and change the way statistics are stored (dynamic dictionary).
2017-04-20 11:03:11 +09:00
Dean Herbert
3b95fbab7d
Add score statistic tracking (osu!).
2017-04-19 16:29:27 +09:00
Dean Herbert
662544e04f
Merge branch 'master' into results-screen
...
# Conflicts:
# osu.Game/Rulesets/Replays/Replay.cs
2017-04-19 16:25:31 +09:00
Dean Herbert
cef6a014d5
Add a simulated key-up delay to auto replays.
...
Fixes key counter display looking odd.
2017-04-18 22:31:52 +09:00
Dean Herbert
705e66c7a1
Fix spinners becoming wonky.
2017-04-18 22:29:58 +09:00
Dean Herbert
a0d9c14526
Add temporary means of getting the user which is responsible for a resulting play.
2017-04-18 22:22:14 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
