h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 06:42:54 +08:00
Code Issues Releases Wiki Activity
55,702 Commits 3 Branches 657 Tags 364 MiB
a1297af441
Commit Graph

256 Commits

Author SHA1 Message Date
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
smoogipoo
0222424aef Make mods IReadOnlyList<Mod> gamewide 
Prevents potential multiple evaluations of enumerable.
 2019-04-10 17:20:36 +09:00
smoogipoo
c584967eb1 Remove mods from workingbeatmap 2019-04-09 12:59:32 +09:00
smoogipoo
772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability 
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
 2019-04-08 23:01:12 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo
dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
smoogipoo
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
6841d5c2ec Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework 2018-09-28 18:32:59 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
smoogipoo
cb500e80e4 Make BeatmapInfoWedge present until info is not null 2018-09-25 14:45:26 +09:00
Dean Herbert
37f3035437 Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-20 18:39:48 +09:00
smoogipoo
7b8094d731 Move text size/padding out of constructor 2018-09-20 12:53:45 +09:00
Dean Herbert
b2cf636ab5 Merge branch 'localisation-changes' into update-framework 2018-09-20 00:29:31 +09:00
smoogipoo
38a3c2a820 Fix song select wedge sometimes not updating when localisation changes 2018-09-19 14:57:32 +09:00
smoogipoo
28f31540c4 Apply changes in-line with framework localisation changes 2018-09-19 14:07:46 +09:00
Unknown
04853b8c83 don't show StatusPill without a difficulty 2018-09-13 13:49:57 +02:00
Unknown
5414ce9932 add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet 2018-09-13 10:18:20 +02:00
Dean Herbert
4bcc05a7fc Remove null checks on ruleset 
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
 2018-06-26 18:24:34 +09:00
Dean Herbert
b0a1b25983 Privatise game ruleset and access via DI 
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
 2018-06-26 16:32:32 +09:00
Dean Herbert
5c2a2e394e Fix incorrect async logic in BeatmapInfoWedge 
Closes #2653.
Alternative to #2657.
 2018-06-01 20:31:29 +09:00
Dean Herbert
db0470243a Fix nullref when changing ruleset at main menu 2018-05-13 12:55:54 +09:00
smoogipoo
fd9796d08c Remove some unnecessary changes 2018-05-11 14:13:52 +09:00
smoogipoo
816ad5c426 Pass down ruleset to the buffered wedge 2018-05-11 14:10:53 +09:00
smoogipoo
fbd7ccc03f Make BeatmapInfoWedge display properly for converts 2018-05-07 15:51:08 +09:00
smoogipoo
5489976c20 Implement ruleset-specific beatmap statistics 2018-05-07 15:51:08 +09:00
smoogipoo
9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
097ab66182 Fix resharper error 2018-03-25 01:54:25 +09:00
Dean Herbert
0e669c9a3f Fix many warnings 2018-03-24 18:23:22 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
ColdVolcano
13900d6130 Use LocalisationEngine on BeatmapInfoWedge 2017-12-30 14:12:47 -06:00
Dean Herbert
cf9a9762f7 Fix beatmap wedge appearing with incorrect info on entering song select 
Closes #1762
 2017-12-27 13:02:21 +09:00
Dean Herbert
3182c22c7d Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info 2017-12-26 20:36:22 +09:00
Dean Herbert
7504cd589d Move alpha handling to state 2017-12-26 20:18:47 +09:00
Aergwyn
44fbe7859a move anchor and origin so metadata doesn't move if it's partially empty 2017-12-26 11:34:26 +01:00
Dean Herbert
2313ff0ddb Fix beatmap info wedge not showing up when zero beatmaps are loaded 
Closes #1722.
 2017-12-22 22:19:11 +09:00
Aergwyn
ed827d5424 more visual tests for BeatmapInfoWedge 
also fix Author showing when not wanted
 2017-12-22 12:33:52 +01:00
Aergwyn
07f55a2a60 remove references to DummyWorkingBeatmap 
determine content by data that is present instead
 2017-12-22 10:18:25 +01:00
Aergwyn
214154c512 hide unnecessary lines on empty BeatmapInfoWedge 
adding back deleted line

