h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 23:37:26 +08:00
Code Issues Releases Wiki Activity
18,821 Commits 3 Branches 654 Tags 363 MiB
41da491a7e
Commit Graph

581 Commits

Author SHA1 Message Date
smoogipoo
36be171c29 Fix up/clean up csprojs for C#7 support 2017-11-30 02:06:03 +09:00
smoogipoo
a0c3349935 Add LangVer.props and osu.Game.props for common csproj properties 2017-11-30 00:45:37 +09:00
smoogipoo
267bb75458 Merge remote-tracking branch 'Aergwyn/master' into netstandard 2017-11-29 23:45:29 +09:00
smoogipoo
7db7fb91dd Ignore ruleset testcases from CI 2017-11-28 21:45:24 +09:00
smoogipoo
a9cc156d7a Merge remote-tracking branch 'origin/master' into performance-calculator 2017-11-28 21:38:26 +09:00
Dean Herbert
23b4d2163c Fix spelling and grammar 2017-11-28 21:30:03 +09:00
Dean Herbert
2bb61e51ac Add catcher scale based on CircleSize 2017-11-28 19:43:26 +09:00
Dean Herbert
b11de50df2 Cleanups 2017-11-28 18:42:50 +09:00
Dean Herbert
5ae9b4c791 Make CatchStacker testcase more useful 2017-11-28 18:39:54 +09:00
Dean Herbert
b517523f4a Add back CatcherArea to simplify layout 2017-11-28 18:39:45 +09:00
Dean Herbert
8f3fd7092e CatchBaseHit -> CatchHitObject 
Also moves default scale to CatchHitObject.
 2017-11-28 18:37:41 +09:00
Dean Herbert
2deb33ac41 Add basic fruit scaling support 2017-11-28 18:34:40 +09:00
Dean Herbert
11d406aa0c Fix osu!catch conversion expecting full positional data, rather than just X. 
Closes #1367.
 2017-11-24 11:49:10 +09:00
smoogipoo
f9ad4b6acb Make categoryDifficulties return doubles to improve decimal accuracy 2017-11-21 19:55:09 +09:00
smoogipoo
b3bf6e7bee Merge master into netstandard 2017-11-21 16:39:21 +09:00
smoogipoo
756f6f2d16 Remove net461 targets 2017-11-20 10:10:28 +09:00
smoogipoo
067c018422 Cleanups 2017-11-19 17:31:35 +09:00
smoogipoo
d2ab0621f3 Make osu.Game + rulesets compile with netstandard 2017-11-19 13:46:51 +09:00
smoogipoo
bf44b3d0ef Cleanups 2017-11-17 16:54:50 +09:00
smoogipoo
38fe95d94a Add basic display for pp in TestCasePerformancePoints 2017-11-17 14:37:19 +09:00
smoogipoo
95fd323c6b Fix ManiaDifficultyCalculator possibly failing due to nullref 2017-11-17 14:37:06 +09:00
smoogipoo
ac6213d1fa CI fixes 2017-11-17 14:26:33 +09:00
smoogipoo
62155e6dd5 Make DifficultyCalculator support mod applications 
Fixes https://github.com/ppy/osu/issues/476.
 2017-11-17 12:36:07 +09:00
smoogipoo
f461f03b08 Make osu! compile with framework changes 2017-11-16 14:51:31 +09:00
Dean Herbert
bbc5c05055 Disable ruleset-level tests for now 2017-10-23 21:25:54 +09:00
Dean Herbert
36af0dc809 Update app config for rulesets 2017-10-19 14:59:11 +09:00
Dean Herbert
179542daf1 Standardise AssemblyInfos 2017-10-14 15:02:20 +09:00
Dean Herbert
c5046f6b3c Add back osu.Desktop project 
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.

This allows for the project to build again with default visual studio settings.
 2017-10-14 14:33:05 +09:00
