1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 13:22:55 +08:00
Commit Graph

1895 Commits

Author SHA1 Message Date
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
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
Dean Herbert
12db33ad4b
Visual and readability improvements to StarCounter. 2017-02-24 19:30:56 +09:00
Dean Herbert
564608fe52
Fix incorrect slider assert logic (and improve flow). 2017-02-24 18:31:05 +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
65a24dfe5d Merge pull request #393 from peppy/beatmap-deletion
Add beatmap deletion support.
2017-02-24 17:26:27 +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
3b312c5710
Update framework. 2017-02-24 17:08:23 +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
Dean Herbert
355bbb6324
SearchTextBox should not handle shift-delete. 2017-02-24 11:44:40 +09:00
Dean Herbert
60d9e9f02e Merge pull request #391 from Tom94/remove-usings
Remove unnecessary using statements
2017-02-24 11:38:16 +09:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Dean Herbert
a8135332d6 Merge pull request #392 from Tom94/refactor
Fix warnings; add "Async" suffix
2017-02-24 11:28:21 +09:00
Dean Herbert
3f49518322
Update framework. 2017-02-24 11:21:20 +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
Dean Herbert
c3ab467e24 Merge pull request #387 from 2yangk23/master
Enable Tabbing in LoginOptions
2017-02-23 18:08:58 +09:00
Kelvin
fd622286fe Enable Tabbing in LoginOptions 2017-02-23 00:50:09 -08:00
Dean Herbert
5076ff7684 Merge pull request #386 from peppy/general-fixes
Framework updates.
2017-02-23 17:40:25 +09:00
Dean Herbert
f1538791c3
Correctly hook up window mode dropdown. 2017-02-23 17:35:14 +09:00
Dean Herbert
9bba4b66ba
Update framework. 2017-02-23 17:20:28 +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
011d2cc7cc
oops 2017-02-23 16:44:59 +09:00
Dean Herbert
da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Thomas Müller
bcb5b86392 Merge pull request #382 from peppy/general-fixes
General fixes
2017-02-22 19:21:40 +01:00
Thomas Müller
ac0b2b5aa5 Merge branch 'master' into general-fixes 2017-02-22 19:12:02 +01:00
Dean Herbert
74ea5e7343 Fix updates downloading in non-deploy builds. 2017-02-23 00:41:04 +09: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
Dean Herbert
735961977b
Improve feel of spinners. 2017-02-22 18:23:06 +09:00
Dean Herbert
202976c0c3 Merge pull request #381 from peppy/general-fixes
General fixes.
2017-02-22 16:20:20 +09:00
Thomas Müller
0d3cc39cbc Merge branch 'master' into general-fixes 2017-02-22 08:01:34 +01:00
Thomas Müller
0096b8c535 Merge pull request #379 from peppy/chat-improvement
Basic ChatOverlay design implementation
2017-02-22 07:54:43 +01:00