smoogipooo
|
7860199fbd
|
Fix post-merge errors.
|
2017-03-17 19:27:06 +09:00 |
|
smoogipooo
|
04bc37b079
|
Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable
|
2017-03-17 19:26:30 +09:00 |
|
smoogipooo
|
e3afa9bf71
|
Fix post-merge errors.
|
2017-03-17 19:25:55 +09:00 |
|
smoogipooo
|
39c2703fef
|
Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable
|
2017-03-17 19:24:57 +09:00 |
|
smoogipooo
|
ad396c65ee
|
Fix post-merge errors.
|
2017-03-17 19:24:39 +09:00 |
|
smoogipooo
|
558641c317
|
Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables
|
2017-03-17 19:23:57 +09:00 |
|
smoogipooo
|
5136064cb3
|
Revert "Make DrawableTaikoHitObject generic."
This reverts commit 0e4ed829f2.
|
2017-03-17 19:23:18 +09:00 |
|
smoogipooo
|
1ede12d847
|
Add basic DrawableDrumRollTick (no graphics yet, just input).
|
2017-03-17 19:08:50 +09:00 |
|
smoogipooo
|
1e7511a923
|
Merge branch 'taiko_judgement_scoring' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-17 19:01:02 +09:00 |
|
smoogipooo
|
e977f25cc4
|
Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-17 19:00:35 +09:00 |
|
smoogipooo
|
a2d07acb4b
|
Fix post-merge errors.
|
2017-03-17 18:59:21 +09:00 |
|
smoogipooo
|
91775b33e3
|
Merge branch 'taiko_bash_base' into taiko_bash_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-17 18:58:48 +09:00 |
|
smoogipooo
|
e2673a94bf
|
Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable
|
2017-03-17 18:57:17 +09:00 |
|
smoogipooo
|
938da01540
|
Fix post-merge errors.
|
2017-03-17 18:56:58 +09:00 |
|
smoogipooo
|
9f4f297bb7
|
Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables
|
2017-03-17 18:56:24 +09:00 |
|
smoogipooo
|
0e4ed829f2
|
Make DrawableTaikoHitObject generic.
|
2017-03-17 18:55:54 +09:00 |
|
smoogipooo
|
891bd011c6
|
Add basic DrawableBash (no graphics yet, just input).
|
2017-03-17 18:54:44 +09:00 |
|
smoogipooo
|
e37def94f8
|
Merge branch 'taiko_judgement_scoring' into taiko_bash_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-17 18:51:56 +09:00 |
|
smoogipooo
|
1892d86921
|
Add basic DrawableHitFinisher (no graphics yet, just input).
|
2017-03-17 17:38:49 +09:00 |
|
smoogipooo
|
863d4959af
|
Make OnKeyDown non-sealed.
|
2017-03-17 17:38:24 +09:00 |
|
smoogipooo
|
6a1c6f962e
|
Merge branch 'taiko_judgement_scoring' into taiko_hit_drawables
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-17 17:08:11 +09:00 |
|
smoogipooo
|
977b506587
|
Add TaikoJudgementInfo.
|
2017-03-17 17:06:34 +09:00 |
|
smoogipooo
|
f26cf7bf68
|
Add basic DrawableHit (no graphics yet, just input).
|
2017-03-17 16:55:57 +09:00 |
|
smoogipooo
|
35f63cb2aa
|
Set Anchor/Origin and RelativePositionAxes.
|
2017-03-17 16:10:40 +09:00 |
|
smoogipooo
|
cdfe95c159
|
Add AcentColour and xmldoc.
|
2017-03-17 16:05:16 +09:00 |
|
smoogipooo
|
f48af91686
|
Appease the resharper gods.
|
2017-03-17 15:45:54 +09:00 |
|
smoogipooo
|
2e0d100a22
|
Add base DrawableTaikoHitObject, remove DrawableTaikoHit.
|
2017-03-17 15:19:56 +09:00 |
|
smoogipooo
|
4a85b899c9
|
Fix up VelocityAdjustment value.
|
2017-03-17 14:44:48 +09:00 |
|
smoogipooo
|
fa22bb9211
|
Merge branch 'taiko_bash_base' into taiko_conversion
|
2017-03-17 14:43:17 +09:00 |
|
smoogipooo
|
d478a58a89
|
Invert getters and setters for EndTime / Duration.
|
2017-03-17 14:43:00 +09:00 |
|
smoogipooo
|
ccc2253068
|
Implement basic Taiko HitObject conversion.
|
2017-03-17 14:39:59 +09:00 |
|
smoogipooo
|
d7af3d1d56
|
Merge branch 'taiko_bash_base' into taiko_conversion
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-17 14:03:56 +09:00 |
|
smoogipooo
|
d2194e3d2a
|
Implement Bash.
|
2017-03-17 14:01:32 +09:00 |
|
smoogipooo
|
12de3f6657
|
Implement DrumRoll + DrumRollTick.
|
2017-03-17 13:56:14 +09:00 |
|
smoogipooo
|
b399c6adbb
|
Implement TaikoHitObject.
|
2017-03-17 13:38:48 +09:00 |
|
smoogipooo
|
28240fb3b5
|
Rename TaikoBaseHit -> TaikoHitObject.
|
2017-03-17 13:33:48 +09:00 |
|
smoogipooo
|
5cafec3b6a
|
Add back CreateScoreProcessor to Ruleset to instantiate a non-generic ScoreProcessor for ScoreDatabase.
|
2017-03-16 13:13:45 +09:00 |
|
smoogipooo
|
c82ae011fb
|
Make ScoreProcessors take generic judgements.
|
2017-03-16 12:45:23 +09:00 |
|
smoogipooo
|
afefde7ecf
|
Remove old comments.
|
2017-03-15 21:53:01 +09:00 |
|
smoogipooo
|
42da0f1a72
|
Merge remote-tracking branch 'origin/master' into generic_judgements_2
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
osu.Game/Modes/UI/HitRenderer.cs
osu.Game/osu.Game.csproj
|
2017-03-15 21:36:43 +09:00 |
|
smoogipooo
|
3a8d1d3619
|
Add license headers.
|
2017-03-15 21:32:47 +09:00 |
|
smoogipooo
|
a9bc253b8c
|
General refactoring (no more casts :D).
|
2017-03-15 19:18:23 +09:00 |
|
smoogipooo
|
36e8618370
|
Make DrawableHitObjects have generic JudgementInfos.
|
2017-03-15 18:55:38 +09:00 |
|
smoogipooo
|
069a7a24ce
|
Fix defaults not being set (keep in mind this will be changed in a later pullrequest).
|
2017-03-14 19:04:40 +09:00 |
|
smoogipooo
|
2b3b3b7255
|
Fix license headers (sorry I have to do this as post-processing for now cos VS 2017...).
|
2017-03-14 17:07:38 +09:00 |
|
smoogipooo
|
7141bc86d3
|
Rework beatmap post-processing into HitRenderer.
|
2017-03-14 17:01:21 +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
|
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 |
|
smoogipooo
|
99c23d8715
|
I don't like this renaming.
|
2017-03-14 12:54:09 +09:00 |
|
Dean Herbert
|
2756d5f09f
|
Merge branch 'master' into mod_application
|
2017-03-13 23:00:11 +09: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 |
|
smoogipooo
|
35ddca78f5
|
Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter).
|
2017-03-13 14:50:55 +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
|
3480dca0ad
|
Remove PlayMode enum requirement. Clean things up a lot.
|
2017-03-12 14:32:50 +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
|
1c7a9e3a07
|
General fixups.
|
2017-03-12 01:26:07 +09:00 |
|
smoogipooo
|
592e05a2c8
|
Better beatmap conversion model.
|
2017-03-12 00:34:21 +09:00 |
|
smoogipooo
|
75ed7406e4
|
Merge remote-tracking branch 'origin/master' into refactor_hitrenderer
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-11 14:22:59 +09:00 |
|
smoogipooo
|
02281d8a2a
|
Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance.
|
2017-03-10 15:19:36 +09:00 |
|
smoogipooo
|
d3e14aad1b
|
Use =>.
|
2017-03-10 14:55:43 +09:00 |
|
smoogipooo
|
58a88cc715
|
More general refactorings.
|
2017-03-10 14:42:14 +09:00 |
|
smoogipooo
|
5f440d0b53
|
Merge branch 'combocounter_bindable' into general_hud
Conflicts:
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game/Modes/Ruleset.cs
|
2017-03-10 14:35:31 +09:00 |
|
smoogipooo
|
b56d7f19e0
|
Remove DrumHit.
|
2017-03-10 14:23:57 +09:00 |
|
smoogipooo
|
2fb5334d09
|
Why tho?
|
2017-03-10 14:15:56 +09:00 |
|
smoogipooo
|
7a68e46366
|
Merge remote-tracking branch 'origin/master' into combocounter_bindable
Conflicts:
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game/Modes/Ruleset.cs
|
2017-03-10 14:15:06 +09:00 |
|
smoogipooo
|
f44fa56646
|
Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud
Conflicts:
osu.Game.Modes.Osu/OsuRuleset.cs
|
2017-03-10 13:42:50 +09:00 |
|
smoogipooo
|
2d6e667c7c
|
Renaming + use IEnumerable.
|
2017-03-10 13:40:44 +09:00 |
|
Dean Herbert
|
2813484f2e
|
Merge branch 'master' into general_hud
|
2017-03-10 13:25:26 +09:00 |
|
Dean Herbert
|
9e223bd77b
|
Merge pull request #459 from Jorolf/rulesetAndPlayModeRemake
Added Descriptions to Rulesets + PlayModes list
|
2017-03-10 13:18:43 +09:00 |
|
smoogipooo
|
7c1a3067e6
|
Oops o_o.
|
2017-03-10 13:03:13 +09:00 |
|
smoogipooo
|
31f6cbd8cf
|
Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.
|
2017-03-10 12:14:13 +09:00 |
|
smoogipooo
|
fa9110ce6e
|
Remove custom combo counters.
|
2017-03-10 11:04:46 +09:00 |
|
Jorolf
|
d9a4a677fd
|
Added Descriptions to Rulesets + PlayModes list
|
2017-03-09 21:37:03 +01:00 |
|
Dean Herbert
|
0c4c1689b6
|
Merge branch 'master' into modselect
|
2017-03-09 12:51:40 +09:00 |
|
Dean Herbert
|
5a42035f88
|
Update license headers.
|
2017-03-08 15:50:52 +09:00 |
|
Huo Yaoyuan
|
b3b813c0ae
|
Follow current mod layout.
|
2017-03-07 20:05:50 +08:00 |
|
Dean Herbert
|
02cab41d34
|
Move InputManager to a higher and more implicit level.
Also makes KeyCounterCollection work with replays.
|
2017-03-07 19:30:48 +09:00 |
|
Dean Herbert
|
bff1179624
|
Merge branch 'master' into replay
# Conflicts:
# osu.Game/Modes/Mod.cs
|
2017-03-07 14:32:14 +09:00 |
|
Dean Herbert
|
5cbcf7a20a
|
Fix error-level inspections.
|
2017-03-07 14:31:54 +09:00 |
|
Dean Herbert
|
ecdbcb20cf
|
Fix error-level inspections.
|
2017-03-07 13:52:47 +09:00 |
|
Dean Herbert
|
4430255ec4
|
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
|
2017-03-07 13:50:08 +09:00 |
|
Dean Herbert
|
3e4cd0dc7c
|
Merge remote-tracking branch 'upstream/master' into less-mods-enum
# Conflicts:
# osu.Game.Modes.Mania/ManiaMod.cs
# osu.Game.Modes.Osu/OsuMod.cs
# osu.Game/Modes/Mod.cs
|
2017-03-07 13:42:50 +09:00 |
|
Dean Herbert
|
0cad5d7d41
|
Fix most warnings.
|
2017-03-07 13:05:57 +09:00 |
|
Dean Herbert
|
12a3b1414f
|
Add sane defaults for abstract Mod class and remove remaining use of enum.
|
2017-03-06 18:29:19 +09:00 |
|
Dean Herbert
|
45f500920c
|
Don't use Mods enum for handling incompatible mods.
|
2017-03-06 18:29:17 +09:00 |
|
Dean Herbert
|
610de4a34c
|
Only show replay cursor when replay input is present.
|
2017-03-06 15:24:00 +09:00 |
|
Dean Herbert
|
faf07ab51a
|
Use generics everywhere.
|
2017-03-06 13:59:11 +09:00 |
|
Dean Herbert
|
9e1383fa48
|
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
# osu.Game.Modes.Catch/CatchRuleset.cs
# osu.Game.Modes.Mania/ManiaRuleset.cs
# osu.Game.Modes.Taiko/TaikoRuleset.cs
# osu.Game/Screens/Play/Player.cs
|
2017-03-04 13:17:01 +09:00 |
|
Dean Herbert
|
8bb4bea1a4
|
Fix incorrect ordering.
|
2017-03-02 20:27:13 +09:00 |
|
DrabWeb
|
482be9f451
|
Remove AvailableMods
|
2017-03-02 02:04:26 -04:00 |
|
DrabWeb
|
1eee587c18
|
CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection
|
2017-03-02 01:07:28 -04:00 |
|
DrabWeb
|
6c680825ed
|
ModSections in Ruleset, fixed toolbar play mode changed not firing
|
2017-03-01 22:05:52 -04:00 |
|
DrabWeb
|
bb12463ae4
|
Working on better way to handle mods
|
2017-03-01 20:57:33 -04:00 |
|
Dean Herbert
|
58ae9e888d
|
Basic partial replay support.
|
2017-03-01 22:04:20 +09:00 |
|
Dean Herbert
|
a22216d0b0
|
Update nuget packages.
|
2017-02-27 20:38:30 +09:00 |
|
Thomas Müller
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09:00 |
|
Thomas Müller
|
f7d985fe18
|
Fix and refactor star difficulty calculation boilerplate
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
|
2017-02-24 19:36:17 +01:00 |
|
Thomas Müller
|
a5dfa7ab06
|
Remove unnecessary using statements
|
2017-02-23 21:38:10 +01:00 |
|
Thomas Müller
|
417f146386
|
Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
|
2017-02-19 17:41:51 +01:00 |
|
Dean Herbert
|
580584a015
|
Don't use osu! mode parser for other game modes for now (convert still works).
|
2017-02-15 12:36:47 +09:00 |
|
Dean Herbert
|
f207da6041
|
Add/update license headers.
|
2017-02-14 18:17:35 +09:00 |
|
John Leuenhagen
|
7ad9cd6b6e
|
add explicit false values to prevent warnings as errors
|
2017-02-12 02:32:11 -05:00 |
|
Damnae
|
38b25a7df3
|
Add hit object stacking.
|
2017-02-09 07:28:40 +01:00 |
|
Dean Herbert
|
50bd80cb0c
|
Update and standardise license headers.
|
2017-02-07 14:27:41 +09:00 |
|
Dean Herbert
|
2ed5cf7c91
|
Hook up icons better.
|
2017-01-30 13:35:40 +09:00 |
|
TocoToucan
|
badc8def9a
|
hitObjectsNumber -> hitObjectCount
|
2017-01-18 18:51:38 +03:00 |
|
TocoToucan
|
259c0964fd
|
Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations
|
2017-01-16 23:14:35 +03:00 |
|
Dean Herbert
|
40ea6e0d72
|
Fix incorrect folder name.
|
2016-12-08 21:36:34 +09:00 |
|
Dean Herbert
|
f356640cb7
|
Add missing licence headers.
|
2016-12-06 19:07:15 +09:00 |
|
Dean Herbert
|
d71b284642
|
Make ScoreProcessor abstract and avoid making AddJudgement virtual.
|
2016-11-29 22:02:37 +09:00 |
|
Dean Herbert
|
9d2a69f1e2
|
Add concept of ScoreProcessor.
|
2016-11-29 20:30:16 +09:00 |
|
Dean Herbert
|
9871960112
|
Basic score flow.
|
2016-11-29 17:34:16 +09:00 |
|
Dean Herbert
|
3ac89216bd
|
Standardise some naming and make hitcircles feel better.
|
2016-11-19 19:07:57 +09:00 |
|
Dean Herbert
|
e01057df3d
|
Add thread safety somewhere it will never be required.
|
2016-11-14 23:13:47 +09:00 |
|
Dean Herbert
|
d3f810f72f
|
Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading).
|
2016-11-14 22:03:39 +09:00 |
|
Dean Herbert
|
5dd4e31011
|
Move DrawableHitObject.
|
2016-11-14 19:49:29 +09:00 |
|
Dean Herbert
|
6c7fab0e31
|
Fix some remaining naming discrepancies.
|
2016-11-14 19:20:21 +09:00 |
|
Dean Herbert
|
4590be552f
|
Move play modes to their own projects.
|
2016-11-14 18:54:24 +09:00 |
|