1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 04:49:40 +08:00
Commit Graph

1951 Commits

Author SHA1 Message Date
Dean Herbert
2a099bb56c Stop TestCaseChatDisplay basically reimplementing ChatOverlay. 2017-02-19 17:06:51 +09:00
Dean Herbert
0da0ef5a1b Fix padding, fonts and alignment of chat display. 2017-02-19 17:06:41 +09:00
Jorolf
f166bb0f96 Moved movement to the default position to property 2017-02-18 22:26:48 +01:00
Jorolf
77bfe57d8c compacted code, made public bool to disable it 2017-02-18 22:00:07 +01:00
Jorolf
a48e4a31a7 Parallax Option works now 2017-02-18 21:34:21 +01:00
Jorolf
353581bf16 Merge remote-tracking branch 'refs/remotes/ppy/master' into MoreOptions 2017-02-18 21:13:28 +01:00
Thomas Müller
5721e7f2d2 Merge pull request #371 from peppy/general-fixes
Update framework.
2017-02-18 16:33:09 +01:00
Dean Herbert
837992d112
Update framework. 2017-02-19 00:27:00 +09:00
Thomas Müller
a53695347f Merge pull request #370 from peppy/general-fixes
General fixes.
2017-02-18 16:14:57 +01:00
Dean Herbert
c1194102b1
Remove second sample playback when clicking osu! logo. 2017-02-18 22:33:24 +09:00
Dean Herbert
ebc38917dc
Fix options sidebar not displaying correclty. 2017-02-18 22:29:20 +09:00
Andrey Zavadskiy
f028188398 Merge remote-tracking branch 'refs/remotes/ppy/master' into connection_fix 2017-02-18 13:47:45 +03:00
Andrey Zavadskiy
e803564b5a Added the specific exception 2017-02-18 13:46:47 +03:00
Thomas Müller
b92726c8ee Merge pull request #369 from peppy/general-fixes
General fixes.
2017-02-18 09:50:48 +01:00
Dean Herbert
1524b89753
Bump framework. 2017-02-18 17:44:49 +09:00
Dean Herbert
78c9348b5a
Make accuracy fixed width and improve feel. 2017-02-18 17:35:54 +09:00
Dean Herbert
1a31589abd
Add padding zeroes to score display (and fix not being applied initially). 2017-02-18 17:35:37 +09:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
Thomas Müller
7a29603800 Merge pull request #365 from peppy/general-fixes
Better screen hierarchy
2017-02-18 07:58:03 +01:00
Dean Herbert
cf8b6c0697
Fix backgrounds in TestCasePlayer dimming to gray instead of black. 2017-02-18 15:54:26 +09:00
Dean Herbert
94dd268fd2
Move constant for default ControlPoint out of Slider. 2017-02-18 15:54:16 +09:00
Dean Herbert
bf33cc6f53
Make disclaimer actually be a thing. 2017-02-18 14:16:46 +09:00
Dean Herbert
76cab600d9
Update framework. 2017-02-18 13:23:53 +09:00
Thomas Müller
ef775458dd Fix compilation error introduced in merge conflict resolution. 2017-02-17 21:27:17 +01:00
Thomas Müller
04de28d8b2 Merge branch 'refs/heads/update-framework' into general-fixes 2017-02-17 21:26:39 +01:00
Thomas Müller
1198705a6f Merge branch 'master' of github.com:ppy/osu into general-fixes
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
2017-02-17 21:22:34 +01:00
Thomas Müller
4b0d6cd26b Don't rely on default relative size of ScrollContainer. 2017-02-17 20:08:28 +01:00
Andrey Zavadskiy
2f4855b00f Added exception 2017-02-17 21:07:59 +03:00
Thomas Müller
6a58d7ab2a Merge pull request #366 from OussamaDanba/slider_timingpoint_fix
Fix beatmap import crash when the first timingPoint starts later than…
2017-02-17 18:22:55 +01:00
Shadoxfix
7a45ea58b2 Add comment explaining why the branch is necessary 2017-02-17 18:17:18 +01:00
Shadoxfix
72306e8757 Fix beatmap import crash when the first timingPoint starts later than a slider 2017-02-17 17:36:00 +01:00
Jorolf
88c48bec46 Merge branch 'master' of https://github.com/ppy/osu 2017-02-17 12:54:11 +01:00
Dean Herbert
fe3a6248ec
Add better screen hierarchy and placeholder for dev build disclaimer. 2017-02-17 20:07:16 +09:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen. 2017-02-17 19:23:58 +09:00
Dean Herbert
366e95dd4f
Remove outdated comment. 2017-02-17 17:33:41 +09:00
Dean Herbert
9e8b4d43dd
Improve exit procedure. 2017-02-17 17:25:28 +09:00
Dean Herbert
0b922365bb
Fix nullref due to missing controlPoints. 2017-02-17 15:27:48 +09:00
Dean Herbert
ecb840e26f Merge pull request #364 from peppy/general-fixes
Design improvements
2017-02-16 22:49:57 +09:00
Dean Herbert
aaed714160
Adjust Explode alpha slightly. 2017-02-16 22:48:47 +09:00
Dean Herbert
53e40804ab
Move other score components to centre alignment (and switch font). 2017-02-16 22:44:41 +09:00
Dean Herbert
ca6946c7a2
Update Health display design. 2017-02-16 22:44:21 +09:00
Dean Herbert
9a2beb5979
Update Key Counter font. 2017-02-16 22:43:49 +09:00
Dean Herbert
04346dbb92
Make osu! logo at song select correctly handle mouse focus. 2017-02-16 22:24:25 +09:00
Dean Herbert
a3cdbe234e Merge pull request #362 from Nabile-Rahmani/apply-suggestions
Fixed "Namespace does not correspond to file location".
2017-02-16 21:39:42 +09:00
Nabile Rahmani
9c4bb82dd6 Merged upstream/master. 2017-02-16 13:23:11 +01:00
Nabile Rahmani
1cdd2a6072 Updated submodule. 2017-02-16 13:09:42 +01:00
Nabile Rahmani
3068fa1a62 Namespace does not correspond to file location. 2017-02-16 11:30:31 +01:00
Thomas Müller
e10c5644fe Merge pull request #359 from Damnae/slider_ticks
Add slider ticks.
2017-02-16 10:31:05 +01:00
Dean Herbert
b55d85a5c5
Add MaxScore to correctly account for the maximum attainable score of DrawableHitObjects. 2017-02-16 17:33:13 +09:00
Dean Herbert
8bf3902cbd
Add the concept of nested DrawableHitObjects.
- Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
- Removed SliderTicksLayer abstraction for now.
2017-02-16 17:02:36 +09:00