h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 02:59:48 +08:00
Code Issues Releases Wiki Activity
3,264 Commits 3 Branches 653 Tags 357 MiB
774e15b89d
Commit Graph

119 Commits

Author SHA1 Message Date
smoogipooo
11fb404574 Merge remote-tracking branch 'origin/master' into taiko_drumroll_tick_judgements 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-23 19:35:36 +09:00
Dean Herbert
2cb801317d
JudgementInfo -> Judgement. 
There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.
 2017-03-23 19:00:18 +09:00
Dan Balasescu
2d5bb326f0 Merge branch 'master' into taiko_drumroll_drawable 2017-03-23 17:55:08 +09:00
smoogipooo
0ac33b59e3 Add DrumRoll tick judgement info. 2017-03-23 17:52:46 +09:00
Dean Herbert
96fc8eef30 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 17:23:22 +09:00
Dean Herbert
315994f2b3 Merge pull request #538 from smoogipooo/taiko_base_hit 
Add Hit class, make TaikoHitObject abstract.
 2017-03-23 16:51:45 +09:00
Dean Herbert
1af17fc108
Remove cross-reference to osu.Game.Modes.Osu from Taiko. 2017-03-23 15:12:08 +09:00
Dean Herbert
acfa4a4aac
JudgementText -> DrawableTaikoJudgementInfo. 2017-03-23 14:52:18 +09:00
smoogipooo
3d1dad8185 Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable 
Conflicts:
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-23 14:40:06 +09:00
Dan Balasescu
a40338614a Merge branch 'master' into taiko_note_circle 2017-03-23 14:29:24 +09:00
smoogipooo
cedcab1e26 s/Ring/Hit + privatize Judgement inside RingExplosion. 2017-03-23 13:02:01 +09:00
smoogipooo
db8bf8a78f Add Hit class, make TaikoHitObject abstract. 2017-03-23 11:21:45 +09:00
Dan Balasescu
2c580f43e9 Merge branch 'master' into taiko_playfield_2 2017-03-23 11:10:23 +09:00
Dan Balasescu
39134d79a8 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 11:03:42 +09:00
Dean Herbert
53c6665e07 Merge branch 'master' into taiko_bash_base 2017-03-23 10:57:15 +09:00
Dan Balasescu
e3bc837b61 Merge branch 'master' into taiko_drawable_drawing 2017-03-23 10:44:00 +09:00
smoogipooo
7cf935cef2 Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-22 01:53:44 +09:00
smoogipooo
b9f1b44ca4 Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-22 01:49:45 +09:00
smoogipooo
1bfc4d484d Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-22 01:47:25 +09:00
smoogipooo
62dcd4fa59 Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-22 01:45:02 +09:00
smoogipooo
afcd42b06d Merge remote-tracking branch 'origin/master' into taiko_playfield_2 2017-03-22 01:38:53 +09:00
smoogipooo
cf251618c7 Merge remote-tracking branch 'origin/master' into taiko_bash_base 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-22 01:34:47 +09:00
smoogipooo
a346191ca7 Merge remote-tracking branch 'origin/master' into taiko_drumroll_base 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-22 01:27:07 +09:00
smoogipooo
d9524f692d Renamings. 2017-03-21 21:36:05 +09:00
Dan Balasescu
7bda1866fd Merge branch 'master' into taiko_judgement_scoring 2017-03-21 16:44:31 +09:00
smoogipooo
1ac9898a36 Add judgement texts. 2017-03-21 16:33:25 +09:00
smoogipooo
4c398b106d Add explosion rings. 2017-03-21 15:54:57 +09:00
smoogipooo
9b5cb7ec23 Merge branch 'taiko_judgement_scoring' into taiko_playfield_2 2017-03-21 15:33:59 +09:00
smoogipooo
10ed6ef10d Move TaikoPlayfield to separate file. 2017-03-21 15:09:54 +09:00
smoogipooo
3f7cd41490 Merge branch 'master' into taiko_bash_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-20 18:20:32 +09:00
smoogipooo
5a28833c32 Merge branch 'master' into taiko_hit_drawables 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-20 18:17:18 +09:00
smoogipooo
a27dae0beb Merge branch 'master' into taiko_hitobject_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-20 18:09:05 +09:00
smoogipooo
a3e406af6a Merge branch 'master' into taiko_drumroll_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-20 18:05:54 +09:00
smoogipooo
f87f334dcd Merge branch 'master' into taiko_note_circle 2017-03-20 16:55:08 +09:00
smoogipooo
730824fa58 Move pieces out of the visual test, fix up comments, rewrite FinisherPiece. 2017-03-20 16:50:22 +09:00
smoogipooo
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +09:00
smoogipooo
b629766892 Add initial taiko note circles. 2017-03-17 22:01:06 +09:00
smoogipooo
ecd6958eea Add basic DrawableDrumRoll (no graphics yet, just input). 2017-03-17 19:30:22 +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
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
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
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
2e0d100a22 Add base DrawableTaikoHitObject, remove DrawableTaikoHit. 2017-03-17 15:19: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
c82ae011fb Make ScoreProcessors take generic judgements. 2017-03-16 12:45:23 +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
36e8618370 Make DrawableHitObjects have generic JudgementInfos. 2017-03-15 18:55:38 +09:00
smoogipooo
7141bc86d3 Rework beatmap post-processing into HitRenderer. 2017-03-14 17:01:21 +09:00
Dean Herbert
2756d5f09f Merge branch 'master' into mod_application 2017-03-13 23:00:11 +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
c0e29652a6 Initial attempt at making mods apply better. 2017-03-12 22:13:43 +09:00
smoogipooo
592e05a2c8 Better beatmap conversion model. 2017-03-12 00:34:21 +09:00
smoogipooo
fa9110ce6e Remove custom combo counters. 2017-03-10 11:04:46 +09:00
DrabWeb
bb12463ae4 Working on better way to handle mods 2017-03-01 20:57:33 -04:00
Dean Herbert
a22216d0b0
Update nuget packages. 2017-02-27 20:38:30 +09: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
John Leuenhagen
7ad9cd6b6e
add explicit false values to prevent warnings as errors 2017-02-12 02:32:11 -05: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
4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +09:00