h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:07:26 +08:00
Code Issues Releases Wiki Activity
3,468 Commits 3 Branches 654 Tags 364 MiB
1fe6b84dfc
Commit Graph

236 Commits

Author SHA1 Message Date
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
e0e0a2726d Move OsuJudgementInfo to its own class, remove PositionalJudgementInfo. 2017-03-15 19:23:42 +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
bf66b84ff8 Move a few classes/enums into separate files. 2017-03-15 16:07:40 +09:00
smoogipooo
41f912836a Refactorings. 2017-03-15 12:57:17 +09:00
smoogipooo
6a31219781 Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00
smoogipooo
5b58daa23d Add check for no combo colours. 2017-03-14 21:47:31 +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
Dean Herbert
5c2bf02c9d Merge branch 'master' into beatmap_parsing 2017-03-14 17:50:00 +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
e52d5181f7 Fix a few visual tests failing. 2017-03-14 17:01:46 +09: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
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
b82185a667 Rename to not use acronyms. 2017-03-14 13:24: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
Dan Balasescu
879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
Huo Yaoyuan
db104d04d3 Use AutoGenerateBindingRedirects instead of explicit app.config. 2017-03-14 03:20:33 +08:00
smoogipooo
842f938439 General fixes. 2017-03-13 21:05:34 +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
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
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
eca980bb95 Remove .orig files (not sure how they got here). 2017-03-10 15:57:14 +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
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
smoogipooo
31f6cbd8cf Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets. 2017-03-10 12:14:13 +09:00
Jorolf
d9a4a677fd Added Descriptions to Rulesets + PlayModes list 2017-03-09 21:37:03 +01:00
Dean Herbert
115ebd4773 Merge branch 'master' into modselect 2017-03-09 17:31:25 +09:00
Dean Herbert
dad6060149
Fix warnings not covered by resharper locally. 2017-03-09 16:07:34 +09:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
dc5ac6e88f
Add missing access modifiers. 2017-03-09 13:55:29 +09: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
Huo Yaoyuan
ffd79bee06 Remove inherited mods in incompatible list and add between Auto and NoFail. 2017-03-07 16:27:55 +08:00
Dean Herbert
1fb846e61d
Make playfield scaling optional. 2017-03-07 15:49:04 +09:00
Dean Herbert
533868a608
Fix other regression. 2017-03-07 15:18:15 +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
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
fc6bd386ea
Fix remaining usage of hit window constants. 2017-03-06 23:26:57 +09:00
Dean Herbert
b55a579d15
Fix typo. 2017-03-06 23:00:21 +09:00
Dean Herbert
c24a4f57d9
Raise errors on unnecessary using statements. 2017-03-06 19:15:47 +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
20fcb8848b
Move constants to base OsuHitObject representation. 2017-03-06 12:58:14 +09:00
Dean Herbert
910d9ccc00
Add proper slider following support to OsuAutoReplay. 2017-03-06 11:11:42 +09:00
Dean Herbert
56922b66be
Refactor sliders to have more central position/progress calculations. 2017-03-06 11:11:29 +09:00
Dean Herbert
cb002ce7af
General refactoring of OsuAutoReplay. 2017-03-06 10:10:29 +09:00
Dean Herbert
5b4424d4fa
CreateAutoplayReplay -> CreateAutoplayScore. 2017-03-06 10:06:14 +09:00
Dean Herbert
1c5b918f9e Add osu! autoplay generation. 
Doesn't work on complex sliders yet.
 2017-03-05 17:46:00 +09:00
Dean Herbert
4e4408cd20 Merge branch 'master' into replay 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
 2017-03-05 17:45:03 +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
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
TheGui
e3c3806759 Fixed accuracy's counter first value change. 2017-03-04 04:48:32 -03:00
Dean Herbert
adb6f01e39
Create class hierarchy for Score/Replay storage. 2017-03-04 15:32:41 +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
471b9daa93
Merge branch 'master' into mod-overlay 
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/osu.Game.csproj
 2017-03-02 20:27:04 +09:00
Dean Herbert
4163569e57
Fix some license headers. 2017-03-02 18:45:20 +09:00
DrabWeb
482be9f451 Remove AvailableMods 2017-03-02 02:04:26 -04:00
DrabWeb
367d6d694c Merge https://github.com/ppy/osu into mod-overlay 2017-03-02 01:44:18 -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
Thomas Müller
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor 
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
 2017-03-01 18:05:58 +01:00
Dean Herbert
58ae9e888d
Basic partial replay support. 2017-03-01 22:04:20 +09:00
Dean Herbert
f0e9ed4636
Fix regression in TrianglesPiece. 2017-03-01 11:56:14 +09:00
default0
03889e6ca6 Update References to FlowStrategies 
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
 2017-02-27 16:55:55 +01:00
Dean Herbert
a22216d0b0
Update nuget packages. 2017-02-27 20:38:30 +09:00
Dean Herbert
47997c20ad
Weld -> BindWith. 2017-02-27 12:24:53 +09:00
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00