smoogipooo
|
22128f158c
|
Fix a few errors.
|
2017-05-18 12:10:01 +09:00 |
|
smoogipooo
|
eebd5a910e
|
Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion
|
2017-05-18 11:59:31 +09:00 |
|
Dean Herbert
|
25385d408c
|
Merge pull request #783 from peppy/pause-container
PauseContainer
|
2017-05-18 09:43:39 +09:00 |
|
Dan Balasescu
|
32c471d285
|
Merge branch 'master' into pause-container
|
2017-05-18 01:22:37 +09:00 |
|
Dan Balasescu
|
55d4d83712
|
Merge pull request #782 from peppy/fix-fail-pause-conflict
Fix and simplify pause logic
|
2017-05-18 01:22:00 +09:00 |
|
Dean Herbert
|
8084c575ef
|
Merge branch 'master' into fix-fail-pause-conflict
|
2017-05-17 23:32:41 +09:00 |
|
Dean Herbert
|
0242e37bb3
|
Merge pull request #778 from peppy/song-select-selection-fixes
Fix song select reverting to first difficulty of current group on entering
|
2017-05-17 23:31:24 +09:00 |
|
Dean Herbert
|
d1f85c3f8e
|
Update framework
|
2017-05-17 23:21:23 +09:00 |
|
Dean Herbert
|
25f217505e
|
Merge branch 'master' into song-select-selection-fixes
|
2017-05-17 23:17:10 +09:00 |
|
Dean Herbert
|
bab8997b43
|
Merge pull request #780 from peppy/bad-bad-ratio-container
Fix ratio container being added to a level too high
|
2017-05-17 23:16:58 +09:00 |
|
Dean Herbert
|
1278d9c53d
|
Merge branch 'master' into bad-bad-ratio-container
|
2017-05-17 23:01:56 +09:00 |
|
Dean Herbert
|
3fd9edfcde
|
Merge pull request #784 from peppy/general-fixes
Fix CI warning
|
2017-05-17 22:57:01 +09:00 |
|
Dean Herbert
|
d606b5b3a7
|
Fix CI warning
|
2017-05-17 22:13:56 +09:00 |
|
Dan Balasescu
|
8bcbc2cc26
|
Merge pull request #774 from peppy/fix-chat-after-disconnect
Fix channels being unnecessarily recycled on disconnect
|
2017-05-17 22:02:25 +09:00 |
|
Dean Herbert
|
41c252760d
|
Move all pause logic into PauseContainer
|
2017-05-17 21:57:01 +09:00 |
|
smoogipooo
|
b52ec11260
|
Add (almost finished) basis of slider hit object conversion...
|
2017-05-17 20:47:02 +09:00 |
|
smoogipooo
|
74c23ff6d8
|
Add base for event parsing code.
|
2017-05-17 20:46:23 +09:00 |
|
Dean Herbert
|
88a70e407c
|
Fix and simplifty pause logic
Resolves #770
|
2017-05-17 20:11:41 +09:00 |
|
Dean Herbert
|
cba7796777
|
Fix ratio container being added to a level too high
That's a bad ratio container! How did we not notice this until now?
|
2017-05-17 18:49:30 +09:00 |
|
Dan Balasescu
|
b21be8f3f5
|
Merge branch 'master' into fix-chat-after-disconnect
|
2017-05-17 17:51:35 +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 |
|
Dan Balasescu
|
12716d2ab4
|
Merge pull request #776 from peppy/fix-duplicate-messages
Revert "Use generic IComparable for message."
|
2017-05-17 13:51:13 +09:00 |
|
Dean Herbert
|
78c1d4581f
|
Revert "Use generic IComparable for message."
This reverts commit aaaee5ed10.
|
2017-05-17 13:44:43 +09:00 |
|
smoogipooo
|
2f8556a44a
|
Fix hold notes + make it compile again.
|
2017-05-17 13:20:33 +09:00 |
|
smoogipooo
|
4d9aea6aec
|
Remove while statement (came from fastrandom...).
|
2017-05-17 13:14:42 +09:00 |
|
smoogipooo
|
06da689ff9
|
Merge branch 'fast-random' into mania-beatmap-conversion
|
2017-05-17 13:13:00 +09:00 |
|
smoogipooo
|
c5d823d7d9
|
Remove redundant parentheses.
|
2017-05-17 13:11:17 +09:00 |
|
smoogipooo
|
9565bb9572
|
Fix hold notes - remove glow for now.
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs
|
2017-05-17 13:09:49 +09:00 |
|
smoogipooo
|
17466a662c
|
Add hold note conversion.
|
2017-05-17 13:09:07 +09:00 |
|
smoogipooo
|
fdd98e23bd
|
Fix generation.
|
2017-05-17 13:08:59 +09:00 |
|
smoogipooo
|
1ded043778
|
Add basic mania-specific beatmap conversion.
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
|
2017-05-17 13:07:56 +09:00 |
|
smoogipooo
|
51f7904c13
|
Remove redundant parentheses.
|
2017-05-17 13:04:57 +09:00 |
|
Dean Herbert
|
9b1363184b
|
Merge branch 'master' into fast-random
|
2017-05-17 12:55:35 +09:00 |
|
smoogipooo
|
93e2b21084
|
Add FastRandom class for use in beatmap conversion.
|
2017-05-17 12:52:07 +09:00 |
|
Dean Herbert
|
231f7939a6
|
Fix channels being unnecessarily recycled on disconnect
Resolves #768
|
2017-05-17 12:42:02 +09:00 |
|
Dean Herbert
|
c78f4cc7ab
|
Merge pull request #769 from huoyaoyuan/tidy-up
Tidy up
|
2017-05-17 09:29:05 +09:00 |
|
Dean Herbert
|
12cb530358
|
Merge branch 'master' into tidy-up
|
2017-05-17 09:24:11 +09:00 |
|
Dean Herbert
|
4f1c32a491
|
Merge pull request #771 from nyaamara/master
Fix typo
|
2017-05-17 07:59:46 +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
|
e2a7f00a52
|
Remove unused namespace.
|
2017-05-16 22:20:05 +08:00 |
|
Huo Yaoyuan
|
f1d5a92950
|
Use generic IEqutable to avoid typeless Equals.
|
2017-05-16 21:49:38 +08:00 |
|
Huo Yaoyuan
|
aaaee5ed10
|
Use generic IComparable for message.
|
2017-05-16 21:46:22 +08:00 |
|
Huo Yaoyuan
|
e911441394
|
Why AbandonedMutexException?
|
2017-05-16 21:23:14 +08: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 |
|
Huo Yaoyuan
|
b9a40a841b
|
Use IsAssignableFrom.
|
2017-05-16 21:04:54 +08:00 |
|
Dean Herbert
|
8b6d0864f0
|
Merge pull request #767 from peppy/general-fixes
Update framework
|
2017-05-16 21:42:56 +09:00 |
|
Dean Herbert
|
5a9745b492
|
Update API endpoint
|
2017-05-16 21:37:55 +09:00 |
|