RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,584 Commits 3 Branches 651 Tags 358 MiB
Commit Graph

112 Commits

Author SHA1 Message Date
smoogipooo 9a4af8f194 GetScore -> CreateScore. 2017-03-17 02:03:12 +09:00
smoogipooo e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
smoogipooo 28e006eeb9 Move MapDifficultyRange into BaseDifficulty. 2017-03-16 23:17:27 +09:00
Dean Herbert 271dddc9a7 Merge branch 'master' into generic_scoreprocessor 2017-03-16 23:04:19 +09:00
Dean Herbert 4d84bf7350
Change difficulty sort to be based on MaxStarDifficulty. 2017-03-16 13:59:23 +09:00
smoogipooo 5cafec3b6a Add back CreateScoreProcessor to Ruleset to instantiate a non-generic ScoreProcessor for ScoreDatabase. 2017-03-16 13:13:45 +09:00
smoogipooo 82033faaab Warning/error fixing. 2017-03-16 12:57:50 +09:00
smoogipooo c82ae011fb Make ScoreProcessors take generic judgements. 2017-03-16 12:45:23 +09:00
Dean Herbert ba10c3a8db
Revert "Merge pull request #441 from tacchinotacchi/archive-reader" 
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
 2017-03-14 11:46:34 +09:00
Alex Amadori c84a9d56f5 Fix namespace, comply with naming rules 2017-03-13 11:36:21 +01:00
Alex Amadori caa6e9c82b General improvements 2017-03-13 11:29:24 +01:00
Alex Amadori 971d8eb7c5 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-13 10:56:31 +01:00
smoogipooo 3480dca0ad Remove PlayMode enum requirement. Clean things up a lot. 2017-03-12 14:32:50 +09:00
Alex Amadori c60353faf7 Merge branch 'archive-reader' of https://github.com/tacchinotacchi/osu into archive-reader 2017-03-09 17:07:37 +01:00
Alex Amadori 7374839923 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-09 17:07:00 +01:00
Dean Herbert d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert 0976e205d8
Remove redundant parentheses. 2017-03-09 14:00:17 +09:00
Alex Amadori 9f40a888ec Update BeatmapArchiveReader's test 2017-03-08 21:55:38 +01:00
Alex Amadori 309019aab3 Merge remote tracking branch 'upstream/master' into archive-reader 2017-03-07 08:41:44 +01:00
Dean Herbert 5cbcf7a20a
Fix error-level inspections. 2017-03-07 14:31:54 +09:00
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