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

278 Commits

Author SHA1 Message Date
Dan Balasescu cd30958086 Merge branch 'master' into song-select-loading-reoptimisation 2017-03-18 01:25:22 +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 ba73968303
Load whole panel background in async. 2017-03-17 18:28:21 +09:00
Dean Herbert 2abcdbf4df
Fix potentially incorrect states being applied to panels on first display. 2017-03-17 14:56:12 +09:00
smoogipooo a06c195e1f Add reading of KiaiMode/OmitFirstBarLine from legacy control points. 2017-03-17 13:23:39 +09:00
Dean Herbert cd98af29c4
Only calculate difficulties on import for now. 2017-03-17 11:53:13 +09:00
smoogipooo 0c47638820 Better hit object defaults setting. 2017-03-17 00:36:09 +09:00
smoogipooo e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
smoogipooo 5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +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 d6ccc66b23 Attempt to fix nullref warning. 2017-03-14 17:46:35 +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 e42c790df2 Refactorings. 2017-03-14 15:45:27 +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 99c23d8715 I don't like this renaming. 2017-03-14 12:54:09 +09:00
Dan Balasescu 879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +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 b2981fb729 Merge branch 'master' into mod_application 2017-03-13 22:15:26 +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 c0e29652a6 Initial attempt at making mods apply better. 2017-03-12 22:13:43 +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 77a4a896c9 Cleanups. 2017-03-12 01:08:34 +09:00
smoogipooo 592e05a2c8 Better beatmap conversion model. 2017-03-12 00:34:21 +09:00
Alex Amadori faecaa297a Fix warnings 2017-03-09 21:07:21 +01:00
Alex Amadori 9f40a888ec Update BeatmapArchiveReader's test 2017-03-08 21:55:38 +01:00
Alex Amadori 2c7a9d2f77 Remove unnecessary using 2017-03-07 08:47:50 +01:00
Alex Amadori 309019aab3 Merge remote tracking branch 'upstream/master' into archive-reader 2017-03-07 08:41:44 +01: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 0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dan Balasescu bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
Alex Amadori aee7b05bae ArchiveManager decoupling 2017-03-07 00:10:33 +01:00
Alex Amadori fd53d10264 Refactor ArchiveReader for extensibility 2017-03-06 23:56:08 +01:00
Dean Herbert e356758a7d
Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
Dean Herbert 2de25c23b4
Make Mods IEnumerable. 2017-03-06 15:20:55 +09:00
Dean Herbert 76ef8c1a6c
Add bindable mods and autoplay support. 2017-03-06 14:52:37 +09:00
Dean Herbert 1ea21daa91
Fix PlayMode regression. 2017-03-06 14:25:38 +09:00
Dean Herbert 3b0445a244
Improve comment for PreferredPlayMode and allow null. 2017-03-06 14:08:58 +09:00
Dean Herbert 7afcac3660 Move PreferredPlayMode to WorkingBeatmap. 2017-03-05 17:45:40 +09:00
Thomas Müller 73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
Thomas Müller a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
Dean Herbert e12d89529c
Merge remote-tracking branch 'upstream/master' into update-flow 2017-03-04 23:28:39 +09:00
Dean Herbert 00fdffe9c8
Update framework (and fix non-conforming anchors in FillFlowContainers). 2017-03-04 23:24:13 +09:00
Thomas Müller a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00