ooops
meh
 2017-12-21 20:23:10 +01:00
smoogipoo
33654ee5b4 Remove explicit padding on icon 2017-12-15 13:01:06 +09:00
Aergwyn
f329b1ed72 add Spinner Count to BeatmapInfoWedge 
- added Tooltips to the respective InfoLabels
- made the TestCase internal like all others
 2017-12-14 19:55:15 +01:00
Dean Herbert
c2fcb2f9c7 Fix info wedge not displaying 2017-11-21 18:45:12 +09:00
Dean Herbert
bd616c1307 Simplify some property access 2017-11-21 12:42:28 +09:00
Dean Herbert
be9c99ade3 Remove AsyncLoadWrapper dependence 2017-11-21 12:42:28 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public 
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
 2017-11-21 12:06:16 +09:00
Huo Yaoyuan
9b3676c562 Use format string for double instead of Math.Round. 2017-10-15 16:44:15 +08:00
Dean Herbert
cd722e4abb Fix beatmap author being stored in two different places 2017-10-14 11:39:55 +09:00
Dean Herbert
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09: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
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
 2017-07-19 19:15:51 +02:00
Dean Herbert
0846414c5b Simplify state changes 2017-07-19 15:16:51 +09:00
Dean Herbert
632d2e8ba5 Dummy beatmap has dummy ruleset 2017-07-19 15:16:48 +09:00
Dean Herbert
21984ba764 Move DummyWorkingBeatmap to a more global level (OsuScreen) 2017-07-19 15:16:39 +09:00
Dean Herbert
e47faf4e85 Add a dummy beatmap provider for use in BeatmapInfoWedge 2017-07-19 15:16:33 +09:00
Thomas Müller
a5e610a7ba Update framework and fix compilation 
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
 2017-07-14 19:18:12 +03:00
Thomas Müller
40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00
paparony03
62dee59672 Shapes namespace 
Depends on https://github.com/ppy/osu-framework/pull/837
 2017-06-20 15:54:23 +10:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
smoogipooo
3cdfd2eef5 Split ControlPoint into different types. 
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
 2017-05-23 14:03:40 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert
a9b3f74218 Fix ruleset not always getting populated in a WorkingBeatmap 2017-05-12 20:05:44 +09:00
Dean Herbert
2ece1cbd07 CI Fixes. 2017-04-28 22:26:51 +09:00
Dean Herbert
70e81115f4 Refactor BeatmapInfoWedge to suck a little less. 2017-04-28 21:16:37 +09:00
Dan Balasescu
f329587bd4 Fix mismatched braces. 2017-04-25 08:02:09 +09:00
Dean Herbert
43d09a9734 CI fixes 2017-04-24 20:31:25 +09:00
Dean Herbert
c7b789424b Update BeatmapInfoWedge design 
- Adds colour difficulty strip.
- Adjusts paddings.
- Fixes source/artist confusion.
- Double dash to em-dash.
 2017-04-24 20:19:44 +09:00
