Dean Herbert
|
0afe33d32f
|
Merge pull request #2491 from smoogipoo/beatmap-conversion-rework
Rework beatmap conversion process to use IBeatmap
|
2018-05-10 20:08:37 +08:00 |
|
Dean Herbert
|
8a6ef0dabb
|
Merge branch 'master' into beatmap-conversion-rework
|
2018-05-10 19:10:07 +08:00 |
|
Dean Herbert
|
7fd38e4780
|
Merge pull request #2490 from smoogipoo/i-beatmap
Migrate the game to use an IBeatmap interface
|
2018-05-10 19:07:17 +08:00 |
|
Dean Herbert
|
9e26bcd571
|
Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
|
2018-05-10 19:51:52 +09:00 |
|
Dean Herbert
|
40c1b24b3d
|
Move IBeatmap to its own file
|
2018-05-10 19:51:40 +09:00 |
|
Dean Herbert
|
2bb671cf9e
|
Merge pull request #2516 from peppy/update-framework
Update framework
|
2018-05-10 17:18:39 +08:00 |
|
Dean Herbert
|
c7443e6b3b
|
Update framework
|
2018-05-10 17:52:48 +09:00 |
|
Dean Herbert
|
3504f7393f
|
Merge pull request #2482 from smoogipoo/use-bindable-transforms
Use bindable transforms
|
2018-05-10 13:50:13 +08:00 |
|
Dean Herbert
|
2e9c91c32f
|
Merge branch 'master' into use-bindable-transforms
|
2018-05-10 11:45:29 +08:00 |
|
Dean Herbert
|
aa69e0ef12
|
Merge pull request #2495 from smoogipoo/fix-editor-beatmap-change
Fix beatmap/ruleset being changeable while in the editor
|
2018-05-10 11:45:23 +08:00 |
|
Dean Herbert
|
fff34be814
|
Merge branch 'master' into fix-editor-beatmap-change
|
2018-05-10 11:37:36 +08:00 |
|
Dean Herbert
|
e44faebea6
|
Merge pull request #2501 from smoogipoo/remove-explicit-clock
Remove explicit clock in TestCaseBreakOverlay
|
2018-05-10 11:15:06 +08:00 |
|
Dean Herbert
|
5f5e97220d
|
Merge branch 'master' into remove-explicit-clock
|
2018-05-10 11:06:49 +08:00 |
|
Dan Balasescu
|
3c689359af
|
Merge pull request #2471 from UselessToucan/change_ruleset_via_direct_while_on_scorescreen
Decouple FilterControl.Ruleset from the game-wide ruleset bindable
|
2018-05-09 14:09:54 +09:00 |
|
Dan Balasescu
|
929e8f16df
|
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
|
2018-05-09 14:02:20 +09:00 |
|
smoogipoo
|
c7bc79bce3
|
Remove explicit clock in TestCaseBreakOverlay
|
2018-05-09 12:40:04 +09:00 |
|
Dan Balasescu
|
96baee4e5c
|
Merge pull request #2498 from peppy/update-cfs
Update CodeFileSanity
|
2018-05-08 10:24:21 +09:00 |
|
Dean Herbert
|
c2979a5c48
|
Update CodeFileSanity
|
2018-05-07 22:08:45 +09:00 |
|
smoogipoo
|
674e45d49b
|
Fix beatmap/ruleset being changeable while in the editor
|
2018-05-07 16:32:15 +09:00 |
|
smoogipoo
|
30a3f4f29f
|
Fix not being able to convert beatmaps with 0 hitobjects
|
2018-05-07 15:27:45 +09:00 |
|
Dean Herbert
|
1be1b10059
|
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen
|
2018-05-07 13:32:19 +08:00 |
|
smoogipoo
|
68441f1ef0
|
Output ruleset instantiation info
|
2018-05-07 14:28:30 +09:00 |
|
smoogipoo
|
6867886f4c
|
Give conversion-tested beatmaps a ruleset
|
2018-05-07 14:04:37 +09:00 |
|
smoogipoo
|
7ee8228a37
|
Fix testcases
|
2018-05-07 13:28:01 +09:00 |
|
smoogipoo
|
ad2c2a5fe6
|
Restore star difficulty calculation
|
2018-05-07 12:25:21 +09:00 |
|
smoogipoo
|
268c14813b
|
Fix resharper warnings
|
2018-05-07 11:38:41 +09:00 |
|
smoogipoo
|
e20323b5f6
|
Trim whitespace
|
2018-05-07 11:23:29 +09:00 |
|
smoogipoo
|
794418432f
|
Fix incorrect method name
|
2018-05-07 11:22:25 +09:00 |
|
smoogipoo
|
db3e48c194
|
Rename GetBeatmap() to GetPlayableBeatmap()
|
2018-05-07 10:40:30 +09:00 |
|
smoogipoo
|
9128e64c9a
|
Rename OriginalBeatmap back to Beatmap
|
2018-05-07 10:29:38 +09:00 |
|
smoogipoo
|
7e83c75888
|
Add xmldoc
|
2018-05-07 10:23:32 +09:00 |
|
smoogipoo
|
b68ee39136
|
Reword beatmap conversion error
|
2018-05-07 10:18:47 +09:00 |
|
smoogipoo
|
4ecdea8b2e
|
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
|
2018-05-07 10:17:54 +09:00 |
|
smoogipoo
|
27c8591d48
|
Fix reference to old name
|
2018-05-07 10:07:50 +09:00 |
|
smoogipoo
|
77e661489d
|
Merge branch 'i-beatmap' into beatmap-conversion-rework
|
2018-05-07 10:00:24 +09:00 |
|
smoogipoo
|
20509b1cc2
|
Fix non-IBeatmap usage
|
2018-05-07 09:59:45 +09:00 |
|
smoogipoo
|
1aefd71b65
|
Merge remote-tracking branch 'origin/master' into i-beatmap
|
2018-05-07 09:58:53 +09:00 |
|
smoogipoo
|
f3aa9269ff
|
Fix mania-specific beatmap conversion
|
2018-05-07 09:17:12 +09:00 |
|
Roman Kapustin
|
33e2b91ccc
|
Decouple FilterControl.Ruleset from the game-wide ruleset bindable
|
2018-05-03 22:59:49 +03:00 |
|
smoogipoo
|
2d6b2d10f7
|
Use bindable transforms
|
2018-05-02 18:26:23 +09:00 |
|
Dean Herbert
|
420e50b6da
|
Merge pull request #2479 from peppy/add-net471-dep
Add squirrel dependency on net471
|
2018-05-02 17:00:02 +08:00 |
|
Dean Herbert
|
6ecb09431f
|
Update squirrel path
|
2018-05-02 16:37:44 +08:00 |
|
Dean Herbert
|
e92166b40f
|
Update csproj defaults
|
2018-05-02 16:33:48 +08:00 |
|
Dean Herbert
|
b37acf7510
|
Update squirrel version for net471 prereq support
|
2018-05-02 16:23:48 +08:00 |
|
Dean Herbert
|
8b99a3b8e6
|
Add squirrel dependency on net471
|
2018-05-02 16:23:48 +08:00 |
|
Dean Herbert
|
036e62e2b1
|
Merge pull request #2481 from smoogipoo/revert-useroverlay-change
Revert breaking UserProfileOverlay change
|
2018-05-02 16:19:37 +08:00 |
|
Dan Balasescu
|
9f9447d441
|
Revert "Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed"
This reverts commit 67793845b0.
|
2018-05-02 16:39:00 +09:00 |
|
Dan Balasescu
|
084504134e
|
Merge pull request #2450 from tgi74/replay_ruleset
Fix replays being played in the selected ruleset
|
2018-05-02 15:06:24 +08:00 |
|
Dan Balasescu
|
9f327525a7
|
Merge branch 'master' into replay_ruleset
|
2018-05-02 14:57:02 +08:00 |
|
Dan Balasescu
|
6fe09ee544
|
Merge pull request #2458 from 4ppleCracker/patch-1
Use more inheritance for UserStatus
|
2018-05-02 14:56:46 +08:00 |
|