DrabWeb
|
b856fb5991
|
Implemented beatmap options overlay
|
2017-03-02 08:40:55 -04:00 |
|
Dean Herbert
|
e399d6c6d1
|
Use bindable for PlayMode.
|
2017-03-02 21:16:58 +09:00 |
|
Dean Herbert
|
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 |
|
Dean Herbert
|
51950eef43
|
Merge branch 'master' into master
|
2017-03-02 18:06:31 +09:00 |
|
DrabWeb
|
6c680825ed
|
ModSections in Ruleset, fixed toolbar play mode changed not firing
|
2017-03-01 22:05:52 -04:00 |
|
DrabWeb
|
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 |
|
DrabWeb
|
d5d8352b62
|
Testing build
|
2017-02-28 17:09:31 -04:00 |
|
DrabWeb
|
570c95cb98
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-02-28 02:22:59 -04:00 |
|
DrabWeb
|
ce1798b8bc
|
DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
|
2017-02-28 02:09:36 -04:00 |
|
DrabWeb
|
50d172be39
|
Added DialogManager(not wired up for desktop project yet)
|
2017-02-28 00:59:36 -04:00 |
|
DrabWeb
|
fbd9523596
|
Added beatmap delete dialog
|
2017-02-27 23:19:28 -04:00 |
|
Alex Amadori
|
8b336156f0
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-27 14:55:44 +01:00 |
|
Thomas Müller
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09: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
|
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
|
ea4639932c
|
Simplify event names.
|
2017-02-24 17:21:14 +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
|
c5552dfb27
|
Merge remote-tracking branch 'upstream/master' into remove-usings
|
2017-02-24 11:29:34 +09: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 |
|
Dean Herbert
|
6701cd9016
|
Merge branch 'master' into general-fixes
|
2017-02-23 17:04:53 +09:00 |
|
Dean Herbert
|
da2bfe6d3c
|
Framework updates.
|
2017-02-23 16:42:12 +09:00 |
|
DrabWeb
|
99f1f88c75
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-02-22 12:35:55 -04:00 |
|
Dean Herbert
|
aef0eb49a1
|
Add loading screen.
|
2017-02-22 21:53:59 +09:00 |
|
Alex Amadori
|
6c161fb167
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-21 18:15:46 +01:00 |
|
Thomas Müller
|
417f146386
|
Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
|
2017-02-19 17:41:51 +01:00 |
|
Alex Amadori
|
21cf96ec10
|
More sorting rookie mistakes
|
2017-02-18 16:23:13 +01:00 |
|
Alex Amadori
|
d92382c1aa
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-18 15:18:26 +01:00 |
|
Alex Amadori
|
6bbbbd8f96
|
Implemented sorting in TestCasePlaySong
|
2017-02-18 15:11:40 +01:00 |
|
DrabWeb
|
006fb5502d
|
ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select
|
2017-02-18 07:28:22 -04:00 |
|
Dean Herbert
|
32ce8cf723
|
Audio class renames in line with framework changes.
|
2017-02-18 17:35:04 +09:00 |
|
Alex Amadori
|
7dcbefd50f
|
Implemented basic sorting logic
|
2017-02-17 17:41:53 +01:00 |
|
Dean Herbert
|
e6ef9f67aa
|
GameMode -> Screen.
|
2017-02-17 19:23:58 +09:00 |
|
DrabWeb
|
9fc3726925
|
ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly
|
2017-02-16 18:32:27 -04:00 |
|
DrabWeb
|
0a58fc62db
|
Added mod selection overlay
|
2017-02-16 16:05:03 -04:00 |
|
Dean Herbert
|
d230c3f9ac
|
Correct masking layers on song select.
|
2017-02-08 20:39:17 +09:00 |
|
Dean Herbert
|
050fa7fbe8
|
Adjust FilterControl to match design and give an absolute height.
|
2017-02-08 20:30:45 +09:00 |
|
Dean Herbert
|
2e119cd74f
|
Handle toolbar offsets better.
|
2017-02-08 20:30:45 +09:00 |
|
Dean Herbert
|
6b011a50d2
|
Naming standardisation and enforcing.
|
2017-02-07 16:20:36 +09:00 |
|
Dean Herbert
|
50bd80cb0c
|
Update and standardise license headers.
|
2017-02-07 14:27:41 +09:00 |
|
Drew DeVault
|
437cc834eb
|
@Tom94 pointed out this problem
|
2017-02-02 12:23:06 -05:00 |
|
Dean Herbert
|
aec84ae725
|
Fix laggy animations, incorrect hiding logic.
|
2017-02-02 19:24:14 +09:00 |
|
Drew DeVault
|
2d691ca8d5
|
Use OnChange instead of OnCommit
OnCommit only gets fired when focus is lost
|
2017-02-01 19:12:24 -05:00 |
|
Drew DeVault
|
b1a55f6b5e
|
Use OnCommit instead of OnChange simplifies things
|
2017-01-31 19:48:33 -05:00 |
|
Drew DeVault
|
f740707712
|
Initialize previousFilter to string.Empty
|
2017-01-31 19:45:42 -05:00 |
|
Drew DeVault
|
35a1479fc1
|
Fix extra click sound effect
|
2017-01-31 19:37:00 -05:00 |
|