Dean Herbert
64a8992153 Merge branch 'master' into general-fixes 2017-04-18 16:19:52 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Dean Herbert
727086c0b2
Updates in-line with framework. 2017-04-18 15:34:53 +09:00
Dean Herbert
928550b1a8 Merge branch 'master' into remove-playmode 2017-04-17 21:01:10 +09:00
Huo Yaoyuan
c235a14e3e Don't block input in BeatmapInfoWedge. 2017-04-17 17:08:01 +08:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
smoogipooo
ddce3c157f Clean up a few remaining stragglers. 2017-04-15 06:15:55 +09:00
smoogipooo
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
Dean Herbert
bfa2e68bfb Container->Wrapper. 2017-04-02 16:17:13 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert
4042b94e01
Use DelayedLoadContainer in more places. 2017-03-28 15:28:58 +09:00
smoogipooo
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
smoogipooo
5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +09:00
Dan Balasescu
a3906820ec Merge branch 'master' into beatmap_parsing 2017-03-15 19:29:45 +09:00
smoogipooo
72e1612f32 Null-safety in the case where there are no HitObjects. 2017-03-14 19:44:14 +09:00
Huo Yaoyuan
0198593697 Make BeatmapInfoWedge:OverlayContainer and unify transforms. 2017-03-14 16:29:20 +08: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
Huo Yaoyuan
3913a0a9ee Fix removal of the last one beatmap. 2017-03-14 05:35:58 +08: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
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dean Herbert
e356758a7d
Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
Thomas Müller
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01: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
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
e8b027130f
Remove unused variable. 2017-02-27 23:17:21 +09:00
Dean Herbert
afdb95f4d5
Fix even more test regressions. 2017-02-27 20:39:04 +09:00
Dean Herbert
7c602a2af3
Update framework. 2017-02-27 15:55:57 +09:00
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Thomas Müller
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
d570a6d308
Handle cases where HitObjects were not parsed. 2017-02-15 12:38:10 +09:00
Thomas Müller
aaaf7163e0
Update framework. 2017-02-13 17:46:50 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
Dean Herbert
9f90b57543 Move BPM calculations to Beatmap. 2017-01-30 16:03:45 +09:00
Dean Herbert
1f2f2fa144 Fix visualtests. 2017-01-30 15:15:56 +09:00
Dean Herbert
0c2152f3d0 Use beatmap's play mode. 2017-01-30 13:14:02 +09:00
Dean Herbert
e93f60396f Add the ability for individual game modes to report statistics for display at song select. 2017-01-30 13:12:30 +09:00
Dean Herbert
3286713d11 avg -> mostly 2017-01-29 15:16:38 +09:00
Dean Herbert
6027cc7afa Formatting fixes. 2017-01-29 15:15:04 +09:00
Dean Herbert
2e76874384 Simplify the lookup conditions for hitcircles/sliders (uses duration to discern). 2017-01-29 15:09:42 +09:00
Dean Herbert
3125fa89ee Fix method which should be class. 2017-01-29 15:06:44 +09:00
Dean Herbert
77558abf58 Merge branch 'master' into more-beatmap-info 
# Conflicts:
#	osu.Game/Screens/Select/BeatmapInfoWedge.cs
 2017-01-29 14:47:42 +09:00
Drew DeVault
fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -05:00
Drew DeVault
c222be05c0 Add Color4.Opacity and OsuColor.Gray 2017-01-10 13:44:40 -05:00
Drew DeVault
70ecf48ca7 Add central color class 
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
 2017-01-09 17:20:31 -05:00
n4b3l
c614d61b1a getbpm takes Beatmap instead of WorkingBeatmap 2016-12-18 19:34:20 +01:00
n4b3l
ded6588d3b minor style fixed 2016-12-18 17:21:05 +01:00
n4b3l
5f893d46c7 style fixes 2016-12-18 16:53:52 +01:00
Dean Herbert
2cbc528971 Remove janky beatmap info wedge animation, restore pixel snapping. 2016-12-18 16:50:39 +09:00
n4b3l
492581fa50 fixed length.seconds display 2016-12-18 04:03:11 +01:00
n4b3l
f551133b0e .. 2016-12-18 03:56:27 +01:00
n4b3l
3d64bee069 proper round + std bpm 2016-12-18 03:53:26 +01:00
n4b3l
63dd8893d9 bpm as ints 2016-12-18 02:53:43 +01:00
n4b3l
73532b9172 small code improvements 2016-12-17 19:57:58 +01:00
n4b3l
2f708a704d bpm range added + changed spacing 2016-12-17 19:31:34 +01:00
n4b3l
a04a0a7d2c fix allignment... 2016-12-17 15:58:51 +01:00
n4b3l
d812a7cb4e func for icons 2016-12-17 15:53:26 +01:00
n4b3l
9e6161b862 better scaling 2016-12-17 12:18:55 +01:00
n4b3l
e31e19f1b8 removed unnecessary padding 2016-12-17 12:04:42 +01:00
n4b3l
376b3df2f8 icons with TextAwesome 2016-12-17 11:57:52 +01:00
n4b3l
590db66b37 remove icons from resource 2016-12-17 11:30:30 +01:00
n4b3l
b78b40a629 implement icons 2016-12-17 01:58:39 +01:00
n4b3l
881d58574e Design improvements 2016-12-16 14:21:12 +01:00
n4b3l
991ad298d9 more beatùa 2016-12-16 04:25:28 +01:00