1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 16:22:56 +08:00
Commit Graph

11061 Commits

Author SHA1 Message Date
Shawdooow
94f81a1784 fix 2018-01-03 10:04:36 -05:00
Shawdooow
9122eaa28e
Merge branch 'master' into approach-rate 2018-01-03 10:02:55 -05:00
Shawdooow
23f3cb6467 address review 2018-01-03 10:01:28 -05:00
ANDY840119-PC\andy840119
409664e4dc White space needs to be trimmed 2018-01-03 23:50:52 +09:00
ANDY840119-PC\andy840119
aadafae8cb 1. fix TestCaseManiaHitObjects broken
2. add (4+4) (2+4+2) (1+8+1) column stages step in TestCaseManiaPlayfield
2018-01-03 23:47:05 +09:00
ANDY840119-PC\andy840119
a855a21ccb group -> stage 2018-01-03 23:04:51 +09:00
Endrik Tombak
1a8471bc37 Replace not Filtered with Visible 2018-01-03 15:58:09 +02:00
ANDY840119-PC\andy840119
5326f71ed9 fix some error that smoogipoo says 2018-01-03 22:58:08 +09:00
Endrik Tombak
843e9c53c0 Add test cases for new randomizer behaviour 2018-01-03 15:38:43 +02:00
Dan Balasescu
227cae3ff8
Merge pull request #1844 from james58899/fix-storyboard-path
Fix storyboard file paths on Linux/macOS using incorrect path separators
2018-01-03 22:34:19 +09:00
ANDY840119-PC\andy840119
edb1401f00 Merge branch 'master' of https://github.com/andy840119/osu 2018-01-03 22:07:06 +09:00
smoogipoo
823a430d30 Nothing to see here, move along 2018-01-03 22:02:54 +09:00
ANDY840119-PC\andy840119
ee13df94fc Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-01-03 22:02:50 +09:00
Aergwyn
1ce6219293 remove unnecessary override 2018-01-03 13:55:24 +01:00
為什麼
9ecbb5d604
Merge branch 'master' into master 2018-01-03 21:55:23 +09:00
smoogipoo
da5bc959ad Fix testcase 2018-01-03 21:46:39 +09:00
smoogipoo
333e1867ab Implement osu!mania keymods
ScoreMultiplier not currently working - that's a more involved change that requires the aforementioned "BeatmapAttributes" changes.
2018-01-03 21:27:32 +09:00
smoogipoo
a4d05e5102 Implement interface on ManiaKeyMod for now 2018-01-03 21:26:36 +09:00
Dean Herbert
3c06318521 Improve the look of hyperdash fruit 2018-01-03 20:55:52 +09:00
Dean Herbert
b03cbaca77 Add back random rotation 2018-01-03 20:55:44 +09:00
Dean Herbert
9bde8d3da1 Move combo colouring to test case 2018-01-03 20:52:01 +09:00
Endrik Tombak
ce156098f6 Merge branch 'fix-randomizer' of https://github.com/LittleEndu/osu into fix-randomizer 2018-01-03 12:33:43 +02:00
Endrik Tombak
969fa65c42 Merge branch 'master' of https://github.com/ppy/osu into fix-randomizer 2018-01-03 12:31:59 +02:00
Endrik
35af5d1ce6
Merge branch 'master' into fix-randomizer 2018-01-03 12:25:07 +02:00
Dean Herbert
4ee845fea8 Adjust border thickness and fade out rate of border 2018-01-03 19:15:25 +09:00
smoogipoo
b68daaeb4b Group -> Stage 2018-01-03 19:13:42 +09:00
smoogipoo
6d253fd33c Add a way to adjust the conversion process with mods 2018-01-03 19:06:20 +09:00
james58899
89fe567496
use FileSafety.PathSanitise 2018-01-03 17:57:24 +08:00
smoogipoo
bd171926d6 Remove AvailableColumns from ManiaRulesetContainer
Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.
2018-01-03 18:44:25 +09:00
Dean Herbert
b137c3b2ca Adjust ticks size 2018-01-03 18:35:43 +09:00
Dean Herbert
921ca6956d Improve fruit visuals 2018-01-03 18:26:54 +09:00
Dean Herbert
cf1f84cc32 Give fruit a border 2018-01-03 16:32:58 +09:00
Dean Herbert
fd34b36e1a Add fruit drawable testcase 2018-01-03 16:32:09 +09:00
Dean Herbert
02131d75d4 Let fruits know what index they are in the beatmap to draw a visual representation 2018-01-03 16:31:57 +09:00
Aergwyn
d94c313947 fix slider follow circle instantly disappearing on slider ends 2018-01-03 08:13:58 +01:00
Dean Herbert
31865b4d96 Rename conflicting variable 2018-01-03 15:12:27 +09:00
Dean Herbert
c92345cf21 Give fruit a border 2018-01-03 14:46:52 +09:00
Dean Herbert
d72bbf037d
Merge pull request #1832 from peppy/change-audio-settings-icon
Change icon for audio settings
2018-01-03 14:42:39 +09:00
Dean Herbert
532c455f92
Merge branch 'master' into change-audio-settings-icon 2018-01-03 14:34:21 +09:00
Dean Herbert
494b1893e9
Merge pull request #1831 from peppy/fix-import-context-state
Fix errors on import
2018-01-03 14:34:05 +09:00
Dan Balasescu
7ba59d9d56
Merge branch 'master' into fix-import-context-state 2018-01-03 14:21:04 +09:00
Dan Balasescu
b80a393bac
Merge pull request #1820 from peppy/fix-play-song-select-tests
Fix song select dummy beatmap once and for all
2018-01-03 14:21:00 +09:00
Dan Balasescu
2a6068f8e7
Merge branch 'master' into fix-play-song-select-tests 2018-01-03 14:12:49 +09:00
Dan Balasescu
267e624e8c
Merge pull request #1837 from peppy/fix-testcase-performance
Fix TestCasePerformancePoints binding to global beatmap
2018-01-03 14:12:36 +09:00
Dan Balasescu
e6df965da7
Merge branch 'master' into fix-testcase-performance 2018-01-03 14:04:34 +09:00
Dan Balasescu
faa9ecd733
Merge pull request #1817 from peppy/large-texture-store
Create a LargeTextureStore for cached (but not atlased) global textures
2018-01-03 14:04:29 +09:00
Dan Balasescu
262a7f7d19
Merge branch 'master' into large-texture-store 2018-01-03 13:56:39 +09:00
Dan Balasescu
5a4500939b
Merge pull request #1811 from peppy/disable-unimplemented-mods
Clearly mark unimplemented mods and make them non-selectable
2018-01-03 13:56:26 +09:00
Dan Balasescu
d167663340
Merge branch 'master' into large-texture-store 2018-01-03 13:50:49 +09:00
Dean Herbert
31b875b7cd Add test for unranked mod using mania random 2018-01-03 13:42:09 +09:00