1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 09:42:54 +08:00
Commit Graph

15873 Commits

Author SHA1 Message Date
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
Dan Balasescu
51543d034b
Merge pull request #3787 from peppy/editor-space-bar
Toggle pause in editor with spacebar
2018-11-30 15:16:53 +09:00
Dean Herbert
705ef5e3ac Fix hash function 2018-11-30 15:10:56 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
Dean Herbert
ab621bd873 Toggle pause in editor with spacebar 2018-11-30 14:58:09 +09:00
Dean Herbert
0ee5a5bdb4 Add support for keyboard seeking in the editor 2018-11-30 14:57:25 +09:00
Dean Herbert
02ef187c04
Merge pull request #3736 from smoogipoo/inter-column-movements
Implement inter-column note movements
2018-11-30 14:48:57 +09:00
smoogipoo
64bb27be5d Add scoreinfo tables 2018-11-30 14:48:31 +09:00
smoogipoo
69370c53ca Fix rank not being read 2018-11-30 14:48:25 +09:00
Dean Herbert
b3a55a26d7
Merge branch 'master' into inter-column-movements 2018-11-30 14:31:44 +09:00
Dean Herbert
7543af07dd
Remove weird reference 2018-11-30 14:30:50 +09:00
smoogipoo
2bedffc00f Add tests 2018-11-30 14:27:34 +09:00
smoogipoo
690a1f0765 Fix score statistics not being serialised 2018-11-30 14:27:34 +09:00
smoogipoo
5530736541 Cleanup mods string 2018-11-30 14:27:34 +09:00
smoogipoo
b673eb79b1 Fix local score infos conflicting 2018-11-30 14:27:34 +09:00
smoogipoo
aa7f66b24a Fix crash when loading scores with no mods 2018-11-30 14:27:34 +09:00
Dean Herbert
a1666fb7fa MouseDownPosition -> DragPosition 2018-11-30 14:21:20 +09:00
Dean Herbert
d64275b489
Merge pull request #3718 from Scotsoo/keypad-enter
Allowing keypad enter to be used along with normal enter
2018-11-30 13:08:13 +09:00
Dean Herbert
5254b07680 Merge remote-tracking branch 'upstream/master' into inter-column-movements 2018-11-30 11:57:53 +09:00
Ivan Pavluk
743598a1ac Decrease taiko swell HP drain 2018-11-30 01:33:04 +07:00
Ivan Pavluk
6b07d4581a Fixed too strong HP drain 2018-11-30 01:07:15 +07:00
Ivan Pavluk
4184f17709 ...Revert AffectsHP->AffectsHp, add HP abbrev 2018-11-29 23:12:02 +07:00
Ivan Pavluk
13a166a645 rename TaikoJudgement.AffectsHP to AffectsHp 2018-11-29 22:26:23 +07:00
Ivan Pavluk
d30ab4f77c fixed whitespace 2018-11-29 22:12:01 +07:00
Ivan Pavluk
2ca9864301 Fixed taiko swell hp and scoring 2018-11-29 22:05:13 +07:00
Jack Scotson
e11b2218cb
Merge branch 'master' into keypad-enter 2018-11-29 13:51:07 +00:00
Ivan Pavluk
35d57f74bf
Merge branch 'master' into master 2018-11-29 20:42:38 +07:00
Dean Herbert
e0854254e7
Merge pull request #3738 from smoogipoo/hold-note-placement
Implement hold note placement
2018-11-29 21:53:26 +09:00
Ivan Pavluk
6a8e99db17
Merge branch 'master' into master 2018-11-29 19:22:30 +07:00
Dean Herbert
085acf29a0 Fix blueprints behaving incorrectly 2018-11-29 19:29:36 +09:00
Dean Herbert
ab0ce46362 Make hold note placement blueprints look a bit more blueprint-y 2018-11-29 18:13:15 +09:00
Dean Herbert
132d334e15 Merge branch 'master' into hold-note-placement 2018-11-29 17:02:55 +09:00
Dean Herbert
08c8d7adb3
Merge pull request #3711 from smoogipoo/note-placement
Implement mania note placement
2018-11-29 15:13:48 +09:00
Dean Herbert
7ffc597a8e Fix one-frame issues 2018-11-29 14:55:20 +09:00
Dean Herbert
d1c976880c Fix incorrect margin/spacing handling 2018-11-29 14:15:28 +09:00
Dean Herbert
3d46ac7d35 Remove unnecessary high frequency input 2018-11-29 13:21:11 +09:00