1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 06:52:55 +08:00
Commit Graph

15614 Commits

Author SHA1 Message Date
Dean Herbert
8907ce3f63 Automatically fix invalid pairing dates on load (based on contained groupings) 2018-12-14 18:11:04 +09:00
Dean Herbert
f083b18663 Update in line with framework changes 2018-12-14 17:59:42 +09:00
Dean Herbert
51cb7dc774 Merge branch 'tournament-tools' of https://github.com/peppy/osu into tournament-tools 2018-12-05 13:08:55 +09:00
Dean Herbert
61ca79a8b2 Add conditional match support 2018-12-02 22:36:21 +09:00
Dean Herbert
03e416cda9 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-12-01 10:03:31 +09:00
Dean Herbert
056025c5c2 Fix handling of API responses 2018-12-01 09:50:11 +09:00
Dean Herbert
8f1d53400e
Merge pull request #3792 from peppy/fix-score-datatypes
Fix some data types on ScoreInfo
2018-12-01 09:26:18 +09:00
Dean Herbert
f9fb6dc39b Remove health from ScoreInfo 2018-12-01 00:17:05 +09:00
Dean Herbert
af3ef9a089 Fix some data types on ScoreInfo 2018-11-30 20:43:38 +09:00
Dean Herbert
cc488fe275
Merge pull request #3791 from peppy/fix-d-rank
Revert "Fix D rank displaying as F"
2018-11-30 20:05:35 +09:00
Dean Herbert
2860f5a5cd Revert "Fix D rank displaying as F"
This reverts commit 17b2a4ca0d.
2018-11-30 20:03:21 +09:00
Dean Herbert
bf4a544a12
Merge pull request #3790 from peppy/fix-d-rank
Fix D rank displaying as F
2018-11-30 19:56:19 +09:00
Dean Herbert
3921834cfd
Merge branch 'master' into fix-d-rank 2018-11-30 19:49:36 +09:00
Dean Herbert
97c4ee3342
Merge pull request #3785 from smoogipoo/local-score-saving
Save local scores when completing beatmaps
2018-11-30 19:49:25 +09:00
Dean Herbert
b985d19078
Merge branch 'master' into local-score-saving 2018-11-30 19:48:00 +09:00
Dean Herbert
397814698e
Merge pull request #3786 from smoogipoo/local-score-display
Display local scores in the leaderboard
2018-11-30 19:47:25 +09:00
Dean Herbert
17b2a4ca0d Fix D rank displaying as F 2018-11-30 19:46:40 +09:00
Dean Herbert
80f92c404a
Merge branch 'master' into local-score-display 2018-11-30 19:15:59 +09:00
Dean Herbert
5bd7ae5f26
Merge branch 'master' into local-score-saving 2018-11-30 18:59:09 +09:00
smoogipoo
f80a30cba4 Fix null being serialized 2018-11-30 18:52:31 +09:00
smoogipoo
b1c5b43767 Fix post-rebase errors 2018-11-30 18:46:47 +09:00
smoogipoo
10ed09521c Add leaderboard display for local scores 2018-11-30 18:40:53 +09:00
smoogipoo
4144f4bd2f Fix duplicates not being ignored if hash is null 2018-11-30 18:40:06 +09:00
smoogipoo
795933d1a1 CreateScoreInfo -> CreateScore 2018-11-30 18:32:08 +09:00
smoogipoo
a6b0e35b2d Fix post-rebase issues 2018-11-30 18:31:54 +09:00
smoogipoo
a8ad7d4670 Add silent import parameter 2018-11-30 18:27:13 +09:00
smoogipoo
d07a724970 Only allow replay screen changes in menu + songselect 2018-11-30 18:25:54 +09:00
smoogipoo
4c1abdcd8c Save score upon map completion 2018-11-30 18:25:14 +09:00
smoogipoo
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
smoogipoo
ed67984638 Don't load player if score has no replay data 2018-11-30 18:24:35 +09:00
Dean Herbert
f517f98ae7
Merge pull request #3784 from smoogipoo/scoredatabase
Add a ScoreManager + score-related tables to the database
2018-11-30 18:23:26 +09:00
Dean Herbert
059e9e180b Apply review 2018-11-30 18:07:15 +09:00
Dean Herbert
9718e476c7 Add license header 2018-11-30 18:07:15 +09:00
Dean Herbert
2dd5dad7c5 Remove empty lines 2018-11-30 18:07:15 +09:00
Dean Herbert
00c5ea28c7 Update migrations in line with hash change 2018-11-30 18:07:15 +09:00
Dean Herbert
66e43e6ed9 Update hashing method in line with master 2018-11-30 17:36:06 +09:00
Dean Herbert
be37f3c328 Rename NoModMod 2018-11-30 17:35:13 +09:00
Dean Herbert
aa7a665317 Merge remote-tracking branch 'upstream/master' into scoredatabase 2018-11-30 17:20:23 +09:00
Dean Herbert
d97a15a504 Add IMod and change ShortenedName to Acronym 2018-11-30 17:16:00 +09:00
Dean Herbert
84f3d4f48d Fix nullref 2018-11-30 17:15:32 +09:00
Dean Herbert
10095d09c3 Fix test namespace 2018-11-30 17:02:01 +09:00
Dan Balasescu
a47a951ccd
Merge pull request #3776 from peppy/fix-skin-duplication
Fix skin duplication
2018-11-30 16:56:42 +09:00
Dean Herbert
e82ad3539b Move JsonIgnore specification to interface 2018-11-30 16:39:25 +09:00
Dean Herbert
58293c3eae Re-migrate 2018-11-30 16:35:57 +09:00
Dean Herbert
3727955911 Refactors/renames 2018-11-30 16:35:45 +09:00
Dan Balasescu
f496bdba69
Merge branch 'master' into fix-skin-duplication 2018-11-30 16:20:03 +09:00
Dan Balasescu
abc82dd480
Merge pull request #3788 from peppy/editor-keyboard-seek
Add support for keyboard seeking in the editor
2018-11-30 16:13:10 +09:00
smoogipoo
bc3fcb87b7 Use input events rather than scene graph traversals 2018-11-30 15:47:55 +09:00
Dean Herbert
831cd3ed59 ScoreInfo scoreInfo -> ScoreInfo score 2018-11-30 15:18:52 +09:00
Dan Balasescu
e83f6707bf
Merge branch 'master' into editor-keyboard-seek 2018-11-30 15:17:06 +09:00