Dean Herbert
bb6b656ec6 Fix code review issues 2017-10-12 22:27:22 +09:00
Dean Herbert
4a4c01f221 Fix CI problems 2017-10-11 21:25:15 +09:00
Dean Herbert
744d548738 Add missing licence header 2017-10-11 20:28:10 +09:00
Dean Herbert
0b282a49bd Add tiny droplet support 2017-10-11 20:11:29 +09:00
Dean Herbert
1b732c799a Make all juice nested objects from ticks 2017-10-11 19:10:07 +09:00
Dean Herbert
1f1bdc6162 Make juice streams interactive (and correctly positioned) 2017-10-11 18:18:06 +09:00
Dean Herbert
e4f915e5af Fix scoring simulation not supporting juice 2017-10-10 20:22:57 +09:00
Dean Herbert
03fbf47bc2 Add juicy streams 2017-10-10 20:22:42 +09:00
Dean Herbert
26215b4488 Create an abstract base class for drawable catch objects 2017-10-09 19:42:55 +09:00
Dean Herbert
37393ab2c9 Move brace 2017-10-02 22:24:22 +08:00
Dean Herbert
3338024c17 Fix incorrect whitespace 2017-10-02 22:12:53 +08:00
Dean Herbert
7168629b2a Remove CatcherArea abstraction 
Also fixes catcher size being relative to aspect ratio.
 2017-10-02 21:55:37 +08:00
Dean Herbert
66afba6219 Allow TestCasePlayer to instantiate only one ruleset type 2017-10-02 20:48:24 +08:00
Sinnoh
3b9c2d1d5f changed description for hidden 
ctb doesn't have approach circles
 2017-09-26 16:50:12 +08:00
Dean Herbert
e0911f014e Fix ruleset target path for release builds 2017-09-19 22:50:36 +09:00
Dean Herbert
611f4df484 Add licence header 2017-09-19 21:41:51 +09:00
Dean Herbert
f96875a470 Add a catch specific player test 2017-09-19 21:40:57 +09:00
Dean Herbert
0aa152974a Add interfaces to CatchBaseHit 2017-09-19 21:40:38 +09:00
Dean Herbert
4b68950428 Fix incorrect coordinate mapping on fruit explosion 2017-09-19 21:39:53 +09:00
Dean Herbert
c88b0784da Use MaxValue instead of PositiveInfinity 2017-09-19 21:39:17 +09:00
Dean Herbert
d192c2d83b Merge remote-tracking branch 'upstream/master' into ctb-improvements 2017-09-19 20:54:39 +09:00
Dean Herbert
99b512cce5 Output ruleset assemblies to the game folder rather than adding special logic 2017-09-19 19:27:14 +09:00
Dean Herbert
1f20c5eb69 Optimise project references 2017-09-19 16:07:00 +09:00
Dean Herbert
8fa76557db Avoid unnecessary dll copies 2017-09-19 16:06:59 +09:00
Dean Herbert
6db705a3a8 Update relative paths 2017-09-19 16:06:58 +09:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Dean Herbert
60b38b2776 Add the most basic score calculation for catch 2017-09-18 12:48:45 +09:00
Dean Herbert
d3c58c848d Add licence header 2017-09-18 12:48:33 +09:00
Dean Herbert
e52a4fe72c Put caught fruit in their own container to reduce casting 2017-09-18 12:33:01 +09:00
Dean Herbert
cfcb0c1c6e Add (incorrectly) exploding fruit 2017-09-15 21:26:36 +09:00
Dean Herbert
fe221905fa Make fruits look a bit closer to the final design 2017-09-15 20:55:04 +09:00
Dean Herbert
4e0aed4b8a Add combo/colour metadata to CatchBaseHit 2017-09-15 20:54:34 +09:00
Dean Herbert
b9ab034f94 Fix catcher movement speed being way too slow 
Now matches osu-stable
 2017-09-15 19:32:46 +09:00
