1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 09:27:23 +08:00
Commit Graph

1285 Commits

Author SHA1 Message Date
Dean Herbert
23938a810b Merge pull request #292 from peppy/general-fixes
Reset the beatmap database when it can't be read, rather than hard failing.
2017-01-23 21:43:52 +09:00
Dean Herbert
3a27178bb1 Merge pull request #289 from UselessToucan/JudgementsCapacity
Specify ScoreProcessor.Judgements.Capacity
2017-01-23 21:40:00 +09:00
Dean Herbert
373d2a0f35 Merge branch 'master' into general-fixes 2017-01-23 21:39:05 +09:00
Dean Herbert
0fcdc7ec11 Merge pull request #291 from peppy/mode-entering
Move Intro logic to OnEntering in line with framework changes.
2017-01-23 21:37:59 +09:00
Dean Herbert
f8da718da8 Update framework. 2017-01-23 21:33:45 +09:00
Dean Herbert
56fe69852d Change beatmap database reset logic to only run a maximum of once. 2017-01-23 18:13:06 +09:00
Dean Herbert
ef8347fe53 Reset the beatmap database when it can't be read, rather than hard failing. 2017-01-23 13:02:03 +09:00
Dean Herbert
ae464fcace Move Intro logic to OnEntering in line with framework changes. 2017-01-20 16:30:24 +08:00
TocoToucan
badc8def9a hitObjectsNumber -> hitObjectCount 2017-01-18 18:51:38 +03:00
Dean Herbert
2025e8ef71 Merge pull request #288 from peppy/hpdisplay
Simple HP display implementation.
2017-01-18 11:18:45 +08:00
Dean Herbert
cd8c9393f3 HP -> Health 2017-01-18 11:08:16 +08:00
TocoToucan
259c0964fd Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations 2017-01-16 23:14:35 +03:00
UselessToucan
b493f359b9 Merge pull request #1 from ppy/master
Update fork
2017-01-16 22:28:36 +03:00
Dean Herbert
ee0b6be84b Merge pull request #266 from kizayoi/master
Add support for old beatmaps
2017-01-16 16:02:22 +08:00
Dean Herbert
a3770adbc5 Merge branch 'master' into hpdisplay 2017-01-16 11:23:54 +08:00
Dean Herbert
4030413291 Merge branch 'refs/heads/SirCmpwn/colors' 2017-01-14 06:52:30 +08:00
Dean Herbert
6d0fe92d33 Update submodules. 2017-01-14 06:49:21 +08:00
Dean Herbert
742dd6f66c Merge pull request #287 from SirCmpwn/implement-disable-mouse
Implement disable mouse buttons
2017-01-14 06:39:09 +08:00
Drew DeVault
e81073695f Implement disable mouse buttons 2017-01-13 17:17:04 -05:00
Drew DeVault
f5f545df62 Refactor OsuColour into injected instance class
Which should allow you to change the color palette in the future for
skinning purposes.
2017-01-12 23:49:05 -05:00
Drew DeVault
fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -05:00
Drew DeVault
c222be05c0 Add Color4.Opacity and OsuColor.Gray 2017-01-10 13:44:40 -05:00
Dean Herbert
1392cdfb9a Hook up naively. 2017-01-10 18:35:27 +08:00
Dean Herbert
7eab50b989 Add basic HP display support. 2017-01-10 16:08:01 +08:00
Drew DeVault
70ecf48ca7 Add central color class
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
2017-01-09 17:20:31 -05:00
柯十六夜
acfbf2e32e Add prefix Online to BeatmapID and BeatmapSetID 2017-01-09 21:05:01 +08:00
Dean Herbert
97c5a2f970 Merge pull request #283 from peppy/general-fixes
General fixes
2017-01-08 21:45:31 +08:00
Dean Herbert
651ea1b0d6 Update resources. 2017-01-08 21:01:48 +08:00
Dean Herbert
8ba5c1c15d Fix not being able to hit two stacked circles by pressing both buttons/keys on the same frame. 2017-01-08 20:52:19 +08:00
Dean Herbert
8bfcfbc276 Update framework. 2017-01-08 20:51:57 +08:00
Dean Herbert
d3397e2cfc Merge pull request #281 from SirCmpwn/custom-dropdowns
Style dropdown to match osu!stable
2017-01-05 15:30:53 +08:00
Drew DeVault
4899d88d19 Update framework 2017-01-05 02:10:05 -05:00
Drew DeVault
b27139c2bd Simplify layout of dropdown menu item 2017-01-05 00:57:19 -05:00
Drew DeVault
af4aeeab09 Update following framework changes 2017-01-04 01:14:25 -05:00
Drew DeVault
a1f8c0df64 Style dropdown to match osu!stable 2017-01-03 23:00:28 -05:00
Dean Herbert
c72e2aefda Merge pull request #280 from huoyaoyuan/fixes
Fix PreferUnicode changing when nothing to play.
2017-01-04 02:14:33 +08:00
Huo Yaoyuan
6690d1bd72 Move logic into updateDisplay. 2017-01-04 02:12:18 +08:00
Huo Yaoyuan
794e4663d8 Fix PreferUnicode changing when nothing to play. 2017-01-04 01:00:08 +08:00
Thomas Müller
5514546293 Merge pull request #219 from huoyaoyuan/test-case
Test case enhancement for key counter
2016-12-29 09:22:07 +01:00
Dean Herbert
81dd02311c Merge pull request #276 from SirCmpwn/issue-template
Add ISSUE_TEMPLATE.md
2016-12-28 13:08:22 +08:00
Drew DeVault
5b32190641 Add ISSUE_TEMPLATE.md 2016-12-28 00:06:45 -05:00
Dean Herbert
59d4814a92 Merge pull request #274 from SirCmpwn/readme-updates
Update README.md
2016-12-28 12:55:34 +08:00
Drew DeVault
00c08cb882 Update README.md 2016-12-24 11:34:30 -05:00
柯十六夜
c940b48bba Merge pull request #1 from kizayoi/support-old-beatmaps
Support old beatmaps
2016-12-21 16:37:23 +08:00
柯十六夜
ff1d44eba5 Merge branch 'master' into support-old-beatmaps 2016-12-21 16:37:10 +08:00
柯十六夜
e578e50721 Add support for old beatmaps 2016-12-21 16:29:57 +08:00
柯十六夜
ef11c3f389 Add default Beatmap ID 2016-12-21 14:47:56 +08:00
柯十六夜
02f6e46105 Add support for v9 beatmaps 2016-12-20 23:56:49 +08:00
柯十六夜
d1f68abab9 Remove unsupported file format 2016-12-20 15:50:50 +08:00
Dean Herbert
561b0928bb Merge pull request #263 from EVAST9919/fixes
Remove unnecessary items from OptionsOverlay
2016-12-20 01:18:51 +09:00