smoogipooo
|
e8d5cff790
|
Fix license headers.
|
2017-03-14 14:53:17 +09:00 |
|
smoogipooo
|
072eea82ea
|
Fix up combo colours + a few nullrefs.
|
2017-03-14 14:50:12 +09:00 |
|
smoogipooo
|
854212a7aa
|
Merge branch 'master' into beatmap_parsing
Conflicts:
osu.Desktop.VisualTests/app.config
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Mania/app.config
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Osu/app.config
osu.Game.Modes.Taiko/TaikoRuleset.cs
osu.Game/Modes/Ruleset.cs
osu.Game/app.config
osu.Game/osu.Game.csproj
|
2017-03-14 13:39:19 +09:00 |
|
smoogipooo
|
b82185a667
|
Rename to not use acronyms.
|
2017-03-14 13:24:07 +09:00 |
|
smoogipooo
|
876469faa1
|
Remove a few more things that aren't required yet.
|
2017-03-14 13:17:11 +09:00 |
|
smoogipooo
|
5a47fd659c
|
Fix up warnings, convert back to float position.
|
2017-03-14 13:11:07 +09:00 |
|
smoogipooo
|
bbd81dbc47
|
Add license headers.
|
2017-03-14 13:02:42 +09:00 |
|
Dean Herbert
|
66d1e7c732
|
Merge pull request #469 from smoogipooo/mod_application
Mod application
|
2017-03-14 12:59:33 +09:00 |
|
smoogipooo
|
34ab708cb6
|
Fix using statement before license.
|
2017-03-14 12:58:31 +09:00 |
|
smoogipooo
|
99c23d8715
|
I don't like this renaming.
|
2017-03-14 12:54:09 +09:00 |
|
smoogipooo
|
db8cbba8d5
|
Okay resharper u da boss.
|
2017-03-14 12:52:12 +09:00 |
|
smoogipooo
|
a502ff2c87
|
Fix post-merge issues.
|
2017-03-14 12:47:29 +09:00 |
|
Dan Balasescu
|
879a78156d
|
Merge branch 'master' into mod_application
|
2017-03-14 12:38:55 +09:00 |
|
smoogipooo
|
6ebd88060a
|
Simplify foreach.
|
2017-03-14 12:38:30 +09:00 |
|
smoogipooo
|
bc5912eab5
|
Applyable -> Applicable.
|
2017-03-14 12:32:31 +09:00 |
|
Dean Herbert
|
98f13be7ca
|
Merge pull request #472 from peppy/general-fixes
Update framework.
|
2017-03-14 12:12:02 +09:00 |
|
Dean Herbert
|
1eacafc7b4
|
Merge branch 'master' into general-fixes
|
2017-03-14 12:02:24 +09:00 |
|
Dean Herbert
|
9eaec6945f
|
Update resources.
|
2017-03-14 12:02:06 +09:00 |
|
Dean Herbert
|
4fa037c0b2
|
Update framework.
|
2017-03-14 12:01:58 +09:00 |
|
Dean Herbert
|
ba10c3a8db
|
Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
|
2017-03-14 11:46:34 +09:00 |
|
Dean Herbert
|
29eeebefb0
|
Merge pull request #474 from huoyaoyuan/fixes
Fixes
|
2017-03-14 09:40:02 +09:00 |
|
Huo Yaoyuan
|
e1bd168c16
|
Remaining GameMode -> Screen.
|
2017-03-14 07:22:46 +08:00 |
|
Huo Yaoyuan
|
3913a0a9ee
|
Fix removal of the last one beatmap.
|
2017-03-14 05:35:58 +08:00 |
|
Huo Yaoyuan
|
14a22f032f
|
Fix beatmap panel removal.
|
2017-03-14 04:35:43 +08:00 |
|
Huo Yaoyuan
|
db104d04d3
|
Use AutoGenerateBindingRedirects instead of explicit app.config.
|
2017-03-14 03:20:33 +08:00 |
|
Dean Herbert
|
2756d5f09f
|
Merge branch 'master' into mod_application
|
2017-03-13 23:00:11 +09:00 |
|
Dean Herbert
|
980807d91e
|
Fix post-merge issues.
|
2017-03-13 22:33:41 +09:00 |
|
Dean Herbert
|
c51e97e8cc
|
Merge pull request #471 from smoogipooo/beatmap_conversion
Beatmap conversion
|
2017-03-13 22:17:22 +09:00 |
|
Dean Herbert
|
b2981fb729
|
Merge branch 'master' into mod_application
|
2017-03-13 22:15:26 +09:00 |
|
smoogipooo
|
842f938439
|
General fixes.
|
2017-03-13 21:05:34 +09:00 |
|
Dean Herbert
|
6f20473e65
|
Merge pull request #441 from tacchinotacchi/archive-reader
Refactor ArchiveReader
|
2017-03-13 19:46:01 +09:00 |
|
Alex Amadori
|
c84a9d56f5
|
Fix namespace, comply with naming rules
|
2017-03-13 11:36:21 +01:00 |
|
Alex Amadori
|
caa6e9c82b
|
General improvements
|
2017-03-13 11:29:24 +01:00 |
|
smoogipooo
|
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 |
|
Alex Amadori
|
971d8eb7c5
|
Merge remote-tracking branch 'upstream/master' into archive-reader
|
2017-03-13 10:56:31 +01:00 |
|
smoogipooo
|
35ddca78f5
|
Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter).
|
2017-03-13 14:50:55 +09:00 |
|
smoogipooo
|
0cc2cb3278
|
Merge branch 'beatmap_parsing' into beatmap_conversion
|
2017-03-13 14:48:07 +09:00 |
|
Dean Herbert
|
c76a495d3d
|
Merge pull request #467 from smoogipooo/beatmap_conversion
Beatmap conversion
|
2017-03-13 14:04:26 +09:00 |
|
smoogipooo
|
7d129ebd6d
|
Attempt to fix things.
|
2017-03-12 22:38:50 +09:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
5be1839710
|
Remove unused method.
|
2017-03-12 22:19:35 +09:00 |
|
smoogipooo
|
c0e29652a6
|
Initial attempt at making mods apply better.
|
2017-03-12 22:13:43 +09:00 |
|
smoogipooo
|
64aab090d5
|
Instantiate HitRenderer with WorkingBeatmap.
|
2017-03-12 18:03:13 +09:00 |
|
smoogipooo
|
b47c9e808e
|
usings
|
2017-03-12 14:37:39 +09:00 |
|
smoogipooo
|
653c493178
|
Merge branch 'beatmap_conversion' of https://github.com/smoogipooo/osu into beatmap_conversion
|
2017-03-12 14:33:34 +09:00 |
|
smoogipooo
|
3480dca0ad
|
Remove PlayMode enum requirement. Clean things up a lot.
|
2017-03-12 14:32:50 +09:00 |
|
Dean Herbert
|
e933d48179
|
Merge branch 'master' into beatmap_conversion
|
2017-03-12 12:56:57 +09:00 |
|
Dean Herbert
|
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 |
|
smoogipooo
|
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 |
|
smoogipooo
|
f484792546
|
Merge branch 'refactor_hitrenderer' into beatmap_conversion
Conflicts:
osu.Game/Modes/UI/HitRenderer.cs
|
2017-03-12 01:27:28 +09:00 |
|