1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-16 08:37:24 +08:00
Commit Graph

9198 Commits

Author SHA1 Message Date
Thomas Müller
4134f84559 Increase test timeout to 1 minute 2017-07-10 12:54:11 +03:00
Dean Herbert
41d4aee4f5 Update nuget packages
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
John Neijzen
d9a9616125 EOF remove blank spaces 2017-06-08 14:56:03 +08:00
Dean Herbert
0f59645e17 Increase timeout in TestImportOverIPC
Has been failing CI randomly, so let's increase the timeout a bit.
2017-05-31 15:51:52 +09:00
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
Thomas Müller
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01: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
f207da6041
Add/update license headers. 2017-02-14 18:17:35 +09:00
Dean Herbert
11643d2e09
Remove unnecessary methods and local variables. 2017-02-13 18:30:51 +09:00
John Leuenhagen
7ad9cd6b6e
add explicit false values to prevent warnings as errors 2017-02-12 02:32:11 -05:00
柯十六夜
acfbf2e32e Add prefix Online to BeatmapID and BeatmapSetID 2017-01-09 21:05:01 +08:00
Dean Herbert
40ea6e0d72 Fix incorrect folder name. 2016-12-08 21:36:34 +09:00
Dean Herbert
027d71ffd8 Fix unit tests failing. 2016-11-21 12:34:03 +09:00
Dean Herbert
da1f6eeab5 Circle -> HitCircle. 2016-11-16 16:16:45 +09:00
Dean Herbert
d3f810f72f Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading). 2016-11-14 22:03:39 +09:00
Dean Herbert
4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +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
Drew DeVault
19fd6fe249 Introduce dependency injection 2016-11-10 16:38:25 -05:00
Thomas Müller
32ee20b843 Merge branch 'master' of github.com:ppy/osu into better-clocks
# Conflicts:
#	osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
2016-11-06 10:08:24 +01:00
Thomas Müller
a6c0fd29f2 Make use of new timing system in Drawables and Transforms. 2016-11-06 08:25:21 +01:00
Dean Herbert
cc140c9634 Fix broken tests. 2016-11-05 22:48:32 +09:00
Dean Herbert
a11d534067 Add beatmap backgrounds. 2016-11-05 20:00:14 +09:00
Dean Herbert
7a54fdfffb Fix ImportBeatmapTest. 2016-11-03 16:59:16 +09:00
Dean Herbert
f156ac25be Fix nunit hint path. 2016-10-29 04:17:56 +09:00
Dean Herbert
5ce102b36c Fix outdated test attributes. 2016-10-28 16:09:55 +09:00
Drew DeVault
fd867b2eb7 Fix use of obsolete NUnit attribute 2016-10-26 10:37:36 -04:00
Drew DeVault
157512b45f Merge branch 'master' into song-select 2016-10-26 10:37:18 -04:00
Dean Herbert
3f23900347 Framework & OpenTK updates. 2016-10-26 23:13:44 +09:00
Drew DeVault
ddfa457ad3 Fix up sqlite 2016-10-25 19:39:09 -04:00
Drew DeVault
cea660dce5 Fix up JSON reference 2016-10-24 15:02:13 -04:00
Drew DeVault
d559903ebc Fix busted test project 2016-10-24 11:41:14 -04:00
Dean Herbert
d3a857edb9 Make importing work properly.
Moves import code to BeatmapDatabase.
2016-10-24 11:39:53 -04:00
Dean Herbert
6cc5407348 Fix path not being local enough for some unit tests. 2016-10-25 00:27:47 +09:00
Dean Herbert
1ce16afa23 Update nuget package versions. 2016-10-24 22:46:44 +09: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
dd86e75ea7 Minor fixes 2016-10-13 12:19:06 +09:00
Drew DeVault
2f8fbee364 Moved test osz file into osu-resources 2016-10-13 12:18:29 +09:00
Drew DeVault
c39179d299 Add test for hit objects 2016-10-13 12:17:40 +09:00
Drew DeVault
7a4501323b Decode beatmap colours 2016-10-13 12:17:35 +09:00
Drew DeVault
c0022f3515 Add more tests for legacy decoder 2016-10-13 12:17:31 +09:00
Drew DeVault
34b24e1399 Use embedded resources for test assets 2016-10-13 12:17:23 +09:00
Drew DeVault
9b4bc3e36d Implement most of the legacy beatmap decoder
Missing timing points, events, and hit object decoders remain to be
written
2016-10-13 12:17:03 +09:00
Drew DeVault
32ab8f97bb Add more decoding (including full BeatmapMetadata) 2016-10-13 12:16:58 +09:00
Drew DeVault
2a3f047895 Start implementing legacy decoder 2016-10-13 12:16:48 +09:00