1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 06:02:55 +08:00
Commit Graph

3476 Commits

Author SHA1 Message Date
Dean Herbert
1942ef9e8f
Fix merge fail. 2017-04-06 16:06:02 +09:00
Dean Herbert
4783d17d94 Merge branch 'master' into better-hitsounds 2017-04-06 16:00:56 +09:00
smoogipooo
cec8bca78a Implement IJsonSerializable, BeatmapInfo IJsonSerializable. 2017-04-06 15:54:50 +09:00
Dean Herbert
0a8d63ead8 Merge pull request #562 from EVAST9919/pause_buttons_refactor
PauseOverlay/FailOverlay refactor
2017-04-06 15:47:57 +09:00
Dean Herbert
7c63c8394b
Remove unnecessary depth setting. 2017-04-06 15:36:03 +09:00
Dean Herbert
a18367454d
InGameOverlay -> MenuOverlay. 2017-04-06 15:34:52 +09:00
Dean Herbert
856696b17e
Fix incorrect verbatim strings. 2017-04-06 15:31:21 +09:00
Dean Herbert
6285f3eea8 Merge branch 'master' into pause_buttons_refactor 2017-04-06 15:00:48 +09:00
smoogipooo
37129bf03d Make combo be changed by the base ScoreProcessor. 2017-04-06 14:37:21 +09:00
Dean Herbert
bb65d2e3d3 Merge pull request #580 from EVAST9919/hud_visibility
HudOverlay visibility
2017-04-06 14:27:50 +09:00
Dean Herbert
2bb99eac72 fix typo 2017-04-06 14:27:23 +09:00
Dean Herbert
5fa0d9f6f1
Update CodeFileSanity. 2017-04-06 13:58:32 +09:00
smoogipooo
98630dd06c Fix combo calculations. 2017-04-06 13:46:26 +09:00
smoogipooo
d87a65f19e Fix accuracy calculations. 2017-04-06 13:44:43 +09:00
Dean Herbert
efe82ef88c Merge branch 'master' into hud_visibility 2017-04-06 13:40:10 +09:00
Dan Balasescu
0acf5b45b1 Merge pull request #591 from peppy/taiko-wtf
taiko improvements
2017-04-06 13:23:25 +09:00
Dean Herbert
18ff8efd46
Mark TODO for BeatmapVersion. 2017-04-06 13:15:33 +09:00
Dean Herbert
f193af2a2a
Add better defaults for BaseDifficulty. 2017-04-06 13:15:21 +09:00
Dean Herbert
c50960af63
Add better defaults for ControlPoint. 2017-04-06 13:15:12 +09:00
Dean Herbert
042aa787a5
Fix typo. 2017-04-06 13:14:52 +09:00
smoogipooo
e299d7286e Update framework + fix TestCaseTaikoHitObjects. 2017-04-06 12:52:56 +09:00
Dan Balasescu
326baae615 Merge branch 'master' into taiko-wtf 2017-04-06 12:30:44 +09:00
Dan Balasescu
7c57ae3ae1 Merge pull request #593 from peppy/general-fixes
Fix crash on changing play mode too early.
2017-04-06 12:30:31 +09:00
smoogipooo
982dbb5bba Cleanup + bow down to resharper. 2017-04-06 12:27:35 +09:00
smoogipooo
73e2ddaf26 Revert DrawableHitObject changes, make them less conflicting. 2017-04-06 12:24:17 +09:00
smoogipooo
4cc309e5a7 Make hit sounds into consts. 2017-04-06 12:14:06 +09:00
smoogipooo
c65ab5b6f1 General cleanup. 2017-04-06 11:56:19 +09:00
smoogipooo
2a16eafe8f Fix assertions. 2017-04-06 11:54:05 +09:00
smoogipooo
acfcd30cc6 Simplify lambda. 2017-04-06 11:51:04 +09:00
smoogipooo
5beab4c43d Absolute default bank should be normal. 2017-04-06 11:48:48 +09:00
smoogipooo
c73d6a52ec Add a few comments. 2017-04-06 11:47:54 +09:00
smoogipooo
eb82a4c090 Back to using SampleInfo + fix taiko beatmap conversion. 2017-04-06 11:41:16 +09:00
Dean Herbert
863dc44c4d
Some minor improvements. 2017-04-06 09:57:34 +09:00
Dean Herbert
8354fb5eb5
Fix judgements being constructed too late. 2017-04-06 09:57:12 +09:00
Dean Herbert
5f79df3697
Fix lifetimes being set too late. 2017-04-06 09:57:11 +09:00
smoogipooo
e903241c7b Implement sample + addition sample reading from hit objects. 2017-04-06 09:43:47 +09:00
Andrey Zavadskiy
0946e42363 removed useless stuff 2017-04-05 22:51:43 +03:00
Andrey Zavadskiy
6a510097df InGameOverlay fixes 2017-04-05 22:36:03 +03:00
smoogipooo
1ef465716d Proper legacy timing point parsing. 2017-04-05 21:59:40 +09:00
smoogipooo
d607207b69 Ability to contain multiple sample banks. Get default bank name from control point. 2017-04-05 21:59:07 +09:00
smoogipooo
8d720e39c6 Going forward, explicit ToLower should not be needed. 2017-04-05 21:39:09 +09:00
smoogipooo
2d8239a3f7 Re-implement the SampleBank/Sample structure. No parsing support yet. 2017-04-05 21:34:28 +09:00
Dean Herbert
8d16e1efa2
Update framework. 2017-04-05 17:42:56 +09:00
Dean Herbert
4aafc172ca
Allow playfield to specify whether it has a cursor or not. 2017-04-05 17:38:57 +09:00
Dean Herbert
4b1588a21d
Fix correct mode filter not being applied when first entering song select. 2017-04-05 17:33:19 +09:00
Dean Herbert
8173d01d78
Fix crash on changing play mode too early. 2017-04-05 17:26:45 +09:00
Dean Herbert
3b3455afb3
Fix incorrect ScrollTime calculation. 2017-04-05 16:51:21 +09:00
Dean Herbert
a4cc7fc6af
Remove unused velocity variables. 2017-04-05 16:44:45 +09:00
Dean Herbert
9ac18230cc
Only apply taiko LegacyTimingInfo to LegacyBeatmaps. 2017-04-05 16:31:15 +09:00
Dean Herbert
87b8f8ef6e
Fix incorrect relative mapping for CirclePiece's content. 2017-04-05 16:28:37 +09:00