jorolf
|
046412f962
|
make hover lost transition instant (similar to hover transition)
|
2018-04-16 18:52:09 +02:00 |
|
jorolf
|
2a18b4c3f8
|
add a DRAWABLE_BADGE_SIZE const and center badges
|
2018-04-16 18:51:35 +02:00 |
|
jorolf
|
af0c49cca8
|
badge_size is the actual badge size now
also fixes rotateBadges bug when hover is lost
|
2018-04-16 18:27:18 +02:00 |
|
jorolf
|
6ca714d93b
|
add badges to ProfileHeader
|
2018-04-15 23:49:45 +02:00 |
|
Dean Herbert
|
779d5a578b
|
Merge pull request #2383 from DrabWeb/wave-container
Wave container
|
2018-04-15 21:22:54 +09:00 |
|
Dean Herbert
|
ae77c010e2
|
Merge remote-tracking branch 'upstream/master' into wave-container
|
2018-04-15 21:03:18 +09:00 |
|
Dean Herbert
|
e512e4bacb
|
Merge pull request #2360 from UselessToucan/profile_multiple_audio_previews
Handle multiple song previews playing in different beatmap categories…
|
2018-04-15 16:22:52 +09:00 |
|
Dean Herbert
|
fd54ae3c87
|
Simplify logic
|
2018-04-15 16:12:42 +09:00 |
|
Dean Herbert
|
069d48ac14
|
Remove unused variable
|
2018-04-15 15:29:00 +09:00 |
|
TocoToucan
|
671de4f6c2
|
Resolve merge conflicts
|
2018-04-14 15:11:28 +03:00 |
|
Dan Balasescu
|
f59eef072d
|
Merge pull request #2389 from UselessToucan/ignored_input_handler
Fix new input handlers not being enabled by default
|
2018-04-13 22:36:04 +09:00 |
|
smoogipoo
|
a6dfe0d4c9
|
Final framework update
|
2018-04-13 22:24:19 +09:00 |
|
smoogipoo
|
fe77417e03
|
Merge remote-tracking branch 'origin/master' into ignored_input_handler
|
2018-04-13 22:23:33 +09:00 |
|
Dan Balasescu
|
aadde08396
|
Merge pull request #2399 from FreezyLemon/update-nunit-3.10.1
Update NUnit to version 3.10.1
|
2018-04-13 22:22:37 +09:00 |
|
Dan Balasescu
|
258e17566c
|
Merge branch 'master' into update-nunit-3.10.1
|
2018-04-13 22:05:26 +09:00 |
|
Dean Herbert
|
a0f9f8d512
|
Update frramework again
|
2018-04-13 21:47:50 +09:00 |
|
FreezyLemon
|
4b3a129738
|
bump NUnit to version 3.10.1
|
2018-04-13 13:19:52 +02:00 |
|
Dean Herbert
|
9f5a52b641
|
Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler
|
2018-04-13 19:54:15 +09:00 |
|
Dean Herbert
|
e962bc312e
|
Update framework
|
2018-04-13 19:53:29 +09:00 |
|
Dan Balasescu
|
632befb210
|
Merge pull request #2378 from peppy/fix-line-endings
Normalize line endings to LF
|
2018-04-13 19:47:30 +09:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
Dean Herbert
|
f99503b60c
|
Add new gitattributes
|
2018-04-13 18:19:38 +09:00 |
|
Dean Herbert
|
5f020074e0
|
Merge pull request #2332 from LittleEndu/alt-eagerselect
Make beatmap carousel select a random beatmap when there was no previous selection
|
2018-04-13 18:11:45 +09:00 |
|
Dean Herbert
|
a1a7e63646
|
Merge branch 'master' into ignored_input_handler
|
2018-04-13 18:05:12 +09:00 |
|
Endrik Tombak
|
d9f587edff
|
Merge remote-tracking branch 'upstream/master' into alt-eagerselect
|
2018-04-13 11:55:35 +03:00 |
|
Dean Herbert
|
06efddd4b4
|
Merge pull request #2394 from UselessToucan/beatmap_set_overlay_difficulties_ordering
Fix incorrect ordering of difficulties retrieved from API
|
2018-04-13 17:09:48 +09:00 |
|
Dean Herbert
|
f7c50dee65
|
Merge branch 'master' into beatmap_set_overlay_difficulties_ordering
|
2018-04-13 16:48:43 +09:00 |
|
Dan Balasescu
|
0871c16075
|
Merge pull request #2390 from Joehuu/lowercase-back-button
Lowercase back button
|
2018-04-13 14:25:23 +09:00 |
|
Dan Balasescu
|
2699ad8c89
|
Merge branch 'master' into lowercase-back-button
|
2018-04-13 14:14:18 +09:00 |
|
Dean Herbert
|
68d865bbd1
|
Merge pull request #2396 from Joehuu/remove-composer-from-player-loader
Remove composer from player loader
|
2018-04-13 13:08:13 +09:00 |
|
Joehu
|
128446e51d
|
Remove composer from player loader
|
2018-04-12 16:46:46 -07:00 |
|
TocoToucan
|
9acea6eab0
|
Order beatmap difficulty icons correctly
|
2018-04-12 19:33:30 +03:00 |
|
Joehu
|
61d6f52a53
|
Lowercase back button
|
2018-04-12 08:26:25 -07:00 |
|
Dean Herbert
|
ea24006a66
|
Merge pull request #2372 from smoogipoo/remove-gamefield-test
Remove TestCaseGamefield
|
2018-04-12 23:50:16 +09:00 |
|
TocoToucan
|
7c3441e2d0
|
ActiveInputHandlers -> IgnoredInputHandler
|
2018-04-12 17:06:35 +03:00 |
|
Dean Herbert
|
1e6244afe1
|
Merge branch 'master' into remove-gamefield-test
|
2018-04-12 21:37:04 +09:00 |
|
Dean Herbert
|
3de460f84c
|
Merge pull request #2356 from smoogipoo/editor-clock
Move seeking logic into a custom editor clock
|
2018-04-12 21:36:50 +09:00 |
|
Dean Herbert
|
127f0d7b01
|
Fix smoogipoo's comments
|
2018-04-12 21:17:17 +09:00 |
|
Dean Herbert
|
0ca703beaa
|
Add some missing xmldoc
|
2018-04-12 21:04:45 +09:00 |
|
Dean Herbert
|
b50bad0072
|
Merge branch 'master' into editor-clock
|
2018-04-12 19:29:58 +09:00 |
|
Dean Herbert
|
ce01fd245a
|
Merge pull request #2376 from peppy/high-level-xmldoc
Add xmldoc to some high-level classes to explain their separation
|
2018-04-12 19:26:31 +09:00 |
|
Dean Herbert
|
3ddf00ee74
|
Merge branch 'master' into high-level-xmldoc
|
2018-04-12 19:05:10 +09:00 |
|
Dean Herbert
|
47a78ffb5d
|
Merge pull request #2387 from smoogipoo/oauth-token-logging
Fix OAuth token not saving often enough
|
2018-04-12 19:04:48 +09:00 |
|
smoogipoo
|
baae4427ff
|
Move string-token property to OAuth
|
2018-04-12 14:30:28 +09:00 |
|
smoogipoo
|
e007365916
|
Save OAuth token to config on every token change
|
2018-04-12 14:23:49 +09:00 |
|
smoogipoo
|
6e35910419
|
Remove start/stop clock logic
Beatmap track shouldn't be start/stopped anyway - the IAdjustableClock should be DI'd in to perform the functionality.
|
2018-04-12 14:06:36 +09:00 |
|
smoogipoo
|
a2484fbf56
|
Move back to DI-ing adjustable clock into SummaryTimeline
|
2018-04-12 13:37:02 +09:00 |
|
smoogipoo
|
fbc50d6030
|
Merge master into editor-clock
|
2018-04-12 13:35:53 +09:00 |
|
Dan Balasescu
|
9e2494c57b
|
Merge branch 'master' into high-level-xmldoc
|
2018-04-12 12:59:37 +09:00 |
|
DrabWeb
|
0bede52381
|
Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places.
|
2018-04-11 16:22:27 -03:00 |
|