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

106 Commits

Author SHA1 Message Date
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 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 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
Dean Herbert c227eb1be5
Welded bindables. 2017-02-26 22:08:21 +09:00
Thomas Müller 1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Thomas Müller d150eb4450 Merge branch 'master' into better-star-counter 2017-02-24 19:37:04 +01:00
Thomas Müller f7d985fe18 Fix and refactor star difficulty calculation boilerplate 
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
 2017-02-24 19:36:17 +01:00
Dean Herbert 564608fe52
Fix incorrect slider assert logic (and improve flow). 2017-02-24 18:31:05 +09:00
Thomas Müller a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert 735961977b
Improve feel of spinners. 2017-02-22 18:23:06 +09:00
Dean Herbert 00ddcb11b4
Fix sliders playing hitsound twice at end. 2017-02-22 13:51:40 +09:00
Thomas Müller 7a0cea332f Add support for varying circle size 2017-02-19 18:21:45 +01:00
Thomas Müller 502ad4aa53 Fix incorrect naming scheme 2017-02-19 18:21:15 +01: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
Dean Herbert 1a31589abd
Add padding zeroes to score display (and fix not being applied initially). 2017-02-18 17:35:37 +09:00
Dean Herbert 32ce8cf723
Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
Dean Herbert 94dd268fd2
Move constant for default ControlPoint out of Slider. 2017-02-18 15:54:16 +09:00
Dean Herbert 0b922365bb
Fix nullref due to missing controlPoints. 2017-02-17 15:27:48 +09:00
Dean Herbert aaed714160
Adjust Explode alpha slightly. 2017-02-16 22:48:47 +09:00
Dean Herbert 53e40804ab
Move other score components to centre alignment (and switch font). 2017-02-16 22:44:41 +09:00
Nabile Rahmani 9c4bb82dd6 Merged upstream/master. 2017-02-16 13:23:11 +01:00
Nabile Rahmani 3068fa1a62 Namespace does not correspond to file location. 2017-02-16 11:30:31 +01:00
Dean Herbert b55d85a5c5
Add MaxScore to correctly account for the maximum attainable score of DrawableHitObjects. 2017-02-16 17:33:13 +09:00
Dean Herbert 8bf3902cbd
Add the concept of nested DrawableHitObjects. 
- Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
- Removed SliderTicksLayer abstraction for now.
 2017-02-16 17:02:36 +09:00
Dean Herbert 2640c2ac43
Add tick sample. 2017-02-16 13:39:01 +09:00
Dean Herbert 19eb58e724
Fix namespace. 2017-02-16 13:37:08 +09:00
Dean Herbert 97b782128e
Adjust tick appear/disappear animations. 2017-02-16 13:33:59 +09:00
Dean Herbert 6c9fe544b2
Handle case where TickDistance is zero (don't draw ticks). 2017-02-16 13:20:30 +09:00
Dean Herbert 23677a309f
Merge branch 'master' into slider_ticks 2017-02-16 11:06:23 +09:00
Damnae f1535363f4 Rename SliderTicksRenderer to SliderTicksLayer. 2017-02-15 19:06:54 +01:00
Damnae b7fca88b4f Clearer slider Velocity and TickDistance calculations. 2017-02-15 18:55:49 +01:00
Dean Herbert 31a617363a
Improve the feel of spinners. 2017-02-15 23:24:08 +09:00
Dean Herbert 7fbc5990d1
Add combo numbers. 2017-02-15 23:23:55 +09:00