1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 21:07:33 +08:00
Commit Graph

13908 Commits

Author SHA1 Message Date
Dean Herbert
270dc2d1be
Merge branch 'master' into judgement-rework 2018-08-14 13:16:16 +09:00
Dean Herbert
da01501a1c
Merge pull request #3217 from smoogipoo/fix-samples
Fix new control points with same start time not replacing existing ones
2018-08-14 11:55:23 +09:00
smoogipoo
b8824a41b5 Fix certain control points not being replaced 2018-08-14 11:44:53 +09:00
Dan Balasescu
48b0b1593f
Merge pull request #3179 from peppy/direct-list-view
Reduce animations of osu!direct list mode
2018-08-08 15:57:03 +09:00
smoogipoo
2a5b9f79ff Indent 2018-08-08 15:49:27 +09:00
smoogipoo
ee0cefdd5b Merge remote-tracking branch 'origin/master' into direct-list-view 2018-08-08 15:48:34 +09:00
Dan Balasescu
0d8f60bff2
Merge pull request #3188 from peppy/fix-mod-reselection
Fix mod re-selection
2018-08-08 15:45:28 +09:00
smoogipoo
bfbe00e6ec Remove multiple caching 2018-08-08 15:38:09 +09:00
Dean Herbert
b2ab46e312
Merge branch 'master' into fix-mod-reselection 2018-08-08 12:46:59 +09:00
Dean Herbert
4453b5faca Cache mods at PlaySongSelect 2018-08-08 12:43:08 +09:00
Dean Herbert
a64010c5a8
Merge pull request #3187 from smoogipoo/fix-mania-scroll
Fix mania scroll direction not being initially set correctly
2018-08-08 12:29:36 +09:00
Dean Herbert
dc78049839 Add test for propagation of direction through mania stack 2018-08-08 12:21:44 +09:00
smoogipoo
31146fbc01 Add anchor/origin tests 2018-08-08 11:28:55 +09:00
smoogipoo
6379c70a68 Add some ticks 2018-08-08 11:28:44 +09:00
Dean Herbert
70ce9da321
Merge branch 'master' into judgement-rework 2018-08-07 18:09:06 +09:00
Dean Herbert
4cb7063801 Add automated testing of mod preservation/removal 2018-08-07 16:45:18 +09:00
Dean Herbert
7b8bd7f21c Fix mod selection not restoring when re-entering song select 2018-08-07 14:49:44 +09:00
smoogipoo
f719b9bef5 Fix mania scroll direction not being read from database 2018-08-07 12:20:24 +09:00
Dean Herbert
8ee38460d3 Bump squirrel version with bugfix 2018-08-07 02:01:31 +09:00
Dean Herbert
6b091860b9
Merge pull request #3185 from peppy/update-stuff
Update framework and squirrel
2018-08-07 01:21:03 +09:00
Dean Herbert
7233e863db Update framework 2018-08-07 01:07:50 +09:00
Dean Herbert
5d573ae176 Update squirrel 2018-08-07 01:00:06 +09:00
Dan Balasescu
cd4265bb33
Merge pull request #3165 from peppy/add-loading-animation
Add loading animation to player loader
2018-08-06 13:42:15 +09:00
Dan Balasescu
12b99acb2b
Merge branch 'master' into add-loading-animation 2018-08-06 13:06:51 +09:00
smoogipoo
5c4c2dff09 Fix strong hits not being visualised 2018-08-06 13:01:27 +09:00
smoogipoo
60c94a8ea3 Fix ScoreProcessor.ApplyBeatmap never being called 2018-08-06 12:42:54 +09:00
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework 2018-08-06 12:30:46 +09:00
smoogipoo
2a54b5b78d ResetResult -> RevertResult 2018-08-06 12:29:22 +09:00
smoogipoo
c48a4d9993 Add exception 2018-08-06 12:29:12 +09:00
smoogipoo
35b5aeb99a Fix missed rename 2018-08-06 12:23:08 +09:00
smoogipoo
3a7488767c Make HitObject not store the judgement 2018-08-06 11:50:18 +09:00
smoogipoo
0d6a8a2bf5 More xmldocs 2018-08-06 11:31:54 +09:00
smoogipoo
741ec0021e Rename more judgement-related methods to "result" 2018-08-06 11:31:46 +09:00
smoogipoo
ab642b563f CreateJudgementResult -> CreateResult 2018-08-06 11:07:41 +09:00
smoogipoo
754f3c8621 Move result creation to load(), add exceptions 2018-08-06 11:07:05 +09:00
smoogipoo
b35817c877 More xmldocs to hitobject/drawablehitobject 2018-08-06 10:55:38 +09:00
smoogipoo
5fd4ed2f4e Rename judgement-related methods/events + commenting 2018-08-06 10:55:25 +09:00
Dean Herbert
e2253d38ad
Merge pull request #2602 from AlFasGD/mania-mask-container
Initial implementation of osu!mania editor framework
2018-08-06 04:29:34 +09:00
Dean Herbert
0c920fe486
Merge branch 'master' into mania-mask-container 2018-08-06 04:22:21 +09:00
Dean Herbert
6d6fea47ab Reduce animations of osu!direct list mode
The panels' content was flying around and felt really shocking. This fixes elements in place to provide a better experience.
2018-08-05 14:36:09 +09:00
Dan Balasescu
78eabce35a
Merge pull request #3164 from peppy/fix-fade-discrepancies
Fix discrepancies in how elements of play mode fade when restarting/e…
2018-08-04 00:31:51 +09:00
Dan Balasescu
1981b94e32
Merge branch 'master' into fix-fade-discrepancies 2018-08-04 00:21:48 +09:00
Dan Balasescu
c3060e18a4
Merge pull request #3161 from peppy/scroll-chat-on-message
Scroll chat to end of buffer when posting a new message
2018-08-04 00:21:17 +09:00
Dean Herbert
808754a191
Merge branch 'master' into fix-fade-discrepancies 2018-08-03 21:50:03 +09:00
Dean Herbert
042e4e3966
Merge branch 'master' into add-loading-animation 2018-08-03 21:50:02 +09:00
Dean Herbert
46b3ba9edb
Merge branch 'master' into scroll-chat-on-message 2018-08-03 21:50:00 +09:00
Dean Herbert
770f96d871
Merge pull request #3171 from peppy/update-framework
Update framework
2018-08-03 21:49:47 +09:00
Dean Herbert
8d98826f69 Update framework 2018-08-03 21:17:17 +09:00
Dean Herbert
fc8526d8ba
Merge branch 'master' into scroll-chat-on-message 2018-08-03 20:09:54 +09:00
Dean Herbert
b4ef3dd4dd Add LocalMessage 2018-08-03 20:03:43 +09:00