1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 05:02:56 +08:00
Commit Graph

13934 Commits

Author SHA1 Message Date
smoogipoo
4dfb63023f Update with recent changes 2018-08-15 15:49:48 +09:00
smoogipoo
d0c9e2257b Merge remote-tracking branch 'origin/master' into framework-storage-update 2018-08-15 14:54:09 +09:00
Dean Herbert
e9180a0be8
Merge pull request #3223 from smoogipoo/fix-strong-swells
Fix swells possibly being strong hitobjects
2018-08-15 13:25:34 +09:00
Dean Herbert
4832a8ff19
Merge pull request #3220 from smoogipoo/extend-modoverlay
Overflow mod select to account for parallax
2018-08-15 09:37:57 +09:00
Dean Herbert
9cdaefb64b
Merge branch 'master' into extend-modoverlay 2018-08-15 09:23:44 +09:00
smoogipoo
aa3f6337a2 Add comment 2018-08-15 09:14:07 +09:00
smoogipoo
7c3556baf8 Throw exception when Swell.IsStrong is set 2018-08-15 09:12:29 +09:00
Dean Herbert
7bb22ce2b9
Merge pull request #3222 from smoogipoo/fix-rewinding
Fix hitobject results not rewinding
2018-08-15 09:07:31 +09:00
Dean Herbert
607769c9ce
Merge branch 'master' into fix-rewinding 2018-08-15 08:45:34 +09:00
Dean Herbert
a1fa235600
Merge branch 'master' into fix-strong-swells 2018-08-15 00:23:51 +09:00
Dean Herbert
c2fe0241e3
Merge pull request #3221 from smoogipoo/fix-variables-parsing
Fix storyboard variables not supporting prefixes/suffixes
2018-08-14 21:41:53 +09:00
smoogipoo
8be5a606bf Fix swells possibly being strong hitobjects 2018-08-14 18:33:07 +09:00
smoogipoo
e04b2f4fa9 Fix hitobject results not rewinding 2018-08-14 18:31:32 +09:00
smoogipoo
e360985d73 Replace variables into the entire line 2018-08-14 18:15:09 +09:00
smoogipoo
f69bc23ab8 Overflow mod select to account for parallax 2018-08-14 17:26:25 +09:00
Dean Herbert
364c0d580a
Merge pull request #3218 from smoogipoo/fix-ruleset-change
Fix crash due to mods not being reset prior to ruleset changing
2018-08-14 14:56:53 +09:00
Dean Herbert
5112f9b69f
Merge branch 'master' into fix-ruleset-change 2018-08-14 14:48:09 +09:00
Dean Herbert
adaffc245f
Merge pull request #3166 from smoogipoo/judgement-rework
Rework judgements and judgement results
2018-08-14 14:44:13 +09:00
smoogipoo
b045f5c9b6 Adjust filename 2018-08-14 14:32:06 +09:00
smoogipoo
1a35506386 Cleanup strong hit construction 2018-08-14 14:29:49 +09:00
smoogipoo
732dfde8ed DrawableStrongHandler -> DrawableNestedStrongHit 2018-08-14 14:28:40 +09:00
smoogipoo
7971d06df1 Remove AlwaysPresent 2018-08-14 14:27:47 +09:00
smoogipoo
78258e2fe2 Prefix some methods with "Test" 2018-08-14 14:19:26 +09:00
smoogipoo
15bd7e4f1f Test that changing ruleset resets mods 2018-08-14 14:18:46 +09:00
smoogipoo
970aa811bd Fix mods not being reset prior to ruleset changing 2018-08-14 13:19:50 +09:00
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