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

94 Commits

Author SHA1 Message Date
Dean Herbert a2f6d8a3e6 Fix broken test cases, remove some recursive lookup methods. 2017-05-11 19:38:28 +09:00
Huo Yaoyuan f37c857af8 CI fixes. 2017-05-06 16:06:38 +08:00
Huo Yaoyuan 767cfaaac3 Access database recursively. 2017-05-06 15:37:53 +08:00
Dean Herbert d06b3c898f Update framework with new DI changes. 2017-05-02 15:32:47 +09:00
Dean Herbert fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
smoogipooo 1be1683a4f Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion 2017-04-18 09:58:39 +09:00
Dean Herbert 4393c2cb25
Add unit tests to ensure all rulesets' beatmaps are added successfully. 2017-04-18 09:46:14 +09:00
smoogipooo 786446354e Fix post-rebase errors. 2017-04-18 09:00:53 +09:00
smoogipooo 09208adf81 Re-implement legacy hit object conversion. 2017-04-18 08:58:21 +09:00
Dean Herbert 4b6ba565f8
Fix forgotten revert. 2017-04-17 20:10:51 +09:00
Dean Herbert af13f97435
Fix regressions and test cases. 2017-04-17 19:44:03 +09:00
Dean Herbert a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
Dean Herbert ce12cc20bd
Merge remote-tracking branch 'upstream/master' into remove-playmode 2017-04-17 13:00:53 +09:00
Adrian Kaz Scherzinger 60f7879875 Explicitly set C# 6.0 for now. 2017-04-16 06:44:08 +09:00
smoogipooo 0a1376c2db Remove PlayMode game-wide. 2017-04-15 05:22:41 +09:00
smoogipooo a89af273be Make BeatmapInfo expose Ruleset instead of PlayMode. 2017-04-15 05:01:36 +09:00
smoogipooo 59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
Dean Herbert c0338a82e7
Update nuget packages. 
Includes fix in OpenTK for focus issues.
 2017-04-12 19:35:16 +09:00
Huo Yaoyuan 411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
smoogipooo 4cc309e5a7 Make hit sounds into consts. 2017-04-06 12:14:06 +09:00
smoogipooo 2a16eafe8f Fix assertions. 2017-04-06 11:54:05 +09:00
smoogipooo eb82a4c090 Back to using SampleInfo + fix taiko beatmap conversion. 2017-04-06 11:41:16 +09:00
smoogipooo d607207b69 Ability to contain multiple sample banks. Get default bank name from control point. 2017-04-05 21:59:07 +09:00
smoogipooo 2d8239a3f7 Re-implement the SampleBank/Sample structure. No parsing support yet. 2017-04-05 21:34:28 +09:00
smoogipooo 4b424263ce Fully parse control points. 2017-04-04 13:13:27 +09:00
smoogipooo 15db37d9e0 Cleanup. 2017-04-03 20:27:25 +09:00
smoogipooo 19b5555ef2 Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo. 2017-04-03 20:26:46 +09:00
Dean Herbert a61cb078e3
Increase timeout on IPC wait. 2017-03-23 17:32:57 +09:00
smoogipooo e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
smoogipooo 1f43370886 Fix failing unit test, move legacy hitobjects to Objects/Legacy/. 2017-03-14 18:06:32 +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
Huo Yaoyuan db104d04d3 Use AutoGenerateBindingRedirects instead of explicit app.config. 2017-03-14 03:20:33 +08: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 f969c3b7b3 Fix test 2017-03-09 21:00:13 +01:00
Dean Herbert 30de7aa59c
Remove duplicate reference to nunit. 2017-03-09 16:15:33 +09:00
Dean Herbert 5a42035f88
Update license headers. 2017-03-08 15:50:52 +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 1751532a01
Fix a few regressions. 2017-03-07 13:30:36 +09:00
Dean Herbert 0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dean Herbert aa9d85624d
Change IPC to make sense. 2017-03-04 18:51:16 +09:00
Mikal Stodal 866dbf0b1d Added new test 
When file is in use, we expect it to presist removal, in other words, fail to delete.
 2017-03-02 15:24:12 +01:00
Mikal Stodal 7e72911d3a Update tests 2017-02-28 14:36:11 +01:00
Dean Herbert a22216d0b0
Update nuget packages. 2017-02-27 20:38:30 +09:00
Dean Herbert 686372a7f9
Update with framework structural changes. 2017-02-26 20:54:32 +09:00
Thomas Müller 6a67ffa5b3 Attempt to fix failing beatmap import test case 2017-02-25 08:31:29 +01:00
Dean Herbert 9067907789 Better assertions. 2017-02-25 11:55:30 +09:00
Dean Herbert fdf5867a1a Add more informative asserts in unit tests. 2017-02-25 11:46:04 +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
Dean Herbert c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00