Dean Herbert
b78c516b74 Merge branch 'master' into scoring-revamp 2017-09-13 20:47:14 +09:00
Dean Herbert
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
smoogipooo
5e32d95ad2 Remove Ruleset's CreateScoreProcessor method 2017-09-13 16:37:05 +09:00
smoogipooo
093d82ac45 Set depths from playfield add methods instead of DrawableHitObject 2017-09-13 16:17:01 +09:00
smoogipooo
6682c3a736 Override instead of re-binding event 2017-09-13 16:15:11 +09:00
smoogipooo
3e3618d724 More cleanups 2017-09-12 21:12:57 +09:00
smoogipooo
abab2a4878 Revamp score processing to once more unify scoring methods 2017-09-12 21:05:50 +09:00
smoogipooo
0b94939474 Make Accuracy = 1, Health = 1 the default for ScoreProcessor 2017-09-12 20:53:26 +09:00
Dean Herbert
86de4fa2e2 Apply CI fixes 2017-09-12 18:36:19 +09:00
Dean Herbert
f32d444d68 Remove generics from Playfield (fixes catch) 2017-09-12 18:19:28 +09:00
Dean Herbert
1194e46ef1 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-12 17:46:21 +09:00
Dean Herbert
20dae5ee11 Minor refactors 2017-09-12 17:36:46 +09:00
smoogipooo
58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations 
# Conflicts:
#	osu-framework
 2017-09-11 15:02:12 +09:00
Dean Herbert
5ce76d8023 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-11 14:36:51 +09:00
Dean Herbert
7170fbd087 Target .NET 4.6.1 2017-09-11 12:39:00 +09:00
smoogipooo
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations 
# Conflicts:
#	osu-framework
 2017-09-11 02:42:23 +09:00
MrTheMake
a7f874e5b6 Merge branch 'master' into leaderboard-scores 2017-09-07 18:25:33 +02:00
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
smoogipooo
0cc443e618 Remove all generic judgements. 2017-09-06 18:05:51 +09:00
smoogipooo
ac8ec31b61 Make judgements able to be "added" plus make everything compile and run. 2017-09-06 17:02:13 +09:00
Dean Herbert
84c22df3f5 Combine Judgement.HitResults into one. 2017-09-06 17:01:48 +09:00
Dean Herbert
16e96888ab Update KeyCounterCollection to support action-based buttons 2017-08-21 12:39:22 +09:00
MrTheMake
6d401b5f21 Merge branch 'master' into leaderboard-scores 2017-08-19 00:00:40 +02:00
Dean Herbert
d6249e7a63 Add support for binding mouse buttons to actions 2017-08-18 20:01:41 +09:00
Dean Herbert
a44ff5a2c2 Fix regression causing global hotkeys to no longer work 2017-08-17 17:47:44 +09:00
Dean Herbert
7c9d6c9c83 Initial refactoring of key binding logic 2017-08-14 20:19:25 +09:00
MrTheMake
81289db33b CI fix, fixed nullref and removed abstraction of GetAutoplayMod 2017-08-13 20:12:01 +02:00
MrTheMake
d9c26f98c7 Suggested changes 2017-08-13 19:54:07 +02:00
MrTheMake
4c2d7bf343 Parse the mods of a leaderboard's score 2017-08-13 17:41:13 +02:00
Dean Herbert
fe2911f165 Fix some formatting issues 2017-08-13 10:36:57 +09:00
Dean Herbert
99458aab48 Propagate framework updates 2017-08-12 19:54:07 +09:00
Dean Herbert
48d4ed55e9 Move a lot of code to framework 2017-08-11 16:11:46 +09:00
Dean Herbert
798fff00b2 Remove shortcomings, remove InputState.Data usage, make everything amazing 
No more casting!
 2017-08-10 19:28:24 +09:00
