1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 14:27:25 +08:00
Commit Graph

41 Commits

Author SHA1 Message Date
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
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dean Herbert
faf07ab51a
Use generics everywhere. 2017-03-06 13:59:11 +09:00
Dean Herbert
4163569e57
Fix some license headers. 2017-03-02 18:45:20 +09:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
Dean Herbert
8bf3902cbd
Add the concept of nested DrawableHitObjects.
- Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
- Removed SliderTicksLayer abstraction for now.
2017-02-16 17:02:36 +09:00
Dean Herbert
2640c2ac43
Add tick sample. 2017-02-16 13:39:01 +09:00
Dean Herbert
7fbc5990d1
Add combo numbers. 2017-02-15 23:23:55 +09: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
8e9a5e9faa Add the ability to make DrawableHitObjects non-interactive (for use in other contexts). 2017-02-15 01:23:20 +09:00
Dean Herbert
fc192906ea Handle proxied approach layer better and add slider's approach circle (previously missing). 2017-02-15 01:23:19 +09: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
a2501cc81d Fix TestCaseHitObjects not working at all due to state being set before load is complete. 2017-01-27 00:16:02 +09:00
Dean Herbert
162e183b36 Fix some nullrefs when running visualtests with no maps loaded. 2017-01-27 00:16:02 +09:00
Drew DeVault
fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -05:00
Drew DeVault
70ecf48ca7 Add central color class
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
2017-01-09 17:20:31 -05:00
Dean Herbert
cf8283582b Don't update LifetimeStart on HitObject state change. 2016-12-15 22:58:23 +09:00
Dean Herbert
d8e40d4fb1 Add naive lifetime calculation for drawable HitObjects. 2016-12-15 22:58:22 +09:00
Dean Herbert
f8395c4d3f Fix slider ball not tracking when mouse hasn't been moved since slider appeared. 2016-12-08 21:07:20 +09:00
Dean Herbert
c53743ca7d Fix unit test regression. 2016-12-08 20:00:24 +09:00
Dean Herbert
391767e01d Add very basic hitsound support. 2016-12-08 19:54:22 +09:00
Dean Herbert
87ad44b901 Fix HitObject test case not displaying properly. 2016-12-07 18:46:47 +09:00
Dean Herbert
421dd19aaf Move initial state updates to DrawableHitObject. 2016-12-06 18:35:08 +09:00
Thomas Müller
773d64cd5e Update judgement after children have been updated. 2016-12-03 14:40:15 +01:00
Dean Herbert
1e037b3eaa Merge remote-tracking branch 'refs/remotes/upstream/master' into fix-depth 2016-11-30 12:21:12 +09:00
Thomas Müller
b12b82fdd3 Fix depth values. 2016-11-29 20:50:12 +01:00
Dean Herbert
18d331f869 Add combo info to JudgementInfo. 2016-11-29 21:46:30 +09:00
Dean Herbert
f8c1f4dd58 Add basic slider judgement handling. 2016-11-29 21:40:24 +09:00
Dean Herbert
2947121e48 Hook up ScoreProcessor to Scoreoverlay etc. 2016-11-29 21:28:43 +09:00
Dean Herbert
187a8bbfa7 Don't store beatmap reference in hitobjects. 2016-11-28 18:45:50 +09:00
Dean Herbert
bf63be0602 Add better slider duration calculation using bpm and difficulty information. 2016-11-28 15:31:54 +09:00
Dean Herbert
396ca9fe91 Remove HitJudgementResolver; reimplement in DrawableHitObject. 2016-11-26 16:51:51 +09:00
Dean Herbert
f9f72f25a2 Add basic flow for hitobject judgement. 2016-11-25 16:26:50 +09:00
Dean Herbert
3ac89216bd Standardise some naming and make hitcircles feel better. 2016-11-19 19:07:57 +09:00
Dean Herbert
4db2a1e693 Split ApproachCircle out into its own class. 2016-11-18 17:47: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
4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +09:00
Dean Herbert
06f4f93918 Move play modes to Modes namespace. 2016-11-14 18:03:20 +09:00