Dean Herbert
|
8b2a6b8cce
|
Fix formatting
|
2018-05-26 12:38:33 +09:00 |
|
Dean Herbert
|
8a5cd85ecd
|
Merge branch 'master' into catch_spinner
|
2018-05-26 12:36:42 +09:00 |
|
Dean Herbert
|
18c3339cd2
|
Merge pull request #2637 from HoutarouOreki/CursorOverrideContainer-rename
Rename CursorOverrideContainer to MenuCursorContainer
|
2018-05-26 12:31:58 +09:00 |
|
Dean Herbert
|
79442ad238
|
Merge branch 'master' into CursorOverrideContainer-rename
|
2018-05-26 12:19:47 +09:00 |
|
Dean Herbert
|
b8b7e2cd9f
|
Merge pull request #2636 from smoogipoo/diffcalc-fixes
Bring pp calculations more in-line with osu!stable
|
2018-05-26 12:18:41 +09:00 |
|
Dean Herbert
|
e016f98841
|
Merge branch 'master' into diffcalc-fixes
|
2018-05-26 12:10:31 +09:00 |
|
Dan Balasescu
|
a87c26028f
|
Merge pull request #2633 from peppy/fix-failing-tests
Fix quit button test occasionally failing
|
2018-05-26 11:56:57 +09:00 |
|
smoogipoo
|
d850e34003
|
Actually cast to int
|
2018-05-26 09:25:16 +09:00 |
|
HoutarouOreki
|
63fb9ddec4
|
Forgot file name
|
2018-05-25 21:20:42 +02:00 |
|
HoutarouOreki
|
e2d840c2de
|
Rename CursorOverrideContainer to MenuCursorContainer
|
2018-05-25 21:13:40 +02:00 |
|
Dan Balasescu
|
9dd2c2a904
|
Merge branch 'master' into diffcalc-fixes
|
2018-05-25 20:09:20 +09:00 |
|
smoogipoo
|
215cc9fba7
|
Change all performance calculators to use int hitwindows
Has a pretty large (>6) effect on pp for some maps.
|
2018-05-25 20:07:14 +09:00 |
|
smoogipoo
|
765a50d007
|
Remove 0.5 offsets
Checked up against DB values + server-side build versions, and these 0.5s don't seem to exist. Brings calculations more in-line with osu!stable.
|
2018-05-25 20:05:53 +09:00 |
|
Dean Herbert
|
adeb23d54b
|
Merge branch 'master' into fix-failing-tests
|
2018-05-25 19:36:05 +09:00 |
|
Dean Herbert
|
58317be41e
|
Merge pull request #2499 from AlFasGD/editor-seekbar-fix
Prevent user from scrolling outside the timeline in the editor
|
2018-05-25 19:34:28 +09:00 |
|
Dean Herbert
|
8977670088
|
Update framework
|
2018-05-25 19:21:49 +09:00 |
|
Dean Herbert
|
699f661b02
|
Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
|
2018-05-25 19:07:30 +09:00 |
|
Dean Herbert
|
b474dca09a
|
Merge pull request #2612 from jorolf/open-external
Add icon next to beatmap title/username to open in browser
|
2018-05-25 19:01:27 +09:00 |
|
Dean Herbert
|
cc69f07172
|
Merge remote-tracking branch 'upstream/master' into jorolf-open-external
|
2018-05-25 18:52:05 +09:00 |
|
Dean Herbert
|
1cb7d50407
|
Add and use default size (smaller than before)
|
2018-05-25 18:51:57 +09:00 |
|
Dean Herbert
|
78ca111d69
|
Merge pull request #2504 from UselessToucan/player_loader_input_toggles
Add input toggles to the PlayerLoader screen
|
2018-05-25 18:50:45 +09:00 |
|
Dean Herbert
|
1b5bb79fe9
|
Merge remote-tracking branch 'upstream/master' into jorolf-open-external
|
2018-05-25 18:50:30 +09:00 |
|
Dean Herbert
|
28aa6faef9
|
Merge branch 'master' into player_loader_input_toggles
|
2018-05-25 18:38:12 +09:00 |
|
Dean Herbert
|
7d06a08c3a
|
Fix quit button test occasionally failing
|
2018-05-25 17:44:56 +09:00 |
|
Dean Herbert
|
e62718f251
|
Merge pull request #2587 from smoogipoo/diffcalc-double-hr
Fix double-HR application in OsuDifficultyCalculator
|
2018-05-25 14:17:25 +09:00 |
|
Dean Herbert
|
67447ef560
|
Merge branch 'master' into diffcalc-double-hr
|
2018-05-25 14:03:10 +09:00 |
|
Dean Herbert
|
1c947fd3a7
|
Merge pull request #2618 from smoogipoo/musiccontroller-nullref
Fix possible MusicController nullref
|
2018-05-25 11:25:05 +09:00 |
|
Dean Herbert
|
385c2c5c86
|
Merge branch 'master' into musiccontroller-nullref
|
2018-05-25 11:01:09 +09:00 |
|
Dean Herbert
|
568d4882c6
|
Remove unnecessary null coalesce
|
2018-05-25 11:00:56 +09:00 |
|
Dean Herbert
|
6d6cea19ec
|
Merge pull request #2624 from Aergwyn/hide-toolbar-after-play
Fix incorrect default values keeping overlays in wrong state
|
2018-05-24 09:43:52 +09:00 |
|
Aergwyn
|
0c0f86fe26
|
fix incorrect default values keeping overlays in wrong state
|
2018-05-23 16:25:10 +02:00 |
|
frankhjwx
|
fda7025ac3
|
Re-order positionData judgement for correct banana creation
|
2018-05-23 13:47:33 +08:00 |
|
frankhjwx
|
28ad5398cc
|
Remove the changes in convert spinner
|
2018-05-23 13:46:12 +08:00 |
|
smoogipoo
|
f894d73501
|
Fix possible MusicController nullref
|
2018-05-23 14:36:09 +09:00 |
|
Dean Herbert
|
194710eae4
|
Merge pull request #2613 from Aergwyn/fix-disclaimer-allowing-notifications
Fix disclaimer allowing notifications
|
2018-05-23 11:22:49 +09:00 |
|
frankhjwx
|
6ee96c758f
|
Merge branch 'master' into catch_spinner
|
2018-05-23 10:02:11 +08:00 |
|
Aergwyn
|
76fbc656a1
|
fix disclaimer allowing notifications
|
2018-05-22 17:53:36 +02:00 |
|
jorolf
|
8fbda5bc59
|
add license header
|
2018-05-22 15:41:10 +02:00 |
|
jorolf
|
b324337fa1
|
Add icon next to beatmap title/username to open in browser
|
2018-05-22 15:29:52 +02:00 |
|
frankhjwx
|
be0fc24ad4
|
Fixed banana generation on catch specific maps
|
2018-05-22 20:51:37 +08:00 |
|
Dean Herbert
|
088deee70a
|
Merge pull request #2601 from Aergwyn/respect-showoverlay-bindable
FIx overlays from not hiding when returning to initial main menu state
|
2018-05-22 19:19:00 +09:00 |
|
Dean Herbert
|
ef40ca8805
|
Merge branch 'master' into respect-showoverlay-bindable
|
2018-05-22 19:00:42 +09:00 |
|
Dean Herbert
|
52230d6279
|
Merge pull request #2600 from peppy/fix-main-menu-escape
Fix escape not working to go backwards in menus before finally exiting the game
|
2018-05-22 18:58:48 +09:00 |
|
Dan Balasescu
|
99163ca8ba
|
Merge branch 'master' into fix-main-menu-escape
|
2018-05-22 18:17:51 +09:00 |
|
Dan Balasescu
|
c0802b5646
|
Merge pull request #2430 from UselessToucan/exit_replay_button
Add hold-to-quit button for gameplay/replays
|
2018-05-22 18:17:40 +09:00 |
|
smoogipoo
|
0e122468db
|
Fix progress easing to 0 if aborting after confirmation
|
2018-05-22 18:06:40 +09:00 |
|
Dean Herbert
|
39de807445
|
Update framework
|
2018-05-22 16:46:55 +09:00 |
|
Dean Herbert
|
d43e4af8ea
|
Fix overlap between quit button at key input overlay
|
2018-05-22 16:45:42 +09:00 |
|
Dean Herbert
|
436067c01f
|
Handle scale back in a nicer way
|
2018-05-22 16:44:37 +09:00 |
|
Dean Herbert
|
7b770d03c5
|
Use OnMouseMove instead of Update logic
|
2018-05-22 16:26:59 +09:00 |
|