|
|
73fef85b12
|
Remove unnecessary usings
|
2017-03-04 19:43:59 +01:00 |
|
|
|
a14bdf8624
|
Use Color4Extensions from Framework and remove redundant Name
|
2017-03-04 19:42:37 +01:00 |
|
|
|
6f3b59268a
|
Merge pull request #385 from DrabWeb/mod-overlay
Mod select
|
2017-03-03 21:09:08 +09:00 |
|
|
|
dc6a728cce
|
Merge branch 'master' into tournament_drawings
|
2017-03-03 20:48:07 +09:00 |
|
|
|
bc01935a89
|
Move around some namespaces.
|
2017-03-03 20:42:22 +09:00 |
|
|
|
4a109fcc55
|
Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided.
|
2017-03-03 20:21:11 +09:00 |
|
|
|
9789d1e602
|
Add missing acronyms in TestCaseDrawings.
|
2017-03-03 20:07:36 +09:00 |
|
|
|
5a4d07d770
|
Better way to initialize team lists.
|
2017-03-03 18:47:56 +09:00 |
|
|
|
fde509ab1d
|
Merge branch 'master' into mod-overlay
|
2017-03-03 04:12:42 -04:00 |
|
|
|
7cac2680b1
|
Make test case add test drawings file.
|
2017-03-03 16:33:40 +09:00 |
|
|
|
b0ee728528
|
Remove full-screen background layer and add half-height holder.
Doesn't interact well with dialog popups. May add back later with complementing logic.
|
2017-03-03 16:11:23 +09:00 |
|
|
|
1891bdf51e
|
Merge branch 'master' into mod-overlay
|
2017-03-03 01:11:15 -04:00 |
|
|
|
2e74b4be60
|
Merge branch 'master' into beatmap-options
|
2017-03-03 00:52:45 -04:00 |
|
|
|
09a2d39e3e
|
Merge branch 'master' into tournament_drawings
|
2017-03-03 13:06:18 +09:00 |
|
|
|
b4091eff30
|
Fixed visual test
|
2017-03-02 21:24:34 -04:00 |
|
|
|
3a8246f56d
|
Move PauseOverlay to correct namespace.
|
2017-03-03 10:17:39 +09:00 |
|
|
|
b856fb5991
|
Implemented beatmap options overlay
|
2017-03-02 08:40:55 -04:00 |
|
|
|
e399d6c6d1
|
Use bindable for PlayMode.
|
2017-03-02 21:16:58 +09:00 |
|
|
|
471b9daa93
|
Merge branch 'master' into mod-overlay
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/osu.Game.csproj
|
2017-03-02 20:27:04 +09: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 |
|
|
|
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 |
|
|
|
35d246b59d
|
Merge remote-tracking branch 'origin/master' into tournament_drawings
|
2017-03-01 19:32:33 +09:00 |
|
|
|
d5d8352b62
|
Testing build
|
2017-02-28 17:09:31 -04:00 |
|
|
|
570c95cb98
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-02-28 02:22:59 -04: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 |
|
|
|
b3a231185b
|
Conform to naming conventions
|
2017-02-27 20:55:10 -04:00 |
|
|
|
3094c01a40
|
Merge https://github.com/ppy/osu into popup-dialog
|
2017-02-27 16:40:04 -04:00 |
|
|
|
3487dfe236
|
Removed unused variables and parameters
|
2017-02-27 17:32:32 +03:00 |
|
|
|
8b336156f0
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-27 14:55:44 +01:00 |
|
|
|
a22216d0b0
|
Update nuget packages.
|
2017-02-27 20:38:30 +09:00 |
|
|
|
21c6f66017
|
Fix TestCaseGamefield.
|
2017-02-27 18:30:10 +09:00 |
|
|
|
25a1c7a8ad
|
Initial groups implementation.
|
2017-02-27 14:19:07 +09:00 |
|
|
|
d78dca3d85
|
New design
|
2017-02-26 23:35:13 -04:00 |
|
|
|
1b92519a86
|
Update usages of AddToggle in Tests
|
2017-02-26 21:31:40 +01:00 |
|
|
|
686372a7f9
|
Update with framework structural changes.
|
2017-02-26 20:54:32 +09:00 |
|
|
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09:00 |
|
|
|
a009268370
|
Merge https://github.com/ppy/osu into popup-dialog
|
2017-02-25 21:22:47 -04: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 |
|
|
|
12db33ad4b
|
Visual and readability improvements to StarCounter.
|
2017-02-24 19:30:56 +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 |
|
|
|
c94da4fcf0
|
Added popup dialog
|
2017-02-24 00:05:37 -04:00 |
|
|
|
c5552dfb27
|
Merge remote-tracking branch 'upstream/master' into remove-usings
|
2017-02-24 11:29:34 +09:00 |
|
|
|
2689de0c0c
|
Update framework and add "Async" suffix to asynchronous methods
|
2017-02-23 22:32:10 +01:00 |
|
|
|
a5dfa7ab06
|
Remove unnecessary using statements
|
2017-02-23 21:38:10 +01:00 |
|
|
|
b4b88712ad
|
Merge branch 'master' into mod-overlay
|
2017-02-23 08:00:24 -04:00 |
|
