|
|
b856fb5991
|
Implemented beatmap options overlay
|
2017-03-02 08:40:55 -04:00 |
|
|
|
51950eef43
|
Merge branch 'master' into master
|
2017-03-02 18:06:31 +09:00 |
|
|
|
ff5f0af2d3
|
Merge branch 'master' into popup-dialog
|
2017-03-02 16:42:20 +09:00 |
|
|
|
c4ca18eeba
|
Remove references to PassThrough.
|
2017-03-02 16:28:51 +09:00 |
|
|
|
befdf68abe
|
Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once
|
2017-03-01 18:41:00 -04:00 |
|
|
|
4d28696479
|
FlowDirection -> FillDirection
|
2017-03-01 20:15:38 +01:00 |
|
|
|
9c853b0465
|
Update framewörk
|
2017-03-01 19:33:01 +01:00 |
|
|
|
d46e68b36b
|
Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
|
2017-03-01 18:05:58 +01:00 |
|
|
|
d5d8352b62
|
Testing build
|
2017-02-28 17:09:31 -04:00 |
|
|
|
61cbcfd597
|
Merge branch 'master' into pluginManager
|
2017-02-28 20:34:56 +01:00 |
|
|
|
522034020e
|
Moved Bindable init
|
2017-02-28 11:44:12 +01:00 |
|
|
|
ce1798b8bc
|
DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
|
2017-02-28 02:09:36 -04:00 |
|
|
|
50d172be39
|
Added DialogManager(not wired up for desktop project yet)
|
2017-02-28 00:59:36 -04:00 |
|
|
|
e60cead483
|
Merge remote-tracking branch 'upstream/master' into warning_fixes
|
2017-02-28 13:49:19 +09:00 |
|
|
|
fbd9523596
|
Added beatmap delete dialog
|
2017-02-27 23:19:28 -04:00 |
|
|
|
8b3477820f
|
Disable mousewheel while playing
|
2017-02-28 00:08:34 +01:00 |
|
|
|
03889e6ca6
|
Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
|
2017-02-27 16:55:55 +01:00 |
|
|
|
3487dfe236
|
Removed unused variables and parameters
|
2017-02-27 17:32:32 +03:00 |
|
|
|
e8b027130f
|
Remove unused variable.
|
2017-02-27 23:17:21 +09:00 |
|
|
|
8b336156f0
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-27 14:55:44 +01:00 |
|
|
|
afdb95f4d5
|
Fix even more test regressions.
|
2017-02-27 20:39:04 +09:00 |
|
|
|
4da09713a9
|
Fix test case regression.
|
2017-02-27 18:09:27 +09:00 |
|
|
|
68dd3c02aa
|
Fix failing testcase (nullref).
|
2017-02-27 17:05:12 +09:00 |
|
|
|
7c602a2af3
|
Update framework.
|
2017-02-27 15:55:57 +09:00 |
|
|
|
47997c20ad
|
Weld -> BindWith.
|
2017-02-27 12:24:53 +09:00 |
|
|
|
8d91519d59
|
Update usage of FlowContainer and its subclasses
|
2017-02-26 21:32:43 +01:00 |
|
|
|
bc231c6bd4
|
Remove dispose which is no longer necessary.
|
2017-02-26 22:08:29 +09:00 |
|
|
|
c227eb1be5
|
Welded bindables.
|
2017-02-26 22:08:21 +09:00 |
|
|
|
c5ad79e3e2
|
Remove unnecessary schedule.
|
2017-02-26 21:15:33 +09:00 |
|
|
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09:00 |
|
|
|
17a28cd3b6
|
Don't push Player if we aren't still current.
|
2017-02-25 11:46:19 +09:00 |
|
|
|
7483b69477
|
Remove unnecessary Dispose logic.
|
2017-02-25 10:44:19 +09:00 |
|
|
|
4aecd59c74
|
Merge branch 'master' into fix-memory-leak
|
2017-02-24 19:54:14 +01:00 |
|
|
|
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 |
|
|
|
ace023f0c7
|
Refactor local vars named in a c-like fashion
|
2017-02-24 17:08:18 +01:00 |
|
|
|
90b0f035ad
|
Compute average of star ratings
|
2017-02-24 17:01:14 +01:00 |
|
|
|
51b6075210
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-24 16:54:37 +01:00 |
|
|
|
e2ae03e798
|
Merge with upstream/master
|
2017-02-24 16:54:27 +01:00 |
|
|
|
c4fbfb5a8f
|
Update comment with new knowledge.
|
2017-02-24 21:46:34 +09:00 |
|
|
|
5096f6b83d
|
Fix memory leak from Player's InputManager.
|
2017-02-24 21:01:05 +09:00 |
|
|
|
ea4639932c
|
Simplify event names.
|
2017-02-24 17:21:14 +09:00 |
|
|
|
d24403e58e
|
Remove unused using statement.
|
2017-02-24 17:20:00 +09:00 |
|
|
|
958bf54c31
|
Add safe deletion support.
|
2017-02-24 17:08:13 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
355bbb6324
|
SearchTextBox should not handle shift-delete.
|
2017-02-24 11:44:40 +09:00 |
|
|
|
c5552dfb27
|
Merge remote-tracking branch 'upstream/master' into remove-usings
|
2017-02-24 11:29:34 +09:00 |
|
|
|
0264c44a20
|
Do not shadow Colour in TwoLayerButton
Renames Colour to BackgroundColour instead.
|
2017-02-23 22:33:37 +01:00 |
|
|
|
37bc75a7b6
|
Remove unused variables
|
2017-02-23 22:32:49 +01:00 |
|
|
|
2689de0c0c
|
Update framework and add "Async" suffix to asynchronous methods
|
2017-02-23 22:32:10 +01:00 |
|
