|
|
7cc999027d
|
Merge branch 'master' into pause-input-fixes
|
2018-07-20 17:20:19 +09:00 |
|
|
|
9eb69a1e76
|
Restructure + corrects converting to support all systems
|
2018-07-19 17:47:55 +02:00 |
|
|
|
4e72794101
|
Converts float to int.
|
2018-07-19 15:55:38 +02:00 |
|
|
|
c2cdf12986
|
Better pause logic
|
2018-07-18 19:59:04 +09:00 |
|
|
|
64cde1ebad
|
Merge branch 'master' into use-switch-over-if
|
2018-07-17 16:44:57 +09:00 |
|
|
|
9f933187e9
|
Apply review feedback
|
2018-07-17 16:33:08 +09:00 |
|
|
|
569d0f7993
|
Merge branch 'master' into scrolldirection-cleanup
|
2018-07-17 15:39:13 +09:00 |
|
|
|
e681bd3244
|
Merge branch 'master' into fix-incorrect-mods
|
2018-07-17 15:23:21 +09:00 |
|
|
|
827c5c4939
|
Remove scroll direction from ScrolingPlayfield constructor
|
2018-07-17 15:14:03 +09:00 |
|
|
|
825941aff1
|
Use switch with type matching in place of if-else where possible
|
2018-07-17 14:35:09 +09:00 |
|
|
|
b967fe714b
|
Fix lead-in time now being long enough in many cases
|
2018-07-17 14:29:22 +09:00 |
|
|
|
745d596343
|
Merge branch 'master' into fix-incorrect-mods
|
2018-07-17 13:41:02 +09:00 |
|
|
|
dbc538abbe
|
Use Enum.HasFlag
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
|
2018-07-16 16:18:46 +09:00 |
|
|
|
ac078153ae
|
Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods
|
2018-07-13 14:20:56 +09:00 |
|
|
|
24054246b8
|
Fix DI regression
|
2018-07-11 17:54:01 +09:00 |
|
|
|
fbc5250bf1
|
Update framework
|
2018-07-11 17:12:01 +09:00 |
|
|
|
96ef526474
|
Merge remote-tracking branch 'upstream/master' into ekrctb-fix-disable-mouse
|
2018-07-11 17:02:01 +09:00 |
|
|
|
4f894969df
|
Merge branch 'master' into hitobject-samples
|
2018-07-05 19:43:19 +09:00 |
|
|
|
d11ba2df0e
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks
|
2018-07-05 14:53:31 +09:00 |
|
|
|
e28a610757
|
Fix mods not correctly resetting when changing ruleset at song select
|
2018-07-05 13:22:52 +09:00 |
|
|
|
d71b61c122
|
Rewrite disable mouse buttons logic
|
2018-07-03 20:04:15 +09:00 |
|
|
|
1e1ff8339e
|
Merge branch 'master' into non-null-nestedobjects
|
2018-07-03 19:43:46 +09:00 |
|
|
|
f0ec117bcb
|
Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds
# Conflicts:
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
|
2018-07-02 17:21:18 +09:00 |
|
|
|
45a4187923
|
Tidy up lookups to NestedHitObjects
|
2018-07-02 16:10:56 +09:00 |
|
|
|
7f832e34c0
|
Reorder sample bank property setters
|
2018-07-02 14:29:18 +09:00 |
|
|
|
73fac2115a
|
Implement hitobject sample files
|
2018-07-02 14:20:35 +09:00 |
|
|
|
812929fa05
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess
|
2018-07-02 13:10:42 +09:00 |
|
|
|
9f85c55915
|
Merge remote-tracking branch 'origin/master' into legacy-custom-banks
|
2018-07-02 12:34:51 +09:00 |
|
|
|
98fb2e03c0
|
Fix rulesets not loading in debug builds after running a release build
|
2018-07-01 18:03:15 +09:00 |
|
|
|
e12ce3c2a8
|
Adjust xmldoc
|
2018-06-29 17:21:55 +09:00 |
|
|
|
098aeabc9e
|
Merge branch 'master' into catch-scoring
|
2018-06-29 17:16:14 +09:00 |
|
|
|
c0b65a6a73
|
Change default IsBonus definition and remove unnecessary overrides
|
2018-06-29 17:07:08 +09:00 |
|
|
|
0940715631
|
Merge branch 'master' into catch-scoring
|
2018-06-29 14:59:15 +09:00 |
|
|
|
99068debc4
|
Split out into separate interface + add xmldocs
|
2018-06-29 13:24:33 +09:00 |
|
|
|
70a119dde7
|
Remove unused/duplicate interface
|
2018-06-29 12:20:53 +09:00 |
|
|
|
781095b96b
|
Encapsulate the method to apply SampleControlPoints to SampleInfos
|
2018-06-28 18:29:07 +09:00 |
|
|
|
b1a3f01212
|
Fix mania maps not being treated as mania maps in release builds
|
2018-06-28 17:10:30 +09:00 |
|
|
|
80501de4b9
|
Add legacy slider offsets
|
2018-06-27 12:09:21 +09:00 |
|
|
|
594cc0d21d
|
Merge branch 'master' into mania-playfield-inversions
|
2018-06-25 18:36:23 +09:00 |
|
|
|
d6084c0b30
|
Adapt to new input handling changes
|
2018-06-22 18:10:27 +09:00 |
|
|
|
ad883e087a
|
RulesetContainer<TObject> cannot be derived
|
2018-06-19 14:31:24 +02:00 |
|
|
|
57011ff13b
|
Merge branch 'master' into mania-playfield-inversions
|
2018-06-15 18:33:40 +09:00 |
|
|
|
8f7334874c
|
Fix up performance calculators
|
2018-06-14 16:04:48 +09:00 |
|
|
|
b7a06b9594
|
Restructure of DifficultyCalculator to cleanup mod + attribute handling
|
2018-06-14 15:32:07 +09:00 |
|
|
|
1431ee1867
|
Remove unused method
|
2018-06-14 14:46:25 +09:00 |
|
|
|
0e0e64895a
|
Merge branch 'master' into mania-step-interval
|
2018-06-13 13:55:27 +09:00 |
|
|
|
bcfb092e53
|
Change step to 200
|
2018-06-12 18:03:45 +09:00 |
|
|
|
ae136e89a4
|
Merge branch 'master' into ruleset-configs
|
2018-06-12 13:13:18 +09:00 |
|
|
|
3981f56157
|
Merge branch 'master' into exponential-scoring-toggle
|
2018-06-11 18:34:55 +09:00 |
|
|
|
78daf1c7ad
|
Merge branch 'master' into exponential-scoring-toggle
|
2018-06-11 18:19:33 +09:00 |
|
