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

45 Commits

Author SHA1 Message Date
Dean Herbert e88d02d3c4 Ensure SliderCurve is assigned Calculated before used. 2017-02-15 01:23:19 +09:00
Dean Herbert fc192906ea Handle proxied approach layer better and add slider's approach circle (previously missing). 2017-02-15 01:23:19 +09:00
Dean Herbert 9a5ac64332 Make HitObjectType more accessible. 
# Conflicts:
#	osu.Game.Modes.Osu/Objects/OsuHitObjectParser.cs
 2017-02-15 01:23:19 +09:00
Dean Herbert f207da6041
Add/update license headers. 2017-02-14 18:17:35 +09:00
Dean Herbert 343e48c195 Merge branch 'master' into followpoints 2017-02-13 22:23:57 +09:00
Thomas Müller aaaf7163e0
Update framework. 2017-02-13 17:46:50 +09:00
Damnae daa14bfec8 Replace AddConnections by a HitObjects property. 2017-02-12 08:47:07 +01:00
John Leuenhagen 7ad9cd6b6e
add explicit false values to prevent warnings as errors 2017-02-12 02:32:11 -05:00
Damnae de2791e179 Better looking follow points. 2017-02-12 08:22:13 +01:00
Damnae d7be9539d1 Create connections from HitObjects instead of DrawableHitObjects. 2017-02-12 07:29:36 +01:00
Damnae 4162ef72d4 Remove start/end index. 2017-02-12 06:02:45 +01:00
Damnae ec64455573 Add xml-doc. 2017-02-10 10:28:21 +01:00
Damnae 6f37c02868 Fix followpoints needing a DelayReset. 2017-02-10 10:07:52 +01:00
Damnae 4e6b6ab794 Abstract follow points into a separate class. 2017-02-10 08:10:24 +01:00
Damnae 77ee161be8 Add follow points. 2017-02-10 06:19:59 +01:00
Andrey Zavadskiy e06aa44c4c Warning Fixes 2017-02-09 16:18:08 +03:00
Damnae 07c0057fab Update GetPathToProgress's xml-doc. 2017-02-09 08:57:28 +01:00
Damnae a79fde897b Add StackedPosition/StackedEndPosition and offset slider curves by StackOffset. 2017-02-09 08:29:21 +01:00
Damnae 38b25a7df3 Add hit object stacking. 2017-02-09 07:28:40 +01:00
Dean Herbert 6b011a50d2
Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
Dean Herbert 50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert 9b9ed32245
Remove all @2x references, updates resource and framework. 2017-02-06 22:19:47 +09:00
Thomas Müller 8271b139e9 Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01. 2017-02-05 09:40:58 +01:00
Dean Herbert 7ce5fc08ee Merge branch 'master' into skip-button 
# Conflicts:
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj
 2017-02-01 14:05:58 +09:00
Dean Herbert 2ed5cf7c91 Hook up icons better. 2017-01-30 13:35:40 +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 3e7503e860 Make skip button work. 2017-01-27 21:57:22 +09:00
Dean Herbert 1d24ad3db6 osu! mode starts with health being full. 2017-01-27 00:41:34 +09:00
Dean Herbert 3a27178bb1 Merge pull request #289 from UselessToucan/JudgementsCapacity 
Specify ScoreProcessor.Judgements.Capacity
 2017-01-23 21:40:00 +09:00
TocoToucan badc8def9a hitObjectsNumber -> hitObjectCount 2017-01-18 18:51:38 +03:00
TocoToucan 259c0964fd Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations 2017-01-16 23:14:35 +03:00
Dean Herbert 1392cdfb9a Hook up naively. 2017-01-10 18:35:27 +08:00
Dean Herbert 8ba5c1c15d Fix not being able to hit two stacked circles by pressing both buttons/keys on the same frame. 2017-01-08 20:52:19 +08:00
Thomas Müller f13303c86c Do not lengthen slider curves according to the length prescribed in the .osu file for now. 
This fixes some issues with the map http://osu.ppy.sh/s/484689 . There is still one problem with an almost stationary slider in this map at around the 2/3 mark, but the rest seems to work fine now.
 2016-12-17 08:44:58 +01:00
Dean Herbert ec7bbd231f Make flash animation last slightly longer. 2016-12-15 22:58:30 +09:00
Dean Herbert 0a9e3ce1b0 Don't handle input in triangle particle effect containers. 2016-12-15 22:58:19 +09:00
Dean Herbert db5c2efa15 Rename tracking variable and change conditional as per feedback. 2016-12-13 18:12:35 +09:00
Dean Herbert c420c55291 Merge branch 'master' into hit-samples 
# Conflicts:
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
 2016-12-13 17:57:24 +09:00
Dean Herbert cc79a183db Merge pull request #235 from Tom94/circular-sliders 
Circular sliders
 2016-12-11 20:06:27 +09:00
Thomas Müller eef697d842 Wire up CircleSize to hitobjects. 
Note, that circle sizes still are wrong compared to stable osu. In order to fix this, the base radius of hitcircles needs to become 64, but it currently is 72.
 2016-12-11 10:11:22 +01:00
Thomas Müller 2ced0a48e0 Update framework. 2016-12-10 14:37:00 +01:00
Thomas Müller 38968ad6d2 Add circular arc approximator for "perfect" sliders. 2016-12-09 18:04:02 +01:00
Thomas Müller 359cb5ac6a Make bezier approximator slightly more correct (without affecting its behaviour). 2016-12-09 18:03:17 +01:00
Dean Herbert 8329022a2e Merge remote-tracking branch 'refs/remotes/upstream/master' into hit-samples 2016-12-08 21:41:02 +09:00
Dean Herbert 40ea6e0d72 Fix incorrect folder name. 2016-12-08 21:36:34 +09:00