smoogipoo
|
9fdd48ded2
|
Add 1ms offset to controlpoint lookup times
|
2018-12-04 12:08:46 +09:00 |
|
Dean Herbert
|
a33865efce
|
Fix home button being cancelled by mod select
|
2018-12-04 12:06:05 +09:00 |
|
Roman Kapustin
|
c6c255718b
|
Handle ModAutoplay during score construction in the Player
|
2018-12-03 22:37:26 +03:00 |
|
Dan Balasescu
|
78d1a1c499
|
Merge branch 'master' into fix-async-profile-logic
|
2018-12-03 20:55:23 +09:00 |
|
Dan Balasescu
|
f278dff49c
|
Merge branch 'master' into fix-chat-crash
|
2018-12-03 19:17:05 +09:00 |
|
Dean Herbert
|
7e35afd178
|
Fix loading scores on profile pages potentially causing long blocking operations
|
2018-12-03 18:37:44 +09:00 |
|
smoogipoo
|
6a28e8c696
|
Add settings to lounge
|
2018-12-03 18:30:26 +09:00 |
|
Dean Herbert
|
14d9f1d8bb
|
Fix hard crash due to out-of-order chat sequencing
|
2018-12-03 18:13:10 +09:00 |
|
Dean Herbert
|
9a8136ea4a
|
Merge branch 'master' into fix-selector-regression
|
2018-12-03 18:01:12 +09:00 |
|
smoogipoo
|
53a54f8634
|
Renamespace room settings
|
2018-12-03 17:54:10 +09:00 |
|
smoogipoo
|
20b843e63c
|
Add create tab
|
2018-12-03 17:50:56 +09:00 |
|
smoogipoo
|
51c16867d5
|
Remove type conversion from LoungeTab to RoomAvailability
|
2018-12-03 17:50:39 +09:00 |
|
smoogipoo
|
eb88768bd0
|
Fix incorrect controlpoint being applied to samples
|
2018-12-03 17:21:27 +09:00 |
|
smoogipoo
|
814d401eb0
|
Make ChannelSelectorTabItem not switchable
|
2018-12-03 11:48:36 +09:00 |
|
smoogipoo
|
7255a01bf5
|
Remove ChatTabControl
|
2018-12-03 11:48:21 +09:00 |
|
Dean Herbert
|
f9fb6dc39b
|
Remove health from ScoreInfo
|
2018-12-01 00:17:05 +09:00 |
|
Dean Herbert
|
af3ef9a089
|
Fix some data types on ScoreInfo
|
2018-11-30 20:43:38 +09:00 |
|
Dean Herbert
|
2860f5a5cd
|
Revert "Fix D rank displaying as F"
This reverts commit 17b2a4ca0d .
|
2018-11-30 20:03:21 +09:00 |
|
Dean Herbert
|
3921834cfd
|
Merge branch 'master' into fix-d-rank
|
2018-11-30 19:49:36 +09:00 |
|
Dean Herbert
|
b985d19078
|
Merge branch 'master' into local-score-saving
|
2018-11-30 19:48:00 +09:00 |
|
Dean Herbert
|
17b2a4ca0d
|
Fix D rank displaying as F
|
2018-11-30 19:46:40 +09:00 |
|
smoogipoo
|
f80a30cba4
|
Fix null being serialized
|
2018-11-30 18:52:31 +09:00 |
|
smoogipoo
|
b1c5b43767
|
Fix post-rebase errors
|
2018-11-30 18:46:47 +09:00 |
|
smoogipoo
|
10ed09521c
|
Add leaderboard display for local scores
|
2018-11-30 18:40:53 +09:00 |
|
smoogipoo
|
4144f4bd2f
|
Fix duplicates not being ignored if hash is null
|
2018-11-30 18:40:06 +09:00 |
|
smoogipoo
|
795933d1a1
|
CreateScoreInfo -> CreateScore
|
2018-11-30 18:32:08 +09:00 |
|
smoogipoo
|
a6b0e35b2d
|
Fix post-rebase issues
|
2018-11-30 18:31:54 +09:00 |
|
smoogipoo
|
a8ad7d4670
|
Add silent import parameter
|
2018-11-30 18:27:13 +09:00 |
|
smoogipoo
|
d07a724970
|
Only allow replay screen changes in menu + songselect
|
2018-11-30 18:25:54 +09:00 |
|
smoogipoo
|
4c1abdcd8c
|
Save score upon map completion
|
2018-11-30 18:25:14 +09:00 |
|
smoogipoo
|
8eff49bccd
|
Remove User from Replay
|
2018-11-30 18:25:14 +09:00 |
|
smoogipoo
|
ed67984638
|
Don't load player if score has no replay data
|
2018-11-30 18:24:35 +09:00 |
|
Dean Herbert
|
059e9e180b
|
Apply review
|
2018-11-30 18:07:15 +09:00 |
|
Dean Herbert
|
9718e476c7
|
Add license header
|
2018-11-30 18:07:15 +09:00 |
|
Dean Herbert
|
2dd5dad7c5
|
Remove empty lines
|
2018-11-30 18:07:15 +09:00 |
|
Dean Herbert
|
00c5ea28c7
|
Update migrations in line with hash change
|
2018-11-30 18:07:15 +09:00 |
|
Dean Herbert
|
66e43e6ed9
|
Update hashing method in line with master
|
2018-11-30 17:36:06 +09:00 |
|
Dean Herbert
|
be37f3c328
|
Rename NoModMod
|
2018-11-30 17:35:13 +09:00 |
|
Dean Herbert
|
aa7a665317
|
Merge remote-tracking branch 'upstream/master' into scoredatabase
|
2018-11-30 17:20:23 +09:00 |
|
Dean Herbert
|
d97a15a504
|
Add IMod and change ShortenedName to Acronym
|
2018-11-30 17:16:00 +09:00 |
|
Dean Herbert
|
84f3d4f48d
|
Fix nullref
|
2018-11-30 17:15:32 +09:00 |
|
Dean Herbert
|
e82ad3539b
|
Move JsonIgnore specification to interface
|
2018-11-30 16:39:25 +09:00 |
|
Dean Herbert
|
58293c3eae
|
Re-migrate
|
2018-11-30 16:35:57 +09:00 |
|
Dean Herbert
|
3727955911
|
Refactors/renames
|
2018-11-30 16:35:45 +09:00 |
|
Dan Balasescu
|
f496bdba69
|
Merge branch 'master' into fix-skin-duplication
|
2018-11-30 16:20:03 +09:00 |
|
smoogipoo
|
bc3fcb87b7
|
Use input events rather than scene graph traversals
|
2018-11-30 15:47:55 +09:00 |
|
Dean Herbert
|
831cd3ed59
|
ScoreInfo scoreInfo -> ScoreInfo score
|
2018-11-30 15:18:52 +09:00 |
|
Dan Balasescu
|
e83f6707bf
|
Merge branch 'master' into editor-keyboard-seek
|
2018-11-30 15:17:06 +09:00 |
|
Dean Herbert
|
705ef5e3ac
|
Fix hash function
|
2018-11-30 15:10:56 +09:00 |
|
Dean Herbert
|
271dcded3c
|
Merge branch 'master' into scoredatabase
|
2018-11-30 14:59:58 +09:00 |
|
Dean Herbert
|
ab621bd873
|
Toggle pause in editor with spacebar
|
2018-11-30 14:58:09 +09:00 |
|
Dean Herbert
|
0ee5a5bdb4
|
Add support for keyboard seeking in the editor
|
2018-11-30 14:57:25 +09:00 |
|
smoogipoo
|
64bb27be5d
|
Add scoreinfo tables
|
2018-11-30 14:48:31 +09:00 |
|
smoogipoo
|
69370c53ca
|
Fix rank not being read
|
2018-11-30 14:48:25 +09:00 |
|
Dean Herbert
|
b3a55a26d7
|
Merge branch 'master' into inter-column-movements
|
2018-11-30 14:31:44 +09:00 |
|
Dean Herbert
|
7543af07dd
|
Remove weird reference
|
2018-11-30 14:30:50 +09:00 |
|
smoogipoo
|
690a1f0765
|
Fix score statistics not being serialised
|
2018-11-30 14:27:34 +09:00 |
|
smoogipoo
|
5530736541
|
Cleanup mods string
|
2018-11-30 14:27:34 +09:00 |
|
smoogipoo
|
b673eb79b1
|
Fix local score infos conflicting
|
2018-11-30 14:27:34 +09:00 |
|
smoogipoo
|
aa7f66b24a
|
Fix crash when loading scores with no mods
|
2018-11-30 14:27:34 +09:00 |
|
Dean Herbert
|
5254b07680
|
Merge remote-tracking branch 'upstream/master' into inter-column-movements
|
2018-11-30 11:57:53 +09:00 |
|
Jack Scotson
|
e11b2218cb
|
Merge branch 'master' into keypad-enter
|
2018-11-29 13:51:07 +00:00 |
|
Dean Herbert
|
7ffc597a8e
|
Fix one-frame issues
|
2018-11-29 14:55:20 +09:00 |
|
Dean Herbert
|
3d46ac7d35
|
Remove unnecessary high frequency input
|
2018-11-29 13:21:11 +09:00 |
|
Dean Herbert
|
86a0f8d2a9
|
Merge branch 'master' into note-placement
|
2018-11-29 13:06:11 +09:00 |
|
Dean Herbert
|
097c8e0155
|
Merge branch 'master' into fix-taiko-completions
|
2018-11-29 12:17:37 +09:00 |
|
smoogipoo
|
aea84f737b
|
Fix taiko hitobjects potentially disappearing before being judged
|
2018-11-29 12:12:29 +09:00 |
|
smoogipoo
|
d2f0a921ca
|
Fix lookups by beatmapinfo failing for imports of existing sores
|
2018-11-28 20:41:48 +09:00 |
|
smoogipoo
|
a88b69ec43
|
Notify of existing imports
|
2018-11-28 20:19:35 +09:00 |
|
smoogipoo
|
aaf3e650a5
|
Fix some columns
|
2018-11-28 20:19:35 +09:00 |
|
smoogipoo
|
2bb7a078c9
|
Don't import replays with no existing beatmap
|
2018-11-28 20:19:35 +09:00 |
|
smoogipoo
|
554c858944
|
Fix mods not deserializing properly
|
2018-11-28 20:19:35 +09:00 |
|
Dean Herbert
|
ab2b2493a1
|
Move hashing functionality to ArchiveModelManager
|
2018-11-28 19:21:36 +09:00 |
|
Dean Herbert
|
0384f3549f
|
Add hash and missing indices to SkinInfo
|
2018-11-28 19:15:56 +09:00 |
|
Dean Herbert
|
f42d4a9382
|
Add wildcard scope to oauth requests
|
2018-11-28 19:02:23 +09:00 |
|
Dean Herbert
|
ce660b6d67
|
Add skin de-duplication
|
2018-11-28 19:01:22 +09:00 |
|
smoogipoo
|
542a75d076
|
Add index on online score id
|
2018-11-28 18:56:20 +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
|
5b409a5ae5
|
Fix missed renames
|
2018-11-28 17:27:22 +09:00 |
|
smoogipoo
|
41a8a12df3
|
Add ruleset foreign key
|
2018-11-28 17:26:46 +09:00 |
|
smoogipoo
|
ed02847752
|
Beatmap -> BeatmapInfo + add foreign key
|
2018-11-28 17:26:39 +09:00 |
|
smoogipoo
|
2ee181daf7
|
Re-namespace replay-related classes
|
2018-11-28 17:20:37 +09:00 |
|
smoogipoo
|
1717d7defb
|
Implement importing of scores into ScoreManager
|
2018-11-28 17:19:58 +09:00 |
|
smoogipoo
|
7a82b99417
|
Add storage for a few more parsed fields
|
2018-11-28 17:02:14 +09:00 |
|
smoogipoo
|
4ba7690e04
|
Initial scoremanager/scorestore structure
|
2018-11-28 16:50:16 +09:00 |
|
smoogipoo
|
3fe4a36845
|
Add databased fields to Score
|
2018-11-28 16:39:08 +09:00 |
|
smoogipoo
|
09b79d736b
|
Remove unused usings
|
2018-11-28 16:33:42 +09:00 |
|
smoogipoo
|
a783fdb501
|
Add LegacyFileArchiveReader
Treats files as "archives" for import.
|
2018-11-28 16:13:16 +09:00 |
|
smoogipoo
|
5fd6e6ca77
|
Re-namespacing
|
2018-11-28 16:12:57 +09:00 |
|
smoogipoo
|
0982508d26
|
Rename to LegacyDirectoryArchiveReader
|
2018-11-28 15:13:27 +09:00 |
|
smoogipoo
|
dc31736db7
|
Add explicit foreign key property to INamedFileInfo
|
2018-11-28 13:45:56 +09:00 |
|
smoogipoo
|
14ff4bc26a
|
Move primary key attribute to IHasPrimaryKey
|
2018-11-28 13:19:23 +09:00 |
|
smoogipoo
|
ea52d2d527
|
Make Mod IJsonSerializable
|
2018-11-28 13:12:29 +09:00 |
|
smoogipoo
|
c5d2dc2f6a
|
Remove unnecessary newline
|
2018-11-28 13:05:17 +09:00 |
|
Dean Herbert
|
6647fcd299
|
Fix volume adjustment precision regressing
|
2018-11-27 18:05:38 +09:00 |
|
Dean Herbert
|
cd513e6e91
|
Merge branch 'master' into note-placement
|
2018-11-26 23:12:25 +09:00 |
|
Dean Herbert
|
da79292250
|
Merge branch 'master' into fix_idle_tracker
|
2018-11-26 17:41:45 +09:00 |
|
Dean Herbert
|
77090500e8
|
Merge branch 'fix_idle_tracker' of https://github.com/UselessToucan/osu into fix_idle_tracker
|
2018-11-26 17:41:22 +09:00 |
|
Dean Herbert
|
32b36f2883
|
Use IBindable<>
|
2018-11-26 17:07:30 +09:00 |
|
Dean Herbert
|
266873740d
|
Specify RelativeSizeAxes in ctor
This is basically always the behaviour we want.
|
2018-11-26 17:07:20 +09:00 |
|
Dean Herbert
|
626048038c
|
Handle the null case
|
2018-11-26 16:50:41 +09:00 |
|
Dan Balasescu
|
38ef1d1f03
|
Merge branch 'master' into multiplayer-room-settings
|
2018-11-26 16:46:27 +09:00 |
|
Dean Herbert
|
b751a0d918
|
Merge branch 'master' into fix_idle_tracker
|
2018-11-26 16:44:04 +09:00 |
|
Dean Herbert
|
87da7b05a6
|
Remove unnecessarily specified RelativeSizeAxes
|
2018-11-26 16:39:11 +09:00 |
|
Dean Herbert
|
68f0d25550
|
Mvoe private method to bottom
|
2018-11-26 16:33:58 +09:00 |
|
Dean Herbert
|
8d65d49126
|
Use bindable flow for checking idle time
|
2018-11-26 16:32:59 +09:00 |
|
smoogipoo
|
dea387c31e
|
Fix post-merge issues
|
2018-11-26 16:29:56 +09:00 |
|
smoogipoo
|
dcf740e5d3
|
Merge remote-tracking branch 'origin/master' into multiplayer-room-settings
|
2018-11-26 16:27:22 +09:00 |
|
smoogipoo
|
efdad3a3a7
|
Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection
|
2018-11-26 16:12:55 +09:00 |
|
smoogipoo
|
f9f300b215
|
Fix drag breaking if scrolling while dragging
|
2018-11-26 16:08:56 +09:00 |
|
Dean Herbert
|
fe5b043a59
|
Merge branch 'master' into fix_idle_tracker
|
2018-11-26 15:24:44 +09:00 |
|
Dean Herbert
|
4cfeb1b9a1
|
Merge branch 'master' into note-placement
|
2018-11-26 14:35:31 +09:00 |
|
Dean Herbert
|
c944e8bb29
|
Merge branch 'master' into fix-deletion-crash
|
2018-11-26 14:20:02 +09:00 |
|
Dean Herbert
|
bfebed053d
|
Merge branch 'master' into note-placement
|
2018-11-26 14:19:46 +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 |
|
smoogipoo
|
4fbe28e98f
|
Merge remote-tracking branch 'origin/master' into note-placement
|
2018-11-26 10:42:20 +09:00 |
|
naoey
|
c71fc0b800
|
Don't focus overlay again after set is fetched
|
2018-11-25 14:49:09 +05:30 |
|
smoogipoo
|
cadfe41f83
|
Merge remote-tracking branch 'origin/master' into external_link_warning
|
2018-11-23 15:19:52 +09:00 |
|
smoogipoo
|
df004d7a49
|
Adjust dialog text
|
2018-11-23 15:19:15 +09:00 |
|
smoogipoo
|
ac73844fe0
|
Fix header potentially overflowing the dialog
|
2018-11-23 15:19:09 +09:00 |
|
Dean Herbert
|
afa547af84
|
Fix order of ChannelManager dependency caching
|
2018-11-23 11:00:17 +09:00 |
|
Dan Balasescu
|
b446a73c0c
|
Add brackets
Co-Authored-By: peppy <pe@ppy.sh>
|
2018-11-23 10:06:06 +09:00 |
|
Dean Herbert
|
1b76e2faf5
|
Merge branch 'master' into fix-editor-precise-scroll
|
2018-11-23 09:57:35 +09:00 |
|
Dean Herbert
|
a4259261e3
|
Merge branch 'master' into fix-channel-presence
|
2018-11-23 08:11:46 +09:00 |
|
Dan Balasescu
|
2f368a32d4
|
Merge branch 'master' into fix-invalid-cached
|
2018-11-22 23:56:20 +09:00 |
|
Dan Balasescu
|
0ee4b1c4ac
|
Merge branch 'master' into fix-channel-presence
|
2018-11-22 21:52:16 +09:00 |
|
Dean Herbert
|
10047e6815
|
Adjust tick-based wheel control to be more correct
|
2018-11-22 20:13:40 +09:00 |
|
Dean Herbert
|
1da2006dea
|
Merge branch 'master' into note-placement
|
2018-11-22 19:44:39 +09:00 |
|
Dean Herbert
|
a48c26d999
|
Fix precision scroll events being handled incorrectly by editor
|
2018-11-22 19:40:44 +09:00 |
|
Dean Herbert
|
61fdfe39fd
|
Add comment
|
2018-11-22 19:21:32 +09:00 |
|
Dean Herbert
|
6cd69b794d
|
Fix leaderboard accessing drawables in a possibly invalid state
|
2018-11-22 19:08:46 +09:00 |
|
Dean Herbert
|
a144e97568
|
Fix crash on creating two new PM channels
|
2018-11-22 18:27:22 +09:00 |
|
smoogipoo
|
d1ec9fc294
|
Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence
|
2018-11-22 13:04:32 +09:00 |
|
smoogipoo
|
5caa67d735
|
Hide playlist when MusicController is hidden
|
2018-11-22 12:12:34 +09:00 |
|
miterosan
|
4f41512265
|
Lowercase the references to joinedChannel and availableChannels
|
2018-11-21 23:21:27 +01:00 |
|
miterosan
|
21c9353fee
|
Remove not used usings
|
2018-11-21 23:15:45 +01:00 |
|
miterosan
|
a14b6ac9df
|
Replace ObservableCollection with BindableCollection
|
2018-11-21 23:15:44 +01:00 |
|
smoogipoo
|
cd2737156f
|
Fix crashes when importing/deleting from model managers
|
2018-11-21 23:11:09 +01:00 |
|
smoogipoo
|
aac7081580
|
Update package
|
2018-11-21 23:11:09 +01:00 |
|
smoogipoo
|
39e9c61e24
|
OpenTK -> osuTK
|
2018-11-21 23:11:08 +01:00 |
|
Dean Herbert
|
2126cf0d9a
|
Fix join process for PMs being incorrect
|
2018-11-21 20:44:41 +09:00 |
|
Dean Herbert
|
b31efb7bb9
|
Fix PM channel type
|
2018-11-21 20:34:36 +09:00 |
|
Dean Herbert
|
d677921680
|
Remove excess newline
|
2018-11-21 18:53:50 +09:00 |
|
Dean Herbert
|
7755242a43
|
Merge branch 'master' into osuTK
|
2018-11-21 18:53:11 +09:00 |
|
Dean Herbert
|
ecd7deaf1e
|
Merge pull request #3746 from smoogipoo/fix-threaded-callback-crashes
Fix crashes when importing/deleting from model managers
|
2018-11-21 18:52:20 +09:00 |
|
Dean Herbert
|
88f82eb722
|
Fix instabilities in channel join logic
|
2018-11-21 17:15:15 +09:00 |
|
Dean Herbert
|
4cde66240d
|
Fix default channels not being joined
|
2018-11-21 17:15:15 +09:00 |
|
Dean Herbert
|
eab2776755
|
Fix a crash on leaving the selected channel
|
2018-11-21 17:15:15 +09:00 |
|
smoogipoo
|
ab2c969122
|
Add private channel types
|
2018-11-21 12:58:45 +09:00 |
|
smoogipoo
|
5ad96afea0
|
Fix crashes when importing/deleting from model managers
|
2018-11-20 18:09:23 +09:00 |
|
smoogipoo
|
2a41c38294
|
Update package
|
2018-11-20 17:30:03 +09:00 |
|
smoogipoo
|
dc8cd51e15
|
Implement mania note deletion
|
2018-11-20 17:26:00 +09:00 |
|
smoogipoo
|
f27bd3ef3e
|
OpenTK -> osuTK
|
2018-11-20 17:14:59 +09:00 |
|
Dean Herbert
|
23a446bab2
|
Add support for all channel types
|
2018-11-20 15:03:55 +09:00 |
|
Dean Herbert
|
ed26d8ebec
|
Merge branch 'master' into fix-taiko-lifetimes
|
2018-11-20 04:05:05 +09:00 |
|
Roman Kapustin
|
285b199d7d
|
Make IdleTracker IHandleGlobalInput
|
2018-11-19 20:50:46 +03:00 |
|
Roman Kapustin
|
3c0ce2b615
|
Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle""
This reverts commit bcdaee7d39 .
|
2018-11-19 20:48:59 +03:00 |
|
smoogipoo
|
d5b937f88f
|
Fix post-merge issue
|
2018-11-19 19:17:03 +09:00 |
|
Dan Balasescu
|
8cee4141e8
|
Merge branch 'master' into note-placement
|
2018-11-19 19:08:53 +09:00 |
|
smoogipoo
|
bcdaee7d39
|
Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"
This reverts commit 3e2e2a7000 , reversing
changes made to d94801b6c6 .
|
2018-11-19 17:52:31 +09:00 |
|
smoogipoo
|
55edeb095d
|
SelectionBox -> SelectionHandler
|
2018-11-19 16:58:11 +09:00 |
|
smoogipoo
|
595e2ffbff
|
Unbind event when column changes
|
2018-11-19 16:20:21 +09:00 |
|
Dean Herbert
|
970ea928ae
|
Fix hold for menu button occasionally disappearing
|
2018-11-19 12:06:47 +09:00 |
|
Dean Herbert
|
a57f98ed4d
|
Merge branch 'master' into fix-taiko-lifetimes
|
2018-11-19 08:41:19 +09:00 |
|
Dean Herbert
|
72c9c66461
|
Merge branch 'master' into improve_hud_overlay_colour_setting
|
2018-11-19 08:14:51 +09:00 |
|
Roman Kapustin
|
376e76e00d
|
Resolve merge conflicts
|
2018-11-18 16:10:36 +03:00 |
|
Roman Kapustin
|
ecf8a89f26
|
Set AccentColour and GlowColour in StandardHealthDisplay
|
2018-11-16 19:30:58 +03:00 |
|
Dan Balasescu
|
57c1ddb1e0
|
Merge branch 'master' into flashlight-mod
|
2018-11-16 18:45:15 +09:00 |
|
smoogipoo
|
4cbda97b1e
|
Move positional adjustment to SelectionBox
|
2018-11-16 17:12:24 +09:00 |
|
Roman Kapustin
|
37b19f78ae
|
Set AccentColour in concrete counters
|
2018-11-15 23:37:21 +03:00 |
|
jorolf
|
80bd98bb9d
|
apply suggestions
|
2018-11-15 17:38:38 +01:00 |
|
smoogipoo
|
df7515b66f
|
Pass all selected hitobjects to the selection blueprints
|
2018-11-15 21:01:09 +09:00 |
|
smoogipoo
|
d5464702fa
|
Fix post-merge issue
|
2018-11-15 20:56:34 +09:00 |
|
smoogipoo
|
eddba44d0f
|
Merge branch 'note-placement' into inter-column-movements
|
2018-11-15 20:53:57 +09:00 |
|
smoogipoo
|
e207dd728b
|
Fix taiko proxies not receiving the correct lifetimes
|
2018-11-15 20:26:12 +09:00 |
|
Dan Balasescu
|
e8f34ddff0
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-11-15 15:16:10 +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 |
|
HoLLy
|
9dd3d28436
|
Fix SettingsTextBox having width of 0
|
2018-11-14 22:29:11 +01:00 |
|
Dean Herbert
|
caaa5645e3
|
Correct framework version
|
2018-11-14 21:16:08 +09:00 |
|
Dean Herbert
|
30547ac064
|
Merge remote-tracking branch 'upstream/master' into dropdown-updates
|
2018-11-14 20:03:45 +09:00 |
|
smoogipoo
|
f1f2fc133a
|
Use SkinInfo directly
|
2018-11-14 19:29:20 +09:00 |
|
Dan Balasescu
|
81a3170e3b
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 19:13:07 +09:00 |
|
Jack Scotson
|
8ee81c4811
|
Merge branch 'master' into keypad-enter
|
2018-11-14 10:03:19 +00:00 |
|
Dan Balasescu
|
61a62a4eae
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 18:35:08 +09:00 |
|
smoogipoo
|
4b86c29f7b
|
Merge remote-tracking branch 'origin/master' into placement-hiding
|
2018-11-14 18:34:45 +09:00 |
|
smoogipoo
|
c963fc7cd2
|
Reduce chaining
|
2018-11-14 18:34:13 +09:00 |
|
Dean Herbert
|
4dec2d1db0
|
Merge remote-tracking branch 'upstream/master' into note-placement
|
2018-11-14 18:29:31 +09:00 |
|
Dan Balasescu
|
e9b47c6233
|
Merge branch 'master' into hold-for-menu-back
|
2018-11-14 18:22:34 +09:00 |
|
Dean Herbert
|
a83efe225e
|
Merge remote-tracking branch 'upstream/master' into add-mania-selection-testcase
|
2018-11-14 18:11:53 +09:00 |
|
smoogipoo
|
aff5fa6169
|
Update with osu!-side dropdown changes
|
2018-11-14 18:02:38 +09:00 |
|
Dean Herbert
|
a1dd1057ce
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 17:15:24 +09:00 |
|
Dean Herbert
|
84d16ee71b
|
Merge branch 'master' into placement-hiding
|
2018-11-14 16:59:41 +09:00 |
|
smoogipoo
|
7274908059
|
Implement interface
|
2018-11-14 15:33:09 +09:00 |
|
Dean Herbert
|
fb22fc11f6
|
Merge remote-tracking branch 'upstream/master' into Private_Messages
|
2018-11-14 13:59:17 +09:00 |
|
Dean Herbert
|
9a9d5e60af
|
More refactors
|
2018-11-14 13:59:02 +09:00 |
|
Dean Herbert
|
2ae139d260
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 13:54:53 +09:00 |
|
Dean Herbert
|
34973a3e9f
|
Merge branch 'master' into scrollalgorithm-timeat
|
2018-11-14 13:32:16 +09:00 |
|
Dean Herbert
|
8b190edde0
|
Merge branch 'master' into more-global-scrollalgo
|
2018-11-14 13:32:14 +09:00 |
|
Dean Herbert
|
8d59b7299f
|
Merge branch 'master' into no-drawable-speedchangevis
|
2018-11-14 13:22:01 +09:00 |
|
Dean Herbert
|
c4769f6802
|
Refactors
|
2018-11-14 13:19:51 +09:00 |
|
Dean Herbert
|
396a5b3cd0
|
Merge branch 'master' into Private_Messages
|
2018-11-14 12:49:54 +09:00 |
|
Dean Herbert
|
b9278b3488
|
Fix brackets
|
2018-11-14 12:05:07 +09:00 |
|
Dean Herbert
|
161d476091
|
Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song
|
2018-11-14 11:53:43 +09:00 |
|
Dean Herbert
|
c77412992e
|
Merge conditionals
|
2018-11-14 11:53:34 +09:00 |
|
Jack Scotson
|
0bced171e7
|
Merge branch 'master' into keypad-enter
|
2018-11-13 17:11:21 +00:00 |
|
Scotsoo
|
4dab5db2e5
|
Allowing keypad enter to be used along with normal enter
|
2018-11-13 17:09:28 +00:00 |
|
Dean Herbert
|
3caf0cb0d9
|
Merge branch 'master' into no-drawable-speedchangevis
|
2018-11-13 19:42:04 +09:00 |
|
Dean Herbert
|
e7d984415b
|
Merge branch 'master' into immutable-sliderpath
|
2018-11-13 18:06:14 +09:00 |
|
Dean Herbert
|
72ae22b0c4
|
Add support for creating new PM conversations
|
2018-11-13 17:24:11 +09:00 |
|
Dean Herbert
|
f241fcdba1
|
Add back support for new API and private messages
|
2018-11-13 15:20:59 +09:00 |
|
smoogipoo
|
6d43baf4bf
|
Make show/hide only invoked once each
|
2018-11-13 13:12:11 +09:00 |
|
smoogipoo
|
fbc20d2d4d
|
Hide placement when cursor is not in the playfield
|
2018-11-13 12:52:04 +09:00 |
|
Dean Herbert
|
8b9f7f6691
|
Merge branch 'master' into Private_Messages
|
2018-11-12 20:43:10 +09:00 |
|
Dean Herbert
|
4b1282235a
|
Merge remote-tracking branch 'upstream/master' into Private_Messages
|
2018-11-12 20:41:10 +09:00 |
|
smoogipoo
|
3d8ef97e81
|
Add testcase
|
2018-11-12 19:41:06 +09:00 |
|
smoogipoo
|
3a1fee59fb
|
Implement note placement
|
2018-11-12 18:24:18 +09:00 |
|
smoogipoo
|
a0c75a0597
|
Merge branch 'notepieces' into note-placement
|
2018-11-12 17:59:54 +09:00 |
|
smoogipoo
|
9e1b54f1ef
|
Merge branch 'more-global-scrollalgo' into note-placement
|
2018-11-12 17:47:02 +09:00 |
|
smoogipoo
|
b9b20607af
|
Add IScrollAlgorithm.TimeAt()
|
2018-11-12 17:43:22 +09:00 |
|
smoogipoo
|
2e0e1befe9
|
Add selection mask testcases
# Conflicts:
# osu.Game/Tests/Visual/SelectionBlueprintTestCase.cs
|
2018-11-12 17:40:09 +09:00 |
|
smoogipoo
|
8be6e351f5
|
Merge branch 'fix-mania-selections' into add-mania-selection-testcase
|
2018-11-12 17:39:58 +09:00 |
|
smoogipoo
|
d8e7ad8241
|
Fix post-rebase issues
|
2018-11-12 17:36:19 +09:00 |
|
smoogipoo
|
10543cf1b6
|
Move rest of ScrollingPlayfield into ScrollingRulesetContainer
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
e7969ecec7
|
Move ScrollAlgorithm inside IScrollingInfo
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
54668a0dec
|
Simplify construction of ScrollingInfo
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
ad45bc7666
|
Move scroll direction to scrollinginfo
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
48486895ba
|
Remove unused code
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
9fde7f7f44
|
Move scrolling info to osu.Game
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
7f0f143a1b
|
Move IScrollAlgorithm to ScrollingRulesetContainer + use DI
|
2018-11-12 17:34:35 +09:00 |
|
smoogipoo
|
aee7a80e71
|
ScrollAlgorithm -> ScrollVisualisationMethod
|
2018-11-12 17:26:37 +09:00 |
|
smoogipoo
|
f3ba429701
|
Make sure control points is internally initialised
|
2018-11-12 17:14:06 +09:00 |
|
Dean Herbert
|
1101e161d9
|
Update framework and resources
|
2018-11-12 17:02:46 +09:00 |
|
smoogipoo
|
f4fd6189f8
|
Implement IEquatable
|
2018-11-12 16:53:30 +09:00 |
|
smoogipoo
|
0220ed21b0
|
Ignore distance for json serialisation
|
2018-11-12 16:38:49 +09:00 |
|
smoogipoo
|
0e92b385f0
|
Define default json deserialisation constructor
|
2018-11-12 16:38:33 +09:00 |
|
smoogipoo
|
8ad9b6a02a
|
Safety for default(SliderPath)
|
2018-11-12 16:38:14 +09:00 |
|
smoogipoo
|
d594ce3530
|
Revert "Make SliderPath.ControlPoints read-only"
This reverts commit 3b88d94793 .
# Conflicts:
# osu.Game/Rulesets/Objects/SliderPath.cs
|
2018-11-12 16:20:38 +09:00 |
|
smoogipoo
|
77d16aa968
|
Add xmldocs
|
2018-11-12 14:16:21 +09:00 |
|
smoogipoo
|
4eef1134a6
|
Re-order file
|
2018-11-12 14:08:36 +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
|
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 |
|
Dean Herbert
|
4783df1d4b
|
Fix compose mode not working
|
2018-11-09 11:36:06 +09:00 |
|
Dean Herbert
|
27549586e6
|
Merge branch 'master' into manual-position-adjustments
|
2018-11-09 10:53:41 +09:00 |
|
smoogipoo
|
33056b8098
|
Adjust namespaces
|
2018-11-08 14:04:21 +09:00 |
|
smoogipoo
|
f66a9f4f1e
|
Rename IScrollChangeVisualiser -> IScrollAlgorithm
|
2018-11-08 14:04:21 +09:00 |
|
smoogipoo
|
2f87f267a3
|
Fix height being set instead of width
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
195f82fa96
|
Give visualiser methods range+length params again
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
f41bfd14ca
|
Add some xmldocs
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
76ea314c27
|
Reorder params
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
589c3a47e2
|
Remove state computation + updates from ISpeedChangeVisualiser
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
0bdeebbce2
|
Expose basic values from ISpeedChangeVisualiser
|
2018-11-08 14:04:20 +09:00 |
|
smoogipoo
|
c6350c6efd
|
Remove IHasEditablePosition
|
2018-11-08 13:03:11 +09:00 |
|
Dean Herbert
|
f2e22e0fd1
|
Merge branch 'master' into fix-hitobject-masking
|
2018-11-08 00:26:38 +09:00 |
|
smoogipoo
|
5d51719572
|
Make selection blueprints handle position adjustments
|
2018-11-07 16:21:32 +09:00 |
|
smoogipoo
|
cf4dad0fe8
|
Fix hitobjects not updating IsMaskedAway after being judged
|
2018-11-07 15:42:40 +09:00 |
|
smoogipoo
|
4277cb0d59
|
Adjust some missed renames
|
2018-11-07 15:04:48 +09:00 |
|
smoogipoo
|
e9e50f41fb
|
Use Name/NameScreen format
|
2018-11-07 13:04:17 +09:00 |
|
Dean Herbert
|
7f73fc2d39
|
Require holding back button to quit gameplay
Avoids accidental presses and streamlines logic with on-screen element.
|
2018-11-07 01:49:21 +09:00 |
|
smoogipoo
|
52f4923c8e
|
Remove intermediate Screens namespace
|
2018-11-06 18:28:22 +09:00 |
|
smoogipoo
|
ac25718c5a
|
Renamespace compose-mode components
|
2018-11-06 18:14:46 +09:00 |
|
smoogipoo
|
27d82052f4
|
BorderLayer -> EditorPlayfieldBorder
|
2018-11-06 18:10:46 +09:00 |
|
smoogipoo
|
85f96ad62f
|
Fix a few missed renames
|
2018-11-06 18:07:53 +09:00 |
|
smoogipoo
|
b3fa7c111b
|
Rename testcases
|
2018-11-06 18:06:20 +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
|
90c813618a
|
Merge PlacementContainer into BlueprintContainer
|
2018-11-06 18:02:55 +09:00 |
|
smoogipoo
|
f2a5f28ea2
|
SelectionMask -> SelectionBlueprint
|
2018-11-06 17:56:04 +09:00 |
|
smoogipoo
|
ad2836a61e
|
MaskSelection -> SelectionBox
|
2018-11-06 17:52:47 +09:00 |
|
smoogipoo
|
65bb91dcf7
|
Merge MaskContainer into BlueprintContainer
|
2018-11-06 17:51:26 +09:00 |
|
smoogipoo
|
26c9390c16
|
HitObjectMaskLayer -> BlueprintContainer
|
2018-11-06 17:36:10 +09:00 |
|
smoogipoo
|
faab744cbd
|
DragLayer -> DragBox
|
2018-11-06 17:24:57 +09:00 |
|
Dean Herbert
|
4554fc2c7b
|
Update framework and other dependencies
|
2018-11-05 18:22:16 +09:00 |
|
smoogipoo
|
ace1dce281
|
Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
# osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
|
2018-11-05 18:10:22 +09:00 |
|
smoogipoo
|
92d570342c
|
Fix sample additions not falling back to non-addition bank
|
2018-11-05 17:35:24 +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
|
998a540cf8
|
Merge branch 'master' into force-sort-objects
|
2018-11-05 16:23:11 +09:00 |
|
smoogipoo
|
171700cb91
|
Debounce editor summary timeline seeks
|
2018-11-05 15:59:40 +09:00 |
|
smoogipoo
|
1fffa48aa0
|
Sort nested hitobjects post-creation
|
2018-11-05 12:15:45 +09:00 |
|
FreezyLemon
|
56ff2686ac
|
Update osu-resources and osu-framework to use binary fonts
|
2018-11-03 18:09:11 +01:00 |
|
gotopie
|
4c9dcdf156
|
hide seekbar when no song is playing
|
2018-11-02 19:04:30 -04:00 |
|
Dean Herbert
|
63cbc8e0e8
|
Merge branch 'master' into slider-placement
|
2018-11-02 19:45:34 +09:00 |
|
Dean Herbert
|
e6ee3dc73e
|
Use framework helper functions for path approximation
|
2018-11-02 19:26:29 +09:00 |
|
Dan Balasescu
|
7b9afe9cf7
|
Merge branch 'master' into fix-path-control-point-drag
|
2018-11-02 13:04:04 +09:00 |
|
Dan Balasescu
|
173d2904b8
|
Merge branch 'master' into fix-disk-space-errors
|
2018-11-02 12:15:13 +09:00 |
|
Roman Kapustin
|
b4809f4417
|
External link warning code cleanup
|
2018-11-01 23:52:07 +03:00 |
|
Dean Herbert
|
0a0023920f
|
Fix not being able to drag control points mid-snake
|
2018-11-02 04:09:33 +09:00 |
|
smoogipoo
|
1aae123ff5
|
Make approximators share an interface
|
2018-11-01 19:16: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
|
bb2f8deb18
|
ControlPoint -> PathControlPoint
Also Curve -> Path.
|
2018-11-01 03:56:51 +09:00 |
|
Dean Herbert
|
9cb4374b51
|
Merge branch 'master' into slider-controlpoint-masks
|
2018-11-01 02:37:31 +09:00 |
|
Dean Herbert
|
85a7325911
|
Fix placement masks handling scroll events
|
2018-10-31 17:23:27 +09:00 |
|
Dean Herbert
|
9aa88293e2
|
Use HResult
|
2018-10-31 17:07:05 +09:00 |
|
Dean Herbert
|
29a1d092fa
|
Don't log disk space related IO errors
|
2018-10-31 16:43:35 +09:00 |
|
Dean Herbert
|
d38bf38606
|
Merge branch 'master' into slider-controlpoint-masks
|
2018-10-31 15:23:30 +09:00 |
|
Dean Herbert
|
d7f3e51050
|
Merge branch 'master' into editor-mask-placement
|
2018-10-31 15:00:38 +09:00 |
|
Kyle Chang
|
214ed43b81
|
Check if SongSelect is current screen before playing selected song
|
2018-10-30 23:47:54 -04:00 |
|
Dean Herbert
|
5eaf80ab76
|
Add missing newline
|
2018-10-31 12:07:06 +09:00 |
|
Dean Herbert
|
3207a585c6
|
Add missing xmldoc
|
2018-10-31 12:01:10 +09:00 |
|
Dean Herbert
|
b28c0cd128
|
Merge branch 'master' into editor-mask-placement
|
2018-10-31 06:46:48 +09:00 |
|
Dean Herbert
|
7e88b8b457
|
Merge branch 'master' into selection-mask-testcase
|
2018-10-31 06:14:33 +09:00 |
|
Dean Herbert
|
5f5e30c378
|
Merge branch 'master' into mask-separation
|
2018-10-31 05:59:07 +09:00 |
|
Dean Herbert
|
6f1ef3243d
|
Proportionally adjust width in line with change
|
2018-10-31 02:56:25 +09:00 |
|
Dean Herbert
|
4502fa39e9
|
Merge remote-tracking branch 'upstream/master' into reduce-handle-height
|
2018-10-31 02:55:38 +09:00 |
|
Paul Teng
|
4bc9161cd1
|
Leave bigger gap if replaying
|
2018-10-30 08:32:12 -04:00 |
|
smoogipoo
|
5712a52817
|
Merge remote-tracking branch 'origin/master' into mask-separation
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
|
2018-10-30 16:46:13 +09:00 |
|
Dean Herbert
|
0b534885b8
|
Update framework
|
2018-10-30 00:10:34 -07:00 |
|
Dean Herbert
|
113f80570b
|
Merge remote-tracking branch 'upstream/master' into separate-slider-body
|
2018-10-30 00:07:29 -07:00 |
|
Kyle Chang
|
6d00aff9fd
|
Add type parameter to IApplicableToBeatmap
|
2018-10-30 00:13:33 -04:00 |
|
WebFreak001
|
cbd14d5b0e
|
Merge branch 'master' of https://github.com/ppy/osu into mod-fl2
|
2018-10-29 19:28:21 +01: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
|
acd703c27b
|
Make sliders respond to control point changes
|
2018-10-29 15:36:43 +09:00 |
|
smoogipoo
|
a9f1484e8b
|
Fix some post-rebase issues
|
2018-10-29 15:26:28 +09:00 |
|
smoogipoo
|
e964a555d0
|
Fix DummyWorkingBeatmap having unrealistic defaults
|
2018-10-29 15:26:28 +09:00 |
|
smoogipoo
|
8b36d9b482
|
Remove SliderCurve.Offset (unused)
|
2018-10-29 15:26:07 +09:00 |
|
smoogipoo
|
b3e105ba93
|
Make curve approximators implement common interface
|
2018-10-29 15:26:07 +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 |
|
Kyle Chang
|
8f5e495585
|
Merge branch 'master' of https://github.com/ppy/osu into mania-dual-fix
|
2018-10-29 00:16:29 -04:00 |
|
Kyle Chang
|
c7e950af7f
|
Remove EditSelected in favor in inlining beatmapNoDebounce in Edit
|
2018-10-29 00:04:51 -04:00 |
|
Kyle Chang
|
886dd0f0d4
|
Remove unneeded using directive
|
2018-10-28 13:21:12 -04:00 |
|
Kyle Chang
|
2b736c3cd6
|
Make beatmap edit button reload beatmap without mods
|
2018-10-28 13:04:45 -04:00 |
|
Kyle Chang
|
f8a8c7cb6b
|
Stop transferring track when editing
|
2018-10-28 12:43:19 -04:00 |
|
Kyle Chang
|
8c4e08d280
|
Merge branch 'master' of https://github.com/qwewqa/osu into mania-dual-fix
|
2018-10-28 12:02:18 -04:00 |
|
Dean Herbert
|
4f65d67e2b
|
Merge branch 'master' into skinnable-spritetext
|
2018-10-28 08:35:25 -07:00 |
|
Kyle Chang
|
df6fc4013a
|
Add interface to adjust Beatmaps
|
2018-10-28 02:21:25 -04: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 |
|
HoLLy
|
cf3b4447eb
|
Fade only textContainer instead of entire MetadataSection
|
2018-10-26 13:35:51 +02:00 |
|
smoogipoo
|
951a309d04
|
Increase placement testcase circlesize
|
2018-10-26 15:36:09 +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
|
ce9b400c4c
|
Add selection mask test cases
|
2018-10-26 13:58:33 +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
|
8703db5cc1
|
Rename HitObjectMask -> SelectionMask
|
2018-10-26 13:31:23 +09:00 |
|
smoogipoo
|
2f42112d87
|
Add placement mask testcase
|
2018-10-25 19:11:57 +09:00 |
|
smoogipoo
|
2b141a2bc1
|
Make PlacementMask abstract
|
2018-10-25 19:10:59 +09:00 |
|
smoogipoo
|
4ecd4ca462
|
Add selection mask test cases
|
2018-10-25 19:10:52 +09:00 |
|
smoogipoo
|
ea6db8b793
|
Make the hitobject masks move within their placement/selection
|
2018-10-25 18:16:25 +09:00 |
|
HoLLy
|
88aca46500
|
Fade MetadataSection back in if non-null Text is set
|
2018-10-24 18:53:22 +02:00 |
|
Roman Kapustin
|
7401fabb5d
|
Extract external link opening to the ExternalLinkOpener class
|
2018-10-23 23:03:00 +03:00 |
|
Dean Herbert
|
94093ac948
|
Update beatmap search API to match latest osu-web structure
|
2018-10-23 18:05:41 +09:00 |
|
smoogipoo
|
8a2a6a3ecb
|
Preserve the beatmap's version
|
2018-10-23 14:59:21 +09:00 |
|
Roman Kapustin
|
805f8d98c4
|
Implement warn about opening external links option
|
2018-10-22 23:57:37 +03:00 |
|
Roman Kapustin
|
b4c68f4cf7
|
Show a warning prior to opening external links
|
2018-10-22 23:16:57 +03:00 |
|
Dan Balasescu
|
412f65bb70
|
Merge branch 'master' into check-before-btn-change
|
2018-10-22 17:29:26 +09:00 |
|
smoogipoo
|
05d89180c8
|
Move brace on new line
|
2018-10-22 12:17:23 +09:00 |
|
Paul Teng
|
86b29064c6
|
Change DownloadState only when Download is possible
|
2018-10-18 08:51:05 -04:00 |
|
Dean Herbert
|
ae94aab677
|
Update framework
|
2018-10-18 21:04:29 +09:00 |
|
Paul Teng
|
b351aae93f
|
Reduce height of song progress handle
|
2018-10-18 07:02:18 -04:00 |
|
smoogipoo
|
72d48aa7f5
|
Add xmldocs to IPlacementHandler
|
2018-10-18 16:46:30 +09:00 |
|
smoogipoo
|
0e841628b6
|
Implement hitobject deletion
|
2018-10-18 16:36:06 +09:00 |
|
Dean Herbert
|
a2b8904b1e
|
Merge branch 'master' into database-standardize-paths
|
2018-10-18 16:21:45 +09:00 |
|
HoLLy
|
3f185a44de
|
Fix Windows-style path separators not being migrated on Unix systems
|
2018-10-18 08:29:12 +02:00 |
|
Paul Teng
|
7720fa10eb
|
Reduce height of RankChartLineGraph
|
2018-10-17 20:19:01 -04:00 |
|
smoogipoo
|
5a5e91eaed
|
Add a way to re-invoke ApplyDefaults on placement object
|
2018-10-17 18:36:47 +09:00 |
|
smoogipoo
|
b7435c0c5f
|
Fix border layer not working
|
2018-10-17 18:29:30 +09:00 |
|
smoogipoo
|
6eb7a030d0
|
Fix placement container not being refreshed upon placement
|
2018-10-17 18:11:44 +09:00 |
|
smoogipoo
|
d36ac59ca2
|
Reduce complexity of creating edit ruleset containers
|
2018-10-17 18:06:00 +09:00 |
|
smoogipoo
|
969477dadd
|
Remove placement events, make everything pass top-down
|
2018-10-17 17:43:16 +09:00 |
|
smoogipoo
|
62635c5ab8
|
Add container to handle placement mask
|
2018-10-17 16:17:49 +09:00 |
|
smoogipoo
|
4ea4ec0d25
|
Move placement handling events to a higher level
|
2018-10-17 15:46:30 +09:00 |
|
smoogipoo
|
08e3fe1def
|
Add PlacementStarted event, rename placement methods
|
2018-10-17 14:37:45 +09:00 |
|
smoogipoo
|
1bebceada7
|
Unroll loop for the last control point
|
2018-10-17 11:55:34 +09:00 |
|
smoogipoo
|
336b6fa38e
|
Perform a custom binary search to remove thread-unsafeness
|
2018-10-17 11:23:18 +09:00 |
|
smoogipoo
|
d431dd59a8
|
Cleanups
|
2018-10-17 10:53:21 +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 |
|
HoLLy
|
eb9199e07a
|
Run database migration unconditionally, remove downwards migration
|
2018-10-16 08:29:47 +02:00 |
|
smoogipoo
|
41391a6627
|
Fix beatmap conversion tests failing
|
2018-10-16 12:01:58 +09:00 |
|
smoogipoo
|
3ad93d5a07
|
Remove redundant type specifications
|
2018-10-16 11:40:51 +09:00 |
|
smoogipoo
|
060cc24dba
|
Cleanup slidercurve calculation
|
2018-10-16 11:11:04 +09:00 |
|
smoogipoo
|
72aaaa4a74
|
PointSearch -> SearchPoint
|
2018-10-16 10:29:53 +09:00 |
|
smoogipoo
|
5095fbcdf7
|
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
|
2018-10-16 10:27:18 +09:00 |
|
HoLLy
|
710b0a4664
|
Remove unnecessary PathSanitise call
|
2018-10-12 15:30:24 +02:00 |
|
Dean Herbert
|
eaa5ef5168
|
Merge branch 'master' into return_to_large_logo_after_idle
|
2018-10-12 22:14:23 +09:00 |
|
HoLLy
|
bb07630743
|
Merge branch 'master' into database-standardize-paths
|
2018-10-12 14:08:25 +02:00 |
|
Dean Herbert
|
a314a561d0
|
Merge branch 'master' into playfield-scaling-rework
|
2018-10-12 19:32:43 +09:00 |
|
Dean Herbert
|
468f7fd1ea
|
Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework
|
2018-10-12 19:25:08 +09:00 |
|
Dean Herbert
|
ad42f2244d
|
Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer
|
2018-10-12 19:15:11 +09:00 |
|
Dean Herbert
|
15dae9b2e4
|
Update nuget dependencies (version mismatches)
|
2018-10-12 18:51:51 +09:00 |
|
Jan Jurzitza
|
460c943958
|
Merge branch 'master' into mod-fl2
|
2018-10-12 11:44:55 +02:00 |
|
Dean Herbert
|
1de770e093
|
Merge branch 'master' into fix-sv
|
2018-10-12 18:13:50 +09:00 |
|
Dean Herbert
|
f7c887cf79
|
Merge branch 'master' into debounce-seeks
|
2018-10-12 17:50:39 +09:00 |
|
Dean Herbert
|
8e66f9a85d
|
Merge branch 'master' into tighten-diffcalc-tolerances
|
2018-10-12 17:35:33 +09:00 |
|
Dean Herbert
|
182aa63cc8
|
Update nuget dependencies
|
2018-10-12 17:08:59 +09:00 |
|
Dean Herbert
|
c52a292935
|
Update framework
|
2018-10-12 16:10:32 +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 |
|
Dean Herbert
|
5d26c1b771
|
Merge pull request #3574 from smoogipoo/hitobject-perf-improvements
Various performance improvements around hitobjects
|
2018-10-11 22:16:48 +09:00 |
|
smoogipoo
|
d282d16e1c
|
Use SortedList again
|
2018-10-11 20:49:12 +09:00 |
|
smoogipoo
|
fb1760f580
|
Simplify linq from beatmap conversion
|
2018-10-11 20:29:37 +09:00 |
|
smoogipoo
|
ec9f23ab73
|
Make IBeatmap.HitObjects an IReadOnlyList
|
2018-10-11 19:53:07 +09:00 |
|
smoogipoo
|
7b2a30f5b4
|
Reduce some high-profile enumerator allocations
|
2018-10-11 19:52:03 +09:00 |
|
smoogipoo
|
10fb1d20d1
|
Remove allocation of control point with every binarysearch
|
2018-10-11 19:08:00 +09:00 |
|
smoogipoo
|
5b544a0c97
|
Remove allocation of string.IndexOf()
|
2018-10-11 18:37:48 +09:00 |
|
smoogipoo
|
bd99a87298
|
Use ordinal comparison in LegacyBeatmapDecoder
|
2018-10-11 17:48:47 +09:00 |
|
smoogipoo
|
83fd251c7b
|
Pass sub-controlpoints as span slices
|
2018-10-11 17:44:25 +09:00 |
|
smoogipoo
|
0c4403ef16
|
Don't apply version offset during diff calc
|
2018-10-11 13:53:49 +09:00 |
|