a502ff2c87
Fix post-merge issues.
2017-03-14 12:47:29 +09:00
879a78156d
Merge branch 'master' into mod_application
2017-03-14 12:38:55 +09:00
6ebd88060a
Simplify foreach.
2017-03-14 12:38:30 +09:00
bc5912eab5
Applyable -> Applicable.
2017-03-14 12:32:31 +09:00
0da950beac
Fix KeyCounter M1 M2 display.
2017-03-14 12:31:09 +09:00
98f13be7ca
Merge pull request #472 from peppy/general-fixes
...
Update framework.
2017-03-14 12:12:02 +09:00
1eacafc7b4
Merge branch 'master' into general-fixes
2017-03-14 12:02:24 +09:00
9eaec6945f
Update resources.
2017-03-14 12:02:06 +09:00
4fa037c0b2
Update framework.
2017-03-14 12:01:58 +09:00
ba10c3a8db
Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
...
This reverts commit 6f20473e65c76a495d3d
2017-03-14 11:46:34 +09:00
29eeebefb0
Merge pull request #474 from huoyaoyuan/fixes
...
Fixes
2017-03-14 09:40:02 +09:00
e1bd168c16
Remaining GameMode -> Screen.
2017-03-14 07:22:46 +08:00
3913a0a9ee
Fix removal of the last one beatmap.
2017-03-14 05:35:58 +08:00
6bd9e3cac1
+Score ranks
2017-03-13 18:34:43 -03:00
14a22f032f
Fix beatmap panel removal.
2017-03-14 04:35:43 +08:00
db104d04d3
Use AutoGenerateBindingRedirects instead of explicit app.config.
2017-03-14 03:20:33 +08:00
74eddc768a
Random diff
2017-03-13 13:02:56 -03:00
8e90e05f23
Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static
2017-03-13 12:31:46 -03:00
2756d5f09f
Merge branch 'master' into mod_application
2017-03-13 23:00:11 +09:00
980807d91e
Fix post-merge issues.
2017-03-13 22:33:41 +09:00
c51e97e8cc
Merge pull request #471 from smoogipooo/beatmap_conversion
...
Beatmap conversion
2017-03-13 22:17:22 +09:00
b2981fb729
Merge branch 'master' into mod_application
2017-03-13 22:15:26 +09:00
442a2c97db
Merge conflicts
2017-03-13 09:44:22 -03:00
dbc8d513f9
Merge https://github.com/ppy/osu into leaderboards
2017-03-13 09:36:16 -03:00
9912f5f9e1
Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore
2017-03-13 09:33:25 -03:00
842f938439
General fixes.
2017-03-13 21:05:34 +09:00
6f20473e65
Merge pull request #441 from tacchinotacchi/archive-reader
...
Refactor ArchiveReader
2017-03-13 19:46:01 +09:00
c84a9d56f5
Fix namespace, comply with naming rules
2017-03-13 11:36:21 +01:00
caa6e9c82b
General improvements
2017-03-13 11:29:24 +01:00
f50e0bbf3c
Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.
2017-03-13 19:15:25 +09:00
971d8eb7c5
Merge remote-tracking branch 'upstream/master' into archive-reader
2017-03-13 10:56:31 +01:00
14a6129675
Merge branch 'master' into roompanel
2017-03-13 16:41:14 +09:00
35ddca78f5
Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter).
2017-03-13 14:50:55 +09:00
0cc2cb3278
Merge branch 'beatmap_parsing' into beatmap_conversion
2017-03-13 14:48:07 +09:00
c76a495d3d
Merge pull request #467 from smoogipooo/beatmap_conversion
...
Beatmap conversion
2017-03-13 14:04:26 +09:00
7d129ebd6d
Attempt to fix things.
2017-03-12 22:38:50 +09:00
447cc17de8
Merge branch 'beatmap_conversion' into mod_application
...
Conflicts:
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Taiko/TaikoRuleset.cs
2017-03-12 22:20:52 +09:00
5be1839710
Remove unused method.
2017-03-12 22:19:35 +09:00
c0e29652a6
Initial attempt at making mods apply better.
2017-03-12 22:13:43 +09:00
64aab090d5
Instantiate HitRenderer with WorkingBeatmap.
2017-03-12 18:03:13 +09:00
b47c9e808e
usings
2017-03-12 14:37:39 +09:00
653c493178
Merge branch 'beatmap_conversion' of https://github.com/smoogipooo/osu into beatmap_conversion
2017-03-12 14:33:34 +09:00
3480dca0ad
Remove PlayMode enum requirement. Clean things up a lot.
2017-03-12 14:32:50 +09:00
e933d48179
Merge branch 'master' into beatmap_conversion
2017-03-12 12:56:57 +09:00
6871588218
Merge pull request #465 from smoogipooo/refactor_hitrenderer
...
Make HitRenderer not have a publicly-settable Beatmap, replace AllObj…
2017-03-12 12:56:41 +09:00
b0ea282a06
Fix map would always be converted to itself when actually converting to a different game mode.
2017-03-12 02:26:10 +09:00
f484792546
Merge branch 'refactor_hitrenderer' into beatmap_conversion
...
Conflicts:
osu.Game/Modes/UI/HitRenderer.cs
2017-03-12 01:27:28 +09:00
1c7a9e3a07
General fixups.
2017-03-12 01:26:07 +09:00
59b62b8fd4
Merge remote-tracking branch 'origin/master' into refactor_hitrenderer
2017-03-12 01:20:11 +09:00
74db255c78
Move back to using an abstract method to determine if all objects have been judged.
...
Because sliderticks provide judgements even though they are added as nested hitobjects, the count method would not work to determine if all hitobjects have been judged. This needs a little bit more thought put in...
2017-03-12 01:19:51 +09:00
