1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 11:52:55 +08:00
Commit Graph

3040 Commits

Author SHA1 Message Date
Alex Amadori
8b336156f0 Merge remote-tracking branch 'upstream/master' 2017-02-27 14:55:44 +01:00
Dean Herbert
afdb95f4d5
Fix even more test regressions. 2017-02-27 20:39:04 +09:00
Dean Herbert
a22216d0b0
Update nuget packages. 2017-02-27 20:38:30 +09:00
Dean Herbert
777f673a46
Fix more test regressions. 2017-02-27 19:48:48 +09:00
Dean Herbert
21c6f66017
Fix TestCaseGamefield. 2017-02-27 18:30:10 +09:00
Dean Herbert
4a4f1f4d82
Actually delete all related database entries, not just the set. 2017-02-27 18:27:38 +09:00
Dean Herbert
4da09713a9
Fix test case regression. 2017-02-27 18:09:27 +09:00
Dean Herbert
68dd3c02aa
Fix failing testcase (nullref). 2017-02-27 17:05:12 +09:00
Dean Herbert
7c602a2af3
Update framework. 2017-02-27 15:55:57 +09:00
smoogipooo
25a1c7a8ad Initial groups implementation. 2017-02-27 14:19:07 +09:00
DrabWeb
d78dca3d85 New design 2017-02-26 23:35:13 -04:00
Dean Herbert
47997c20ad
Weld -> BindWith. 2017-02-27 12:24:53 +09:00
default0
0d1dec665a Set StarDifficulty to -1 for invalid beatmaps
The StarDifficulty calculation in a BeatmapGroup would not properly deal
with Beatmaps that cannot be loaded and thus cause a
NullReferenceException when trying to work with them, instead of
assigning a StarDifficulty of -1 to signify that the map is invalid.
2017-02-26 21:57:19 +01:00
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
default0
1b92519a86 Update usages of AddToggle in Tests 2017-02-26 21:31:40 +01:00
Dean Herbert
bc231c6bd4
Remove dispose which is no longer necessary. 2017-02-26 22:08:29 +09:00
Dean Herbert
c227eb1be5
Welded bindables. 2017-02-26 22:08:21 +09:00
Dean Herbert
c5ad79e3e2
Remove unnecessary schedule. 2017-02-26 21:15:33 +09:00
Dean Herbert
0c2089ddd7 Merge pull request #401 from peppy/host-is-not-a-container
Update with framework structural changes.
2017-02-26 21:02:41 +09:00
Dean Herbert
686372a7f9
Update with framework structural changes. 2017-02-26 20:54:32 +09:00
Thomas Müller
0014208782 Merge pull request #400 from peppy/add-debug-options
Add basic GC options.
2017-02-26 12:34:52 +01:00
Thomas Müller
9b3b6a8ded
Update framework 2017-02-26 18:28:09 +09:00
Dean Herbert
9f5518312d
Add missing file. 2017-02-26 18:28:01 +09:00
Dean Herbert
79993a576f
Add basic GC options. 2017-02-26 18:06:59 +09:00
Dean Herbert
e6e8bfc63a Merge pull request #399 from Tom94/better-container
Update framework
2017-02-26 11:38:57 +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
DrabWeb
a009268370 Merge https://github.com/ppy/osu into popup-dialog 2017-02-25 21:22:47 -04:00
Thomas Müller
6f7f69e4ea Merge pull request #396 from peppy/async-imports
Make beatmap importing async.
2017-02-25 13:19:21 +01:00
Dean Herbert
f6eb970f69 Merge branch 'master' into async-imports 2017-02-25 18:42:02 +09:00
Thomas Müller
6a2d1f92e5 Merge pull request #398 from peppy/fix-memory-leak
Fix memory leak from Player's InputManager.
2017-02-25 09:08:23 +01: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
17a28cd3b6 Don't push Player if we aren't still current. 2017-02-25 11:46:19 +09:00
Dean Herbert
fdf5867a1a Add more informative asserts in unit tests. 2017-02-25 11:46:04 +09:00
Dean Herbert
7483b69477 Remove unnecessary Dispose logic. 2017-02-25 10:44:19 +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
DrabWeb
bd6ca99246 Even faster 2017-02-24 16:48:30 -04:00
DrabWeb
42b26a4c2f Speedup triangles 2017-02-24 16:41:10 -04:00
Thomas Müller
4aecd59c74 Merge branch 'master' into fix-memory-leak 2017-02-24 19:54:14 +01:00
Thomas Müller
04900c1c49 Merge branch 'master' into async-imports 2017-02-24 19:48:06 +01:00
Thomas Müller
6e39b7e2e2 Merge pull request #397 from peppy/better-star-counter
Visual and readability improvements to StarCounter.
2017-02-24 19:47:52 +01:00
Thomas Müller
d150eb4450 Merge branch 'master' into better-star-counter 2017-02-24 19:37:04 +01:00
Thomas Müller
5dbb9776f0 Merge pull request #394 from peppy/beatmap-deletion
Add support for undeleting beatmaps.
2017-02-24 19:36:49 +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
Thomas Müller
edbd27210b Update framework. 2017-02-24 19:27:06 +01:00
Thomas Müller
ff64e4ab0b Merge branch 'master' into beatmap-deletion 2017-02-24 18:58:06 +01:00
Thomas Müller
ed90c9d3e2 Merge pull request #395 from peppy/general-fixes
Fix incorrect slider logic (wrong variable name).
2017-02-24 18:57:45 +01:00
Alex Amadori
ace023f0c7 Refactor local vars named in a c-like fashion 2017-02-24 17:08:18 +01:00
Alex Amadori
90b0f035ad Compute average of star ratings 2017-02-24 17:01:14 +01:00