smoogipoo
|
6ab2b20c70
|
Add an interface for working beatmaps
|
2019-08-29 19:38:44 +09:00 |
|
Dean Herbert
|
7aeeb65ae7
|
Tidy up Player's container loading logic
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
|
2019-08-27 18:27:21 +09:00 |
|
Dean Herbert
|
5e362d10b1
|
Add ruleset-specific legacy skin providers
This moves implementation of osu! skinnables to OsuLegacySkin.
|
2019-08-26 12:21:49 +09:00 |
|
Dean Herbert
|
38df49995c
|
Fix cursor scale not matching osu-stable
|
2019-08-07 18:35:07 +09:00 |
|
smoogipoo
|
1222536f7a
|
Rename resource string
|
2019-07-30 19:10:21 +09:00 |
|
Dan Balasescu
|
ef229c0f80
|
Merge branch 'master' into legacy-cursor-middle
|
2019-07-29 18:52:11 +09:00 |
|
Dan Balasescu
|
396892da1a
|
Describe how the ratio came to be
|
2019-07-29 18:43:05 +09:00 |
|
Dean Herbert
|
c1b0130857
|
Add legacy cursormiddle support
|
2019-07-25 16:23:04 +09:00 |
|
Dean Herbert
|
9473f6d3e3
|
Fix incorrect ratios being applied to playfield / skin elements
This now matches osu-stable 1:1.
|
2019-07-25 14:22:22 +09:00 |
|
Dean Herbert
|
74c961bcff
|
Add more flexible skin element confine modes
|
2019-07-22 14:42:56 +09:00 |
|
smoogipoo
|
9f6ff63634
|
Fix judgement disposals causing huge LOH pressure
|
2019-07-17 19:25:41 +09:00 |
|
smoogipoo
|
62b867018d
|
Refactor a bit
|
2019-07-16 17:51:17 +09:00 |
|
smoogipoo
|
b0415dc30a
|
Remove cursortrail drawnode allocs
|
2019-07-16 17:33:14 +09:00 |
|
smoogipoo
|
0d98d637b6
|
Fix cursor expansion state potentially being incorrect
|
2019-06-25 15:47:54 +09:00 |
|
Dean Herbert
|
00ee45fe46
|
Merge remote-tracking branch 'origin/update-visibility-container' into update-framework
|
2019-06-11 19:36:13 +09:00 |
|
Dean Herbert
|
609a82bc94
|
Update VisibilityContainer usage in line with framework
|
2019-06-11 15:13:58 +09:00 |
|
smoogipoo
|
2b768bef96
|
Make CursorTrail use VertexBatch
|
2019-06-10 20:29:01 +09:00 |
|
Dean Herbert
|
ff6943e170
|
Merge branch 'master' into fix-cursor
|
2019-06-07 10:43:21 +09:00 |
|
David Zhao
|
e2118299e9
|
update comment
|
2019-06-07 10:36:36 +09:00 |
|
David Zhao
|
ac9a3e54a6
|
Fix cursor issue with stopped gameplay clock
|
2019-06-06 18:12:59 +09:00 |
|
smoogipoo
|
c7d0fcd42a
|
Update drawnodes
|
2019-06-06 16:49:35 +09:00 |
|
smoogipoo
|
cbf662eb56
|
Remove redundant else statement
|
2019-05-15 10:55:02 +09:00 |
|
Alten
|
37ec722a1d
|
Shorten code
|
2019-05-14 16:18:46 -04:00 |
|
Alten
|
ad5ad8ccb5
|
Fix hard crash
|
2019-05-13 23:29:24 -04:00 |
|
smoogipoo
|
d7c09e7dbd
|
Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
|
2019-05-07 13:20:17 +09:00 |
|
Dean Herbert
|
db75516e79
|
Merge branch 'master' into fix-lead-in-issues
|
2019-04-27 21:01:21 +09:00 |
|
Dean Herbert
|
27c1c368ac
|
Remove unused using
|
2019-04-27 20:42:07 +09:00 |
|
Dean Herbert
|
d40177f97c
|
Merge branch 'master' into drawnode-composability
|
2019-04-27 18:41:19 +09:00 |
|
Dean Herbert
|
e69963e60e
|
Ensure there is enough time before the first object in osu! (roughly following osu-stable specs)
|
2019-04-24 15:28:14 +09:00 |
|
smoogipoo
|
0222424aef
|
Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
|
2019-04-10 17:20:36 +09:00 |
|
smoogipoo
|
0603ed9ab7
|
Fix post-merge errors
|
2019-04-09 16:27:10 +09:00 |
|
smoogipoo
|
c584967eb1
|
Remove mods from workingbeatmap
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
Dean Herbert
|
9802d8ab11
|
Rename setting
|
2019-04-04 17:18:53 +09:00 |
|
Dean Herbert
|
109f577b59
|
Merge remote-tracking branch 'upstream/master' into toggle-cursor-trail
|
2019-04-04 17:09:38 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
smoogipoo
|
d8af5e1c5a
|
Update in-line with drawnode changes
|
2019-04-02 11:56:22 +09:00 |
|
Dean Herbert
|
184403c7e1
|
Merge branch 'master' into resume-cursor-2
|
2019-04-01 14:24:00 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dean Herbert
|
42eaabe24c
|
Fix editor blueprints being misplaced
Regressed with PlayfieldAdjustmentContainer changes.
|
2019-03-31 01:29:37 +09:00 |
|
Dean Herbert
|
6949c233bf
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 15:02:12 +09:00 |
|
Dean Herbert
|
14cef94a53
|
Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation
|
2019-03-29 12:59:26 +09:00 |
|
Dean Herbert
|
1e369628a5
|
Fix incorrect type specification
|
2019-03-29 11:38:45 +09:00 |
|
Dean Herbert
|
785433bb74
|
Merge branch 'master' into universal-playfield-adjust
|
2019-03-29 11:25:54 +09:00 |
|
Dean Herbert
|
7cfc2f7dcb
|
Add back adjustment container
|
2019-03-26 17:11:14 +09:00 |
|
Dean Herbert
|
dde7788c44
|
Merge branch 'universal-playfield-adjust' into resume-cursor-2
|
2019-03-26 13:58:48 +09:00 |
|
Dean Herbert
|
2951d3e0e4
|
Apply CI fixes
|
2019-03-26 13:50:30 +09:00 |
|
Dean Herbert
|
fbc97edc55
|
Add base cursor class to retrieve true visibility state
|
2019-03-26 13:41:30 +09:00 |
|
Dean Herbert
|
ed3746e166
|
Make PlayfieldAdjustmentContainer universal
|
2019-03-26 13:32:44 +09:00 |
|
Dean Herbert
|
82140c38fc
|
Apply CI fixes
|
2019-03-25 22:00:33 +09:00 |
|
Dean Herbert
|
a23dfb58ad
|
Add base cursor class to retrieve true visibility state
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
9588944048
|
Fix multiple cursors appearing
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
c79d187a89
|
Add final osu! resume screen implementation
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
38e481686f
|
Make PlayfieldAdjustmentContainer universal
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
650a5c993a
|
Add test
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
8ad4009c33
|
osu! resume overlay
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
bc16a82494
|
Move osu! cursor to its own class
|
2019-03-25 14:19:38 +09:00 |
|
Dean Herbert
|
9bf48863b0
|
Fix DrawableRuleset drawable creation method's name
|
2019-03-25 00:00:29 +09:00 |
|
Dean Herbert
|
7b6d882ce6
|
Remove double-generic type
|
2019-03-20 11:29:16 +09:00 |
|
Dean Herbert
|
baea7230bc
|
Rename RulesetContainer to DrawableRuleset
|
2019-03-19 23:47:31 +09:00 |
|
Dean Herbert
|
68f28326a2
|
Refactor RulesetContainer for readability
|
2019-03-19 20:21:31 +09:00 |
|
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 |
|
Dan Balasescu
|
d1c18c52ab
|
Merge branch 'master' into fix-cursor-in-scale-container
|
2019-03-08 12:43:57 +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 |
|
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
|
fc0b297232
|
Fix menu cursor not displaying outside of gameplay scaling area
|
2019-03-05 18:06:24 +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 |
|
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
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31: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 |
|
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 |
|
Dean Herbert
|
c96a2ac853
|
Fix non-conforming filename
|
2019-02-20 21:08:52 +09:00 |
|
Dan Balasescu
|
c9c8cccd68
|
Merge branch 'master' into use-lifetime-optimization
|
2019-02-18 15:22:34 +09:00 |
|
Dean Herbert
|
ca5c8d37d1
|
Use leased bindables
|
2019-02-01 16:44:06 +09:00 |
|
ekrctb
|
504e79b968
|
Merge branch 'master' into use-lifetime-optimization
|
2019-01-29 12:15:02 +09: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
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
Unknown
|
481f33d17b
|
add setting to toggle the gameplay cursor trail
|
2019-01-23 14:27:39 +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 |
|
Dean Herbert
|
17bc933db2
|
Revert unnecessary changes
|
2019-01-10 19:01:41 +09:00 |
|
Dean Herbert
|
4cee21f356
|
Make skinning better
|
2019-01-07 20:12:39 +09:00 |
|
Dean Herbert
|
8914585021
|
Fix implementation of conditional cursor expanding
|
2019-01-07 18:28:26 +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
|
0816eaacb8
|
Make CursorExpand skinnable
|
2018-12-07 22:22:40 +01:00 |
|
smoogipoo
|
2ee181daf7
|
Re-namespace replay-related classes
|
2018-11-28 17:20:37 +09:00 |
|
smoogipoo
|
f27bd3ef3e
|
OpenTK -> osuTK
|
2018-11-20 17:14:59 +09:00 |
|
smoogipoo
|
fbc20d2d4d
|
Hide placement when cursor is not in the playfield
|
2018-11-13 12:52:04 +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
|
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
|
540a010fbb
|
Implement an intermediary EditRulesetContainer
|
2018-10-03 15:36:24 +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 |
|
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 |
|
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 |
|
Dean Herbert
|
a1780fddc9
|
DrawInfo -> DrawColourInfo
|
2018-09-06 18:02:04 +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 |
|
Dean Herbert
|
e628e78f24
|
Update uniform usage
|
2018-08-20 13:39:22 +09:00 |
|
smoogipoo
|
741ec0021e
|
Rename more judgement-related methods to "result"
|
2018-08-06 11:31:46 +09:00 |
|
smoogipoo
|
5fd4ed2f4e
|
Rename judgement-related methods/events + commenting
|
2018-08-06 10:55:25 +09:00 |
|
smoogipoo
|
4548d2c87f
|
Make Rulesets.Osu use the new judgement result structure
|
2018-08-02 20:36:38 +09: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 |
|
Dean Herbert
|
cacabeb67e
|
Remove unused field
|
2018-06-29 17:00:41 +09:00 |
|
Tom Arrow
|
ad883e087a
|
RulesetContainer<TObject> cannot be derived
|
2018-06-19 14:31:24 +02: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 |
|
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 |
|
Dean Herbert
|
3567823759
|
Reverse order of exposed objects in HitObjectContainer
Closes #2740.
|
2018-06-06 15:03:47 +09:00 |
|
smoogipoo
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +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 |
|