Dean Herbert
b6bb07c0b5 Add ConcurrentActionModes to support osu! gameplay more easily 2017-08-10 18:28:22 +09:00
Dean Herbert
6ba5bdf1e6 Add description attributes to all actions 2017-08-10 17:14:30 +09:00
Dean Herbert
30bd1d70b5 ActionMapping doesn't support concurrent actions by default 
But can when required. Also supports key combination bindings now.
 2017-08-10 16:08:43 +09:00
Dean Herbert
34b12fbfa4 Add global actions; improve default assignment 2017-08-09 17:10:32 +09:00
Dean Herbert
459a4cafb1 Remove unnecessary HandleInput 2017-08-09 15:17:05 +09:00
Dean Herbert
3b48a6c668 Fix CI issues 2017-08-09 15:15:41 +09:00
Dean Herbert
723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00
Dean Herbert
7c0e7ebcd0 Give HitRenderer a reference to Ruleset 
Used to get correct bindings for a mode (ActionMappingInputManager).
 2017-08-09 13:05:52 +09:00
Dean Herbert
b88f37de45 Add custom actions for Catch 
Reworks input management for rulesets
 2017-08-09 11:50:34 +09:00
Dean Herbert
06e5f7de09 Make pulp size private 2017-08-09 10:16:31 +09:00
Dean Herbert
2203d55d64 fixes 2017-08-08 13:31:55 +09:00
Dean Herbert
ca2da5ac9b Don't crash on spinners 2017-08-08 13:03:34 +09:00
Dean Herbert
5704e9ee65 Fix failing at beginning of map 2017-08-08 12:58:43 +09:00
Dean Herbert
ff490cf44c Add catching support 2017-08-08 12:58:43 +09:00
Dean Herbert
99a00ed319 Make fruit look a bit better (and buffer them to a texture) 2017-08-08 12:58:43 +09:00
Dean Herbert
4bdaa8ae68 Add basic miss support 2017-08-08 10:36:05 +09:00
Dean Herbert
e67379b6de Use ScrollingHitRenderer 2017-08-08 10:35:56 +09:00
Dean Herbert
70585a279d Comment out unused variables for now 2017-08-08 07:48:03 +09:00
Dean Herbert
4d1dd70cfb Licence headers 2017-08-08 07:32:23 +09:00
Dean Herbert
725a69d973 Begin conversion 2017-08-07 16:02:14 +09:00
Dean Herbert
b71caca131 Expand abilities of catcher 2017-08-07 15:09:31 +09:00
Dean Herbert
c930085213 Add glow 2017-08-07 11:06:03 +09:00
Dean Herbert
51d2b9c35c Tidy up visually 2017-08-07 11:05:58 +09:00
Dean Herbert
81b738f68c Add basic Catcher 2017-08-07 11:05:54 +09:00
Dean Herbert
554d0d6fb8 Update basic structure of Catch project 2017-08-07 11:05:48 +09:00
Huo Yaoyuan
62b3540fd6 Merge branch 'master' into fixes 2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e Provide Autoplay mod in Ruleset. 2017-08-04 00:25:24 +08:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon 
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
 2017-08-03 14:36:21 +09:00
Thomas Müller
e8ce3e16b0 Address CI concern 2017-07-10 12:52:29 +03:00
Dean Herbert
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
paparony03
62dee59672 Shapes namespace 
Depends on https://github.com/ppy/osu-framework/pull/837
 2017-06-20 15:54:23 +10:00
Dean Herbert
41d4aee4f5 Update nuget packages 
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
 2017-06-13 11:50:46 +09:00
Shawdooow
ecc0d0b11c Daycore mod 2017-05-30 12:49:06 -04:00
smoogipooo
7b05930fc2 Revert "Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects." 
This reverts commit 6821197a6a.
 2017-05-19 17:38:06 +09:00
smoogipooo
6821197a6a Fix converters possibly not converting from new-style beatmaps that hold mode-specific objects. 2017-05-19 16:40:01 +09:00
smoogipooo
67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00