Dan Balasescu
|
6918368afc
|
Merge branch 'master' into ingame_options
|
2017-05-29 18:12:02 +09:00 |
|
Thomas Müller
|
a4903e62ba
|
Merge branch 'master' into fix-nullrefs
|
2017-05-28 16:07:10 +02:00 |
|
Dean Herbert
|
d749fc516d
|
Update focus handling in line with framework changes
|
2017-05-28 20:08:46 +09:00 |
|
Dean Herbert
|
bdeaf2dbb4
|
Update method names in line with framework changes
|
2017-05-28 18:34:12 +09:00 |
|
EVAST9919
|
743dfcc130
|
More xmldoc and few Title text fixes
|
2017-05-28 00:56:11 +03:00 |
|
EVAST9919
|
b5a6d73104
|
Toogle visibility without ctrl pressed
|
2017-05-27 02:38:29 +03:00 |
|
EVAST9919
|
bedcf04043
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
|
2017-05-27 02:25:03 +03:00 |
|
Dean Herbert
|
5eab611255
|
Fix some possible nullrefs on beatmap load failure
|
2017-05-26 17:36:38 +09:00 |
|
Dean Herbert
|
012f60d59b
|
Merge branch 'master' into drawable-multiplayer-room
|
2017-05-25 13:58:05 +09:00 |
|
DrabWeb
|
b803e40a7d
|
Unbind from room values when disposing
|
2017-05-24 17:02:28 -03:00 |
|
Dean Herbert
|
0dbb2220e0
|
Add missing early activation to menu flashes
|
2017-05-24 21:07:12 +09:00 |
|
Seth
|
3094a8267f
|
Merge branch 'master' into drawable-multiplayer-room
|
2017-05-24 04:39:57 -03:00 |
|
Dean Herbert
|
45a964cebe
|
Merge branch 'master' into osu-direct
|
2017-05-24 15:33:53 +09:00 |
|
Dean Herbert
|
03f9a86366
|
Add missing readonly
|
2017-05-24 13:29:12 +09:00 |
|
Dean Herbert
|
16d9a677d0
|
Add a low-end cutoff for scale adjust
|
2017-05-24 13:08:59 +09:00 |
|
Dean Herbert
|
a9d1e54c27
|
Adjust triangle movement based on amplitude
|
2017-05-24 13:08:54 +09:00 |
|
Dean Herbert
|
4ee11764b8
|
Merge branch 'master' into osu-direct
|
2017-05-24 12:16:34 +09:00 |
|
Dean Herbert
|
b1bd88ae71
|
Merge branch 'master' into logo-beat
|
2017-05-24 11:41:02 +09:00 |
|
Dan Balasescu
|
90d54a6cfe
|
Merge branch 'master' into logo-beat
|
2017-05-24 10:36:30 +09:00 |
|
Dean Herbert
|
87a2cc2004
|
Merge branch 'master' into menu-flashes
|
2017-05-24 10:10:29 +09:00 |
|
ColdVolcano
|
207d6e4ac3
|
Update to new syntax of OnNewBeat
|
2017-05-23 20:01:20 -05:00 |
|
ColdVolcano
|
c6d744eb7c
|
Merge branch 'master' of ppy/osu into menu-flashes
|
2017-05-23 20:00:02 -05:00 |
|
Dean Herbert
|
dee6a1e2be
|
Merge branch 'master' into songselect-fix
|
2017-05-24 09:45:34 +09:00 |
|
MrTheMake
|
24f64c8815
|
More formatting
|
2017-05-24 02:38:05 +02:00 |
|
MrTheMake
|
67774192dd
|
Formatting fixes
|
2017-05-24 02:30:32 +02:00 |
|
MrTheMake
|
0616256bd0
|
CI fix
|
2017-05-24 02:23:52 +02:00 |
|
MrTheMake
|
09adb23591
|
Fix scheduled task not being canceled
|
2017-05-24 02:22:30 +02:00 |
|
Dean Herbert
|
b477e5cd9e
|
Fix potential nullref
|
2017-05-24 02:53:21 +09:00 |
|
Dean Herbert
|
813b09189c
|
Remove unused parameter
|
2017-05-24 02:09:31 +09:00 |
|
Dean Herbert
|
7e827c4f11
|
Add amplitude adjust
|
2017-05-24 01:45:01 +09:00 |
|
Dean Herbert
|
b12300391b
|
Merge branch 'master'
|
2017-05-24 01:17:09 +09:00 |
|
Dean Herbert
|
0842e00f13
|
Merge branch 'master' into controlpoint-rework
|
2017-05-24 00:20:15 +09:00 |
|
Dean Herbert
|
a48a03bf38
|
Merge branch 'master' into menu-music-osz
|
2017-05-23 23:56:07 +09:00 |
|
EVAST9919
|
178f8127b8
|
overall fixes
|
2017-05-23 16:01:00 +03:00 |
|
EVAST9919
|
2e28b10c36
|
CI fixes and removed useless property
|
2017-05-23 12:24:16 +03:00 |
|
EVAST9919
|
4b23cc47ea
|
Moved KeyCounter visibility logic to it's own class
|
2017-05-23 11:53:42 +03:00 |
|
EVAST9919
|
eafe215169
|
Simplify Hud visibility change
|
2017-05-23 11:53:12 +03:00 |
|
Dean Herbert
|
0634a3a5c5
|
Merge branch 'master' into osu-direct
|
2017-05-23 17:33:20 +09:00 |
|
Dean Herbert
|
0dd52e4e29
|
Various refactoring
|
2017-05-23 17:26:28 +09:00 |
|
Dean Herbert
|
2decb2b2ff
|
Add more flashiness during kiai time
|
2017-05-23 16:42:47 +09:00 |
|
Dean Herbert
|
73320f9a7e
|
Don't bounce the ripple
Also ripple better.
|
2017-05-23 16:42:41 +09:00 |
|
Dean Herbert
|
fe7ac20e29
|
Read menu music from osz resource
|
2017-05-23 16:38:43 +09:00 |
|
smoogipooo
|
3cdfd2eef5
|
Split ControlPoint into different types.
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
|
2017-05-23 14:03:40 +09:00 |
|
Dean Herbert
|
3e0aaa1aa0
|
Add basic beat response to osu! logo
|
2017-05-23 12:29:43 +09:00 |
|
DrabWeb
|
9798117d53
|
Move RoomStatus to a class instead of enum
|
2017-05-22 21:13:57 -03:00 |
|
DrabWeb
|
cf0e7887b5
|
Unused using
|
2017-05-22 13:14:56 -03:00 |
|
DrabWeb
|
25b457e994
|
Proper Bindable usage
|
2017-05-22 13:05:18 -03:00 |
|
DrabWeb
|
65df2d2b70
|
MultiplayerRoomStatus -> RoomStatus
|
2017-05-22 12:46:41 -03:00 |
|
DrabWeb
|
2c16d9c3a7
|
CurrentBeatmap -> Beatmap
|
2017-05-22 12:45:40 -03:00 |
|
DrabWeb
|
03f6cded84
|
MultiplayerRoom -> Room
|
2017-05-22 12:44:58 -03:00 |
|