Dan Balasescu
|
32c471d285
|
Merge branch 'master' into pause-container
|
2017-05-18 01:22:37 +09:00 |
|
Dean Herbert
|
8084c575ef
|
Merge branch 'master' into fix-fail-pause-conflict
|
2017-05-17 23:32:41 +09:00 |
|
Dean Herbert
|
41c252760d
|
Move all pause logic into PauseContainer
|
2017-05-17 21:57:01 +09:00 |
|
Dean Herbert
|
88a70e407c
|
Fix and simplifty pause logic
Resolves #770
|
2017-05-17 20:11:41 +09:00 |
|
Dean Herbert
|
7bb38e927b
|
Fix song select reverting to first difficulty of current group on entering
|
2017-05-17 17:33:20 +09:00 |
|
Dean Herbert
|
cab12ee55a
|
Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed
|
2017-05-17 17:33:16 +09:00 |
|
Dean Herbert
|
12cb530358
|
Merge branch 'master' into tidy-up
|
2017-05-17 09:24:11 +09:00 |
|
nyaamara
|
a3e93afb37
|
Merge pull request #3 from ppy/master
cool
|
2017-05-16 16:57:45 -04:00 |
|
nyaamara
|
b22c84287a
|
Fix typo.
|
2017-05-16 16:54:33 -04:00 |
|
Huo Yaoyuan
|
d929de466a
|
DateDisplay -> DateTimeDisplay for more exactly.
|
2017-05-16 21:16:52 +08:00 |
|
Huo Yaoyuan
|
d213706d07
|
Use DateTimeOffset.
|
2017-05-16 21:14:50 +08:00 |
|
Dean Herbert
|
6487bf45cf
|
Eagerly attempt to pause the game when the window is not focused
|
2017-05-16 17:59:14 +09:00 |
|
Dean Herbert
|
89e2a39d14
|
Merge remote-tracking branch 'upstream/master' into margin-padding-namespace
|
2017-05-16 16:36:34 +09:00 |
|
Dean Herbert
|
efab186384
|
Update namespaces in line with framework
|
2017-05-16 12:50:30 +09:00 |
|
Dean Herbert
|
23760d6805
|
Adjust osu! logo metrics and add shockwave impact animation
|
2017-05-15 19:36:03 +09:00 |
|
Dean Herbert
|
622b155fda
|
OsuConfig -> OsuSetting
|
2017-05-15 10:56:27 +09:00 |
|
Dean Herbert
|
eaaba11586
|
Change all instances of options to settings where applicable
|
2017-05-15 10:55:29 +09:00 |
|
Dean Herbert
|
e096dd8126
|
Merge branch 'master' into fix-beatmap-population
|
2017-05-12 20:30:06 +09:00 |
|
Dan Balasescu
|
815379646c
|
Merge branch 'master' into new-option-search
|
2017-05-12 20:22:11 +09:00 |
|
Dan Balasescu
|
d60da82c4c
|
Merge branch 'master' into fix-beatmap-population
|
2017-05-12 20:15:10 +09:00 |
|
Dean Herbert
|
a9b3f74218
|
Fix ruleset not always getting populated in a WorkingBeatmap
|
2017-05-12 20:05:44 +09:00 |
|
Dean Herbert
|
d3770d8395
|
Merge branch 'master' into chat-design-update
|
2017-05-12 19:57:57 +09:00 |
|
Dean Herbert
|
d2e066ca35
|
Move SearchTextBox to better namespace
Is being used in multiple places now.
|
2017-05-12 19:57:06 +09:00 |
|
Dean Herbert
|
cf239f4d9c
|
Move chat into main content
Also changes the way parallax is applied to OsuScreens game-wide.
|
2017-05-12 19:03:21 +09:00 |
|
EVAST9919
|
9a04069123
|
removed useless booleans, using nullables instead
|
2017-05-12 10:16:31 +03:00 |
|
EVAST9919
|
34b4efc4e9
|
Applied suggested changes
|
2017-05-12 08:12:34 +03:00 |
|
EVAST9919
|
79ed92a0d7
|
Simplified logic
|
2017-05-12 01:48:28 +03:00 |
|
EVAST9919
|
1f34cec5ce
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-11 22:22:57 +03:00 |
|
Dean Herbert
|
a2f6d8a3e6
|
Fix broken test cases, remove some recursive lookup methods.
|
2017-05-11 19:38:28 +09:00 |
|
Dean Herbert
|
70ef503403
|
Merge branch 'master' into metadata
|
2017-05-11 12:23:00 +09:00 |
|
EVAST9919
|
ea0add2354
|
Fixed update condition
|
2017-05-11 02:34:57 +03:00 |
|
EVAST9919
|
d55c97a08a
|
Stop progress as soon as we at 100%
|
2017-05-11 01:48:46 +03:00 |
|
EVAST9919
|
5b469eff69
|
Fixes
|
2017-05-10 10:33:02 +03:00 |
|
EVAST9919
|
d8f9e71b84
|
Applied suggested changes
|
2017-05-10 10:14:44 +03:00 |
|
EVAST9919
|
7b17e331c4
|
cleanups
|
2017-05-10 03:45:31 +03:00 |
|
EVAST9919
|
315f1f1256
|
CI fixes
|
2017-05-09 06:23:03 +03:00 |
|
EVAST9919
|
2c92ee432b
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-09 06:05:46 +03:00 |
|
EVAST9919
|
2826c663fd
|
Apply suggested changes
|
2017-05-09 06:05:37 +03:00 |
|
Dean Herbert
|
ab1768ef80
|
Merge branch 'master' into tidy-up
|
2017-05-09 10:27:29 +09:00 |
|
EVAST9919
|
de2486b8e6
|
Moved timeLeft recalculation to property
|
2017-05-08 20:36:02 +03:00 |
|
EVAST9919
|
17d1ecb8f5
|
Use float type for progress value
|
2017-05-08 19:42:36 +03:00 |
|
EVAST9919
|
4b5e24cc36
|
Changed logic a bit
|
2017-05-08 19:14:19 +03:00 |
|
EVAST9919
|
ae2186970c
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage
|
2017-05-08 18:16:16 +03:00 |
|
Huo Yaoyuan
|
cb21e98ae1
|
MatchCreate.ValidForResume = false.
|
2017-05-08 19:55:04 +08:00 |
|
Huo Yaoyuan
|
dff05bec79
|
Use readonly fields.
|
2017-05-08 18:56:04 +08:00 |
|
Dean Herbert
|
48368779ab
|
Avoid polluting Player with HUD-specific code.
|
2017-05-08 11:48:40 +09:00 |
|
Dean Herbert
|
df4a737c9b
|
Merge remote-tracking branch 'ppy/master' into hud-mod-display
|
2017-05-08 10:56:34 +09:00 |
|
EVAST9919
|
f0145c7f4f
|
Trying to woke up AppVeyor
|
2017-05-08 02:16:56 +03:00 |
|
EVAST9919
|
926ed907c2
|
CI fixes
|
2017-05-08 02:00:21 +03:00 |
|
EVAST9919
|
dda25219bc
|
code fixes
|
2017-05-08 01:54:31 +03:00 |
|