RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,633 Commits 3 Branches 650 Tags 350 MiB
Commit Graph

321 Commits

Author SHA1 Message Date
Dean Herbert 6c12da54f1 Merge pull request #499 from smoogipooo/legacy_beatmap_flag 
Add legacy beatmap flag.
 2017-03-19 12:39:41 +09:00
smoogipooo 26b0bb02d8 Remove IIsLegacy, expose LegacyBeatmap without a public constructor. 2017-03-18 18:32:54 +09:00
Dan Balasescu e529f5e439 Merge branch 'master' into song-select-loading-reoptimisation 2017-03-18 02:12:56 +09:00
Dean Herbert 292de44a0b
WIP menu cursor. 2017-03-17 20:45:27 +09:00
Dean Herbert 907236e475
Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria. 2017-03-17 19:54:51 +09:00
Dean Herbert 4b97304603
CarouselContainer -> BeatmapCarousel. 2017-03-17 19:12:54 +09:00
smoogipooo 862c4c408f Add legacy beatmap flag. 2017-03-17 14:24:46 +09:00
Dean Herbert 60fc782e93 Merge branch 'master' into beatmap_timinginfo 2017-03-16 23:08:24 +09:00
Dean Herbert 271dddc9a7 Merge branch 'master' into generic_scoreprocessor 2017-03-16 23:04:19 +09:00
Dean Herbert 110bdbd0c1
Make everything share DropDown implementations again. Remove unnecessary files. 2017-03-16 21:17:14 +09:00
smoogipooo 5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +09:00
Dean Herbert 334e389518
Tidy up OsuTabControl and FilterControl. 2017-03-16 16:35:44 +09:00
smoogipooo 7b66faab9e Fix filename. 2017-03-16 12:59:09 +09:00
Drew DeVault 3aecbf5739 Rearrange things somewhat 2017-03-15 20:15:40 -04:00
Drew DeVault cac6c42aac Merge remote-tracking branch 'upstream/master' into tab-control 2017-03-15 20:15:28 -04: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 0f4df0566b HasSpecial -> HasHold. 2017-03-15 19:43:38 +09:00
smoogipooo c24d98cd11 Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing 2017-03-15 19:40:12 +09:00
smoogipooo 76c0a4d836 HitObjectType -> LegacyHitObjectType, move to Legacy namespace. 2017-03-15 19:39:40 +09:00
Dan Balasescu a3906820ec Merge branch 'master' into beatmap_parsing 2017-03-15 19:29:45 +09:00
smoogipooo bf66b84ff8 Move a few classes/enums into separate files. 2017-03-15 16:07:40 +09:00
smoogipooo 6a31219781 Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00
Kelvin 2629f78afc Add FilterControl and FilterTabControl 2017-03-14 19:49:40 -07:00
Huo Yaoyuan e1cc74bb40 Merge branch 'master' into more-songselect 2017-03-14 20:50:53 +08:00
Huo Yaoyuan 3871a350f8 Move BeatmapOptions buttons to derived class and simplify. 2017-03-14 19:38:21 +08:00
smoogipooo 785b970125 Add special interface for LegacyHold. 2017-03-14 18:49:22 +09:00
smoogipooo a1833fd6b0 Whoops, naming. 2017-03-14 18:49:01 +09:00
smoogipooo 4c7f0fcb73 Fix unit tests. 2017-03-14 18:46:34 +09:00
smoogipooo ad9583a179 Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing 2017-03-14 18:06:50 +09:00
smoogipooo 1f43370886 Fix failing unit test, move legacy hitobjects to Objects/Legacy/. 2017-03-14 18:06:32 +09:00
Huo Yaoyuan c3a0549cdd Move player specific stuff to derived PlaySongSelect. 2017-03-14 16:58:34 +08:00
Dean Herbert 5c2bf02c9d Merge branch 'master' into beatmap_parsing 2017-03-14 17:50:00 +09:00
Huo Yaoyuan fae6afa9e3 Create basic SongSelect class. 2017-03-14 16:44:35 +08:00
smoogipooo 7141bc86d3 Rework beatmap post-processing into HitRenderer. 2017-03-14 17:01:21 +09:00
Dean Herbert 14b22445fa
Merge remote-tracking branch 'upstream/master' into general-fixes 
# Conflicts:
#	osu.Game/Modes/UI/HitRenderer.cs
 2017-03-14 16:15:26 +09:00
Dean Herbert 1f68731a09
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter). 2017-03-14 16:00:35 +09:00
smoogipooo 90ad2e9731 Remove unused interface. 2017-03-14 15:50:36 +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
Dan Balasescu 879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
smoogipooo bc5912eab5 Applyable -> Applicable. 2017-03-14 12:32:31 +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
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 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
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