Dean Herbert
|
4430255ec4
|
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
|
2017-03-07 13:50:08 +09:00 |
|
Dean Herbert
|
0cad5d7d41
|
Fix most warnings.
|
2017-03-07 13:05:57 +09:00 |
|
Alex Amadori
|
fd53d10264
|
Refactor ArchiveReader for extensibility
|
2017-03-06 23:56:08 +01:00 |
|
Dean Herbert
|
95e2e2b027
|
Replay loading via drag-drop huzzah!
|
2017-03-04 19:02:43 +09:00 |
|
Dean Herbert
|
aa9d85624d
|
Change IPC to make sense.
|
2017-03-04 18:51:16 +09:00 |
|
Dean Herbert
|
398b1fcf03
|
Add comment about .ID == 0 check.
|
2017-03-03 20:51:07 +09:00 |
|
Mikal Stodal
|
c88c6c4c62
|
More summaries
|
2017-03-02 15:37:45 +01:00 |
|
Mikal Stodal
|
dfa21444b4
|
Ensure correct exception logged
|
2017-03-02 14:10:32 +01:00 |
|
Mikal Stodal
|
2498305174
|
Merged branch master into remove-source-on-import
|
2017-03-02 13:39:22 +01:00 |
|
Mikal Stodal
|
47162a3e91
|
Update summary and commentary
|
2017-03-02 13:39:02 +01:00 |
|
Mikal Stodal
|
6661195e92
|
Only add set if ID is 0
|
2017-03-02 13:36:01 +01:00 |
|
Dean Herbert
|
68a359698d
|
Fix potential nullref caused by test data.
|
2017-03-02 18:35:24 +09:00 |
|
Mikal Stodal
|
418ae24fea
|
Document private method getBeatmapSet(path)
|
2017-03-01 17:57:57 +01:00 |
|
Mikal Stodal
|
1e901a1604
|
Only set StoryBoardFile once
|
2017-03-01 17:08:12 +01:00 |
|
Mikal Stodal
|
eff66a1da6
|
Only delete on successful import.
|
2017-02-28 14:46:16 +01:00 |
|
Mikal Stodal
|
d54a75a5c5
|
Delete file after importing BeatmapSet w/error handling,
also changed batch-commit of multiple sets to database.
|
2017-02-28 14:35:42 +01:00 |
|
Dean Herbert
|
4a4f1f4d82
|
Actually delete all related database entries, not just the set.
|
2017-02-27 18:27:38 +09:00 |
|
Dean Herbert
|
27d31d1d30
|
Merge remote-tracking branch 'upstream/master' into better-container
|
2017-02-26 11:23:06 +09:00 |
|
Thomas Müller
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09:00 |
|
Dean Herbert
|
7a60a5e499
|
Lock the BeatmapDatabase's connection during imports.
This should avoid any potential issues with intertwined transactions on the same connection while still allowing higher throughput when importing.
|
2017-02-25 10:39:13 +09:00 |
|
Thomas Müller
|
d150eb4450
|
Merge branch 'master' into better-star-counter
|
2017-02-24 19:37:04 +01:00 |
|
Thomas Müller
|
f7d985fe18
|
Fix and refactor star difficulty calculation boilerplate
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
|
2017-02-24 19:36:17 +01:00 |
|
Dean Herbert
|
c178493877
|
Add support for undeleting beatmaps if they are imported during an undeleted state.
|
2017-02-24 18:13:38 +09:00 |
|
Dean Herbert
|
d24403e58e
|
Remove unused using statement.
|
2017-02-24 17:20:00 +09:00 |
|
Dean Herbert
|
958bf54c31
|
Add safe deletion support.
|
2017-02-24 17:08:13 +09:00 |
|
Dean Herbert
|
6c3bda18b6
|
Add beatmap deletion support.
Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.
|
2017-02-24 14:37:54 +09:00 |
|
Dean Herbert
|
3a89348413
|
Centralise access to WorkingBeatmaps.
They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).
|
2017-02-24 13:43:21 +09:00 |
|
Thomas Müller
|
a5dfa7ab06
|
Remove unnecessary using statements
|
2017-02-23 21:38:10 +01:00 |
|
Dean Herbert
|
da2bfe6d3c
|
Framework updates.
|
2017-02-23 16:42:12 +09:00 |
|
Thomas Müller
|
417f146386
|
Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
|
2017-02-19 17:41:51 +01:00 |
|
Dean Herbert
|
11643d2e09
|
Remove unnecessary methods and local variables.
|
2017-02-13 18:30:51 +09:00 |
|
Thomas Müller
|
e3f35cd66e
|
Merge branch 'master' into osb_loading
|
2017-02-12 12:26:25 +01:00 |
|
Dean Herbert
|
870aa2750f
|
Don't attempt to import command line arguments as beatmaps.
|
2017-02-12 14:53:33 +09:00 |
|
Damnae
|
a504c73f33
|
Load beatmap data from an optional osb file.
|
2017-02-09 15:19:09 +01:00 |
|
Dean Herbert
|
50bd80cb0c
|
Update and standardise license headers.
|
2017-02-07 14:27:41 +09:00 |
|
Dean Herbert
|
756fd78a88
|
Fix incorrect line endings.
|
2017-02-07 13:52:19 +09:00 |
|
Dean Herbert
|
0272c4b559
|
Add StarDifficulty property and correct colouring of difficulty icons.
|
2017-01-30 15:26:28 +09:00 |
|
Dean Herbert
|
56fe69852d
|
Change beatmap database reset logic to only run a maximum of once.
|
2017-01-23 18:13:06 +09:00 |
|
Dean Herbert
|
ef8347fe53
|
Reset the beatmap database when it can't be read, rather than hard failing.
|
2017-01-23 13:02:03 +09:00 |
|
柯十六夜
|
acfbf2e32e
|
Add prefix Online to BeatmapID and BeatmapSetID
|
2017-01-09 21:05:01 +08:00 |
|
柯十六夜
|
ef11c3f389
|
Add default Beatmap ID
|
2016-12-21 14:47:56 +08:00 |
|
柯十六夜
|
02f6e46105
|
Add support for v9 beatmaps
|
2016-12-20 23:56:49 +08:00 |
|
Dean Herbert
|
f356640cb7
|
Add missing licence headers.
|
2016-12-06 19:07:15 +09:00 |
|
Dean Herbert
|
0c841cffdd
|
Change GetChildren recursive default to false (should be more common).
|
2016-11-23 15:34:32 +09:00 |
|
Dean Herbert
|
d71550d22a
|
Don't do a recursive fill by default, we don't need it.
|
2016-11-22 22:07:28 +09:00 |
|
Dean Herbert
|
2ba365657e
|
Tidy up some linq.
|
2016-11-22 17:21:42 +09:00 |
|
Dean Herbert
|
06f4f93918
|
Move play modes to Modes namespace.
|
2016-11-14 18:03:20 +09:00 |
|
Dean Herbert
|
0f4538f69f
|
Rename GameModes namespace to Screens.
|
2016-11-14 17:23:33 +09:00 |
|
Huo Yaoyuan
|
ef5968e243
|
More robust metadata handling.
|
2016-11-07 23:12:49 +08:00 |
|
Huo Yaoyuan
|
c59cad2478
|
AudioEquals method for BeatmapInfo.
|
2016-11-07 21:52:23 +08:00 |
|
Dean Herbert
|
a11d534067
|
Add beatmap backgrounds.
|
2016-11-05 20:00:14 +09:00 |
|
Dean Herbert
|
8fe63689a4
|
Fix thread safety issue when accessing files in beatmap (zip) files.
|
2016-11-05 18:19:01 +09:00 |
|
Dean Herbert
|
b86f308af6
|
Add async workflow.
|
2016-11-01 23:24:14 +09:00 |
|
Dean Herbert
|
10ef34b805
|
Lazy parse beatmap; Don't reload audio track if it hasn't changed.
|
2016-10-28 20:24:14 +09:00 |
|
Dean Herbert
|
74f1a9622f
|
Add initial game-wide beatmap flow.
|
2016-10-28 19:55:48 +09:00 |
|
Dean Herbert
|
feccb7286c
|
Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect.
|
2016-10-28 14:14:45 +09:00 |
|
Dean Herbert
|
33ef55df88
|
Allow BeatmapDatabase to be constructed without a host.
|
2016-10-27 17:34:50 +09:00 |
|
Dean Herbert
|
f16cc430f8
|
Stop using memory database. Load sample data local to TestCase.
Also makes the connection private.
|
2016-10-27 17:08:53 +09:00 |
|
Drew DeVault
|
063fdd9a2d
|
Add test data to db for VisualTests
Also fixes the broken IPC condition
|
2016-10-24 14:57:00 -04:00 |
|
Dean Herbert
|
d3a857edb9
|
Make importing work properly.
Moves import code to BeatmapDatabase.
|
2016-10-24 11:39:53 -04:00 |
|
Dean Herbert
|
0c9e26e546
|
Return the populated item when calling GetChildren to write more elegant code.
|
2016-10-24 11:39:18 -04:00 |
|
Dean Herbert
|
6f80efdb29
|
Add a database reset method.
|
2016-10-24 11:39:18 -04:00 |
|
Dean Herbert
|
7650bb1707
|
Don't insert to database until we're completely finished importing a beatmap.
|
2016-10-24 11:39:18 -04:00 |
|
Dean Herbert
|
ee6c810df5
|
Fix cascading inserts.
|
2016-10-24 11:39:18 -04:00 |
|
Drew DeVault
|
42f8d19c73
|
Sort by difficulty and fix relationship
|
2016-10-24 11:39:18 -04:00 |
|
Drew DeVault
|
8d6431b35e
|
Add star counter to difficulty select
|
2016-10-24 11:39:18 -04:00 |
|
Drew DeVault
|
6da092ab30
|
Fix additional bugs, tweak L+F
|
2016-10-24 11:39:18 -04:00 |
|
Drew DeVault
|
8d4a211419
|
Fix initialization of BeatmapInfo
|
2016-10-24 11:39:18 -04:00 |
|
Drew DeVault
|
3ee0bf2b80
|
Fix cascade insert
|
2016-10-24 11:39:18 -04:00 |
|
Drew DeVault
|
641855c790
|
Fix issues with beatmap import file contention
|
2016-10-24 11:39:18 -04:00 |
|
Drew DeVault
|
c41b3d92c6
|
Fix up wrt upstream development
|
2016-10-24 11:39:18 -04:00 |
|
Drew DeVault
|
674f624bfc
|
Improve song selection layout, database loading
Also adds event that notifes the song select when a beatmap is added.
|
2016-10-24 11:39:11 -04:00 |
|
Drew DeVault
|
a14edc06c8
|
Pull beatmap list from db and render simple list
|
2016-10-24 11:39:11 -04:00 |
|
Dean Herbert
|
c81c4cbbcd
|
Fix missing Metadata initialisation.
|
2016-10-19 12:28:48 +09:00 |
|
Drew DeVault
|
7bdf1fe1bf
|
Drop BeatmapSet, only BeatmapSetInfo is necessary
|
2016-10-18 15:48:24 -04:00 |
|
Drew DeVault
|
768dd38fa0
|
s/AddBeatmap/ImportBeatmap/g
|
2016-10-18 15:42:07 -04:00 |
|
Drew DeVault
|
105bba6178
|
Rework duplicate detection in AddBeatmap
|
2016-10-18 15:41:46 -04:00 |
|
Drew DeVault
|
ad14462369
|
Add lifecycle management to BeatmapDatabase
|
2016-10-18 15:38:59 -04:00 |
|
Drew DeVault
|
449f04c07b
|
Refactor the database code
|
2016-10-18 13:38:27 -04:00 |
|
John Leuenhagen
|
fedfb8a22a
|
Converted all .cs files to use CRLF line endings.
|
2016-10-13 23:33:58 -04:00 |
|
Drew DeVault
|
25d08c8e2c
|
Improve beatmap loading and hydration
|
2016-10-13 10:29:30 -04:00 |
|
Drew DeVault
|
fd10e6e582
|
Copy imported beatmaps into beatmap storage
|
2016-10-13 10:15:08 -04:00 |
|
Drew DeVault
|
880399f5a5
|
Fix casing on private properties
|
2016-10-13 12:17:52 +09:00 |
|
Drew DeVault
|
0267eb7649
|
Fixup
|
2016-10-13 12:17:13 +09:00 |
|
Drew DeVault
|
c9a057b510
|
Update AddBeatmap accordingly
|
2016-10-12 11:32:40 -04:00 |
|
Drew DeVault
|
e9a45de51f
|
Refactor database to reuse existing types
|
2016-10-12 11:32:40 -04:00 |
|
Drew DeVault
|
bc69aa1455
|
Initial support code for beatmap loading
|
2016-10-12 11:32:40 -04:00 |
|
Drew DeVault
|
768c3bc31e
|
Use PlayMode instead of GameMode
|
2016-10-12 11:32:40 -04:00 |
|
Drew DeVault
|
e8de245032
|
Use @strings
|
2016-10-12 11:32:40 -04:00 |
|
Drew DeVault
|
f6b6446a9c
|
MetadataID -> BeatmapMetadataID
|
2016-10-12 11:32:27 -04:00 |
|
Drew DeVault
|
72c4a26aea
|
Move control of databases into osu-framework
|
2016-10-12 11:32:27 -04:00 |
|
Drew DeVault
|
2d810f72fa
|
Add initial DB schema and support code
|
2016-10-12 11:32:07 -04:00 |
|