|
|
2bd89e922f
|
Removed unneeded newPlayer
|
2017-04-17 23:48:21 -07:00 |
|
|
|
c0f4cbcba6
|
Added back PlayerLoader overlays
|
2017-04-17 23:36:11 -07:00 |
|
|
|
727086c0b2
|
Updates in-line with framework.
|
2017-04-18 15:34:53 +09:00 |
|
|
|
be8d32688b
|
Fixed HotkeyRetryOverlay just going to a black screen
|
2017-04-17 22:36:03 -07:00 |
|
|
|
5c48fa6cb1
|
Removed testing line
|
2017-04-17 21:35:48 -07:00 |
|
|
|
aa466d0e84
|
PlayerLoader creates a new instance of the Player class on Restart
|
2017-04-17 21:32:38 -07:00 |
|
|
|
4a60e9299e
|
Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion
|
2017-04-18 10:59:43 +09:00 |
|
|
|
8ef675d9b3
|
Add fallback to allow FilterCriteria to run without a ruleset being set.
|
2017-04-18 10:55:45 +09:00 |
|
|
|
d5c5b7eb6b
|
Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion
|
2017-04-18 10:09:36 +09:00 |
|
|
|
6b6690caf7
|
Fix filtering by ruleset.
|
2017-04-18 10:04:41 +09:00 |
|
|
|
f2174054ea
|
Fix song select.
|
2017-04-18 10:04:32 +09:00 |
|
|
|
786446354e
|
Fix post-rebase errors.
|
2017-04-18 09:00:53 +09:00 |
|
|
|
2767fbd81a
|
Implement Beatmap conversion testing.
|
2017-04-18 08:57:09 +09:00 |
|
|
|
928550b1a8
|
Merge branch 'master' into remove-playmode
|
2017-04-17 21:01:10 +09:00 |
|
|
|
c235a14e3e
|
Don't block input in BeatmapInfoWedge.
|
2017-04-17 17:08:01 +08:00 |
|
|
|
a4e2f34ee7
|
Make a RulesetDatabase.
|
2017-04-17 17:43:48 +09:00 |
|
|
|
78273d76e3
|
Added basic loading screen and test case
|
2017-04-16 20:18:41 -07:00 |
|
|
|
ca1f89f2cf
|
Fix crash when there's no beatmaps
|
2017-04-14 17:48:27 -05:00 |
|
|
|
2c6327fca9
|
Build for real this time
|
2017-04-14 17:17:51 -05:00 |
|
|
|
984c7092a6
|
Pls AppVeyor don't die
|
2017-04-14 16:33:58 -05:00 |
|
|
|
ddce3c157f
|
Clean up a few remaining stragglers.
|
2017-04-15 06:15:55 +09:00 |
|
|
|
4a149c4ab8
|
Better default values + don't set Mode from outside.
|
2017-04-15 06:14:31 +09:00 |
|
|
|
3845ab2a72
|
Add comment.
|
2017-04-15 05:55:38 +09:00 |
|
|
|
0a1376c2db
|
Remove PlayMode game-wide.
|
2017-04-15 05:22:41 +09:00 |
|
|
|
a89af273be
|
Make BeatmapInfo expose Ruleset instead of PlayMode.
|
2017-04-15 05:01:36 +09:00 |
|
|
|
59bfc7abad
|
Move statics to RulesetCollection to avoid conflicts later on.
|
2017-04-15 04:53:37 +09:00 |
|
|
|
0a89e7deb8
|
Merge remote-tracking branch 'refs/remotes/upstream/master'
|
2017-04-14 13:32:55 -05:00 |
|
|
|
b7d61add45
|
Cleanup + AppVeyor fixes
|
2017-04-14 13:10:59 -05:00 |
|
|
|
b5fc84087f
|
Show song in MusicController and SongSelect
|
2017-04-14 12:59:15 -05:00 |
|
|
|
2eb73a7c70
|
More smoothness when MenuMusic is false
|
2017-04-14 12:58:47 -05:00 |
|
|
|
2a9f4e6950
|
Get MenuMusic and MenuVoice woking
|
2017-04-14 12:42:42 -05:00 |
|
|
|
9d753a7798
|
Merge branch 'master' into song-progress-graph
|
2017-04-14 19:24:13 +09:00 |
|
|
|
ea0631ede8
|
Encapsulate progress update logic better.
|
2017-04-14 18:23:34 +09:00 |
|
|
|
acd7a5b254
|
Hook up beatmap object density to progress display.
|
2017-04-14 17:58:37 +09:00 |
|
|
|
6421f040dd
|
Fix SongProgress handling escape.
|
2017-04-14 15:27:24 +09:00 |
|
|
|
8c41707ac7
|
Fix incorrect default state. Handle input better.
|
2017-04-14 14:40:52 +09:00 |
|
|
|
09195a03a2
|
Merge remote-tracking branch 'upstream/master' into song-progress-graph
# Conflicts:
# osu.Game/Overlays/DragBar.cs
|
2017-04-14 11:25:00 +09:00 |
|
|
|
9bf861d0a4
|
Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up
# Conflicts:
# osu.Game/Screens/Play/FailOverlay.cs
# osu.Game/Screens/Play/PauseOverlay.cs
|
2017-04-14 01:07:34 +09:00 |
|
|
|
262a2c9f0e
|
Add exception for failing.
|
2017-04-13 19:13:09 +09:00 |
|
|
|
5f8baf874d
|
Use interpolatedSourceClock's IsRunning value for consistency.
|
2017-04-13 18:31:23 +09:00 |
|
|
|
1f4e0b0251
|
Fix MosueUp and HighResolution events not being handled by MenuOverlays.
|
2017-04-13 13:03:07 +09:00 |
|
|
|
359fea7e25
|
Improve "escape" pressing logic in pause/fail menus.
|
2017-04-13 12:40:00 +09:00 |
|
|
|
94bf1d65b6
|
Fix thread race conditions on pausing close to a fail.
|
2017-04-13 11:41:08 +09:00 |
|
|
|
7b240d84da
|
Merge branch 'master' into master
|
2017-04-12 15:04:27 -07:00 |
|
|
|
2c3fa30386
|
Metric -> Metrics.
|
2017-04-12 21:09:39 +09:00 |
|
|
|
32b87d12b5
|
Removed unneeded using
|
2017-04-12 04:54:24 -07:00 |
|
|
|
157ad17606
|
Merge branch 'master' into details
|
2017-04-12 20:25:51 +09:00 |
|
|
|
6c6ef946bd
|
Some more clean up
|
2017-04-12 04:01:52 -07:00 |
|
|
|
d250dde537
|
Fixed repeat keys working for retrying
|
2017-04-12 02:50:03 -07:00 |
|
|
|
348dd71406
|
Fixed repeat keys working for resuming
|
2017-04-12 02:43:42 -07:00 |
|
