1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 06:47:25 +08:00
Commit Graph

1451 Commits

Author SHA1 Message Date
Andrey Zavadskiy
3487dfe236 Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
Dean Herbert
e8b027130f
Remove unused variable. 2017-02-27 23:17:21 +09:00
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
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
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
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
686372a7f9
Update with framework structural changes. 2017-02-26 20:54:32 +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
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
Dean Herbert
f6eb970f69 Merge branch 'master' into async-imports 2017-02-25 18:42:02 +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
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
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
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
Alex Amadori
51b6075210 Merge remote-tracking branch 'upstream/master' 2017-02-24 16:54:37 +01:00
Alex Amadori
e2ae03e798 Merge with upstream/master 2017-02-24 16:54:27 +01:00
Dean Herbert
c4fbfb5a8f
Update comment with new knowledge. 2017-02-24 21:46:34 +09:00
Dean Herbert
5096f6b83d
Fix memory leak from Player's InputManager. 2017-02-24 21:01:05 +09:00
Dean Herbert
12db33ad4b
Visual and readability improvements to StarCounter. 2017-02-24 19:30:56 +09: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
5ff4028c29
Make beatmap importing async. 2017-02-24 18:12:50 +09:00
Dean Herbert
ea4639932c
Simplify event names. 2017-02-24 17:21:14 +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
DrabWeb
c94da4fcf0 Added popup dialog 2017-02-24 00:05:37 -04:00
Dean Herbert
355bbb6324
SearchTextBox should not handle shift-delete. 2017-02-24 11:44:40 +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
0264c44a20 Do not shadow Colour in TwoLayerButton
Renames Colour to BackgroundColour instead.
2017-02-23 22:33:37 +01:00
Thomas Müller
9e8fb698c6 Remove incorrectly shadowed variable 2017-02-23 22:33:07 +01:00
Thomas Müller
37bc75a7b6 Remove unused variables 2017-02-23 22:32:49 +01: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
Seth
b4b88712ad Merge branch 'master' into mod-overlay 2017-02-23 08:00:24 -04:00
DrabWeb
64b0f85b89 Documented Mod class 2017-02-23 07:59:27 -04:00
DrabWeb
a67bfacb19 Made requested changes 2017-02-23 07:57:58 -04:00
DrabWeb
e1c4abd8c5 Cleaned ModSelectOverlay 2017-02-23 07:36:31 -04:00
Kelvin
fd622286fe Enable Tabbing in LoginOptions 2017-02-23 00:50:09 -08:00
Dean Herbert
f1538791c3
Correctly hook up window mode dropdown. 2017-02-23 17:35:14 +09:00
Dean Herbert
6701cd9016 Merge branch 'master' into general-fixes 2017-02-23 17:04:53 +09:00
Dean Herbert
f812641696 Merge pull request #383 from peppy/player-loading-screen
Add loading screen.
2017-02-23 17:04:44 +09:00
Dean Herbert
da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Dean Herbert
c683cdbb1d
Derive from FocusedOverlayContainer and remove custom focus logic. 2017-02-23 12:51:32 +09:00
Dean Herbert
cee1c14557
Clean-up code. 2017-02-23 12:48:24 +09:00
Dean Herbert
8d1498a8db
Fix initial state and shorten disappear animation. 2017-02-23 12:47:20 +09:00
Dean Herbert
b33627a750
Make transitions better. 2017-02-23 12:42:31 +09:00
Dean Herbert
8787b0dc90
Remove a lot of constants (use object initialisers instead). 2017-02-23 12:17:59 +09:00
Dean Herbert
521a9b7728
Remove need for waves array; use generic container. 2017-02-23 11:26:50 +09:00
Dean Herbert
d154cf7938
Abstract wave logic to class. 2017-02-23 11:22:01 +09:00
Dean Herbert
9f367bcc0e
Fix line endings. 2017-02-23 11:16:23 +09:00
Dean Herbert
9746877903
Merge remote-tracking branch 'upstream/master' into mod-overlay 2017-02-23 11:11:52 +09:00
Dean Herbert
7e7bf07d03
Remove unused whitebox. 2017-02-23 11:11:46 +09:00
DrabWeb
79ff96de0d Typo 2017-02-22 16:38:36 -04:00
DrabWeb
a58a0a4edf Fix transition stutter 2017-02-22 16:37:58 -04:00
DrabWeb
cf5258ceb0 Thanks refactoring 2017-02-22 13:17:06 -04:00
DrabWeb
bf1d13e734 Comply to formatting style 2017-02-22 13:12:39 -04:00
DrabWeb
8cd7ebcb43 readonly -> const 2017-02-22 13:03:19 -04:00
DrabWeb
416772e96f Update to work with latest framework 2017-02-22 12:46:38 -04:00
DrabWeb
99f1f88c75 Merge https://github.com/ppy/osu into mod-overlay 2017-02-22 12:35:55 -04:00
DrabWeb
bac0431102 Fixed build failing 2017-02-22 12:28:34 -04:00
DrabWeb
cc956bc8ec Newline 2017-02-22 12:23:46 -04:00
DrabWeb
584a514267 Cleanup part 2 2017-02-22 12:22:29 -04:00
DrabWeb
4821f323b8 Cleanup 2017-02-22 12:12:41 -04:00
DrabWeb
337a1004d3 Made mod disabling better 2017-02-22 11:34:22 -04:00
Dean Herbert
d19a7813f3 Fix TestCasePlayer regression. 2017-02-22 23:27:29 +09:00
Dean Herbert
c83d2bbe6e
Make panels fade in again. 2017-02-22 21:54:49 +09:00
Dean Herbert
aef0eb49a1
Add loading screen. 2017-02-22 21:53:59 +09:00
Dean Herbert
7cda82d016
Space to skip. 2017-02-22 21:28:40 +09:00
Thomas Müller
0d3cc39cbc Merge branch 'master' into general-fixes 2017-02-22 08:01:34 +01:00
Thomas Müller
44bedb5407 Merge branch 'master' into chat-improvement 2017-02-22 07:36:42 +01:00
Dean Herbert
2d2660c1c5
Improve transition when retrying a beatmap. 2017-02-22 14:14:37 +09:00
Dean Herbert
d00ea4564f
Fix API coming online too early in race scenarios. 2017-02-22 14:09:48 +09:00
Dean Herbert
190bed8939
Add top padding. 2017-02-22 13:38:22 +09:00
Dean Herbert
b7a9fd85ea
Assert single channel support for now. 2017-02-22 13:38:10 +09:00
Alex Amadori
3d19199218 Fixed for star difficulty 2017-02-21 18:27:39 +01:00
Alex Amadori
6c161fb167 Merge remote-tracking branch 'upstream/master' 2017-02-21 18:15:46 +01:00
Dean Herbert
afba4fbfad
Merge remote-tracking branch 'upstream/master' into chat-improvement 2017-02-21 15:46:28 +09:00
Dean Herbert
5f29b0dc4f
Update in line with framework changes. 2017-02-21 15:46:04 +09:00