Commit Graph

1345 Commits

Author SHA1 Message Date
354a99f5e1 Merge branch 'master' into samah-ios 2019-01-28 15:34:46 +09:00
2058604ef3 Typo fix 2019-01-26 23:10:13 +08:00
0797f5d644 Update SliderPlacementBlueprint.cs 2019-01-26 22:56:31 +08:00
e71b13683a Add null check 2019-01-26 22:55:33 +08:00
03e57d0423 fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp 2019-01-26 20:15:19 +08:00
e939f75f4b Transform screen mouse coordinates to local space coordinates. 2019-01-26 18:19:01 +08:00
73dbf5712d add license headers 2019-01-26 13:43:27 +08:00
1427c9f576 trim whitespaces 2019-01-26 13:11:08 +08:00
c6e26a92ec add wind up and wind down mods 2019-01-26 12:15:45 +08:00
77763fde8b revert accidentally renamed variables 2019-01-25 11:22:05 +01:00
4a916b2dee replace license headers with new ones 2019-01-25 11:17:48 +01:00
8ddff673b7 revert previous rename and rename ruleset specific classes instead 2019-01-25 11:14:37 +01:00
5446c99f22 Merge branch 'master' into move-osu-settings 2019-01-25 10:57:04 +01:00
014ea972d9 Merge remote-tracking branch 'origin/master' into samah-ios 2019-01-25 11:51:44 +09:00
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
481f33d17b add setting to toggle the gameplay cursor trail 2019-01-23 14:27:39 +01:00
33b46dc4e8 adjust year in license header to match CFS's expectations 2019-01-23 13:17:29 +01:00
cf147083cd move osu! settings into its ruleset 2019-01-23 13:17:29 +01:00
4a9bcf4937 rename OsuConfigManager to GameConfigManager
also OsuSetting to GameSetting
2019-01-23 13:17:29 +01:00
728c744e4d Merge branch 'master' into samah-ios 2019-01-23 22:19:49 +10:30
8160162cde Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics 2019-01-21 20:58:17 +09:00
baae53d784 Merge branch 'diffcalc-fixes' into xexxar-angles 2019-01-20 22:19:50 +09:00
3db23898df Merge remote-tracking branch 'origin/master' into diffcalc-fixes 2019-01-20 13:27:42 +09:00
10b91e18bd Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
a8e9adafdb Fix final section not being saved 2019-01-17 12:51:49 +09:00
e44bc57a3d Fix minDistanceFromEnd using seconds rather than milliseconds
Velocity in stable is defined as distance per SECOND, while lazer defines it as distance per MILLISECOND.
2019-01-15 19:18:56 +09:00
117c514479 Fix lazy slider calculation inaccuracy
What were we doing... On /b/1221540 stable's repeat points happen 90% through the length of each span! We should use lazer's more accurate calculations.
2019-01-15 19:07:25 +09:00
a6c54a9675 Merge branch 'master' into samah-ios 2019-01-12 00:16:09 +10:30
6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
17bc933db2 Revert unnecessary changes 2019-01-10 19:01:41 +09:00
8cd058ed9a Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-10 18:38:20 +09:00
a09615144e Kill White Space 2019-01-09 01:47:39 -07:00
dfe35f850c Add rebalances to lazer performance calc 2019-01-09 01:42:48 -07:00
a267a1a085 Merge branch 'master' into samah-ios 2019-01-08 17:09:26 +10:30
8edec10e5f Merge branch 'master' into fix-replay-import-statistics 2019-01-08 11:26:12 +09:00
881b10a18f Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini 2019-01-08 11:01:04 +09:00
7eed3ffe75 Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 10:02:06 +09:00
4cee21f356 Make skinning better 2019-01-07 20:12:39 +09:00
ca98caf84b Merge pull request #4001 from UselessToucan/linq_temp
Use Find instead of FirstOrDefault
2019-01-07 18:50:59 +09:00
8914585021 Fix implementation of conditional cursor expanding 2019-01-07 18:28:26 +09:00
b57c1af084 Only update stacking if there are hitobjects 2019-01-07 18:15:44 +09:00
c6c22b352f More verbose exceptions 2019-01-07 18:13:40 +09:00
13b077c83b Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini 2019-01-07 18:11:17 +09:00
351ab6e9bd Shortcut O(n^2) calculation 2019-01-07 18:01:44 +09:00
1c5ab6a906 Implement stacking by index 2019-01-07 18:00:59 +09:00
e73845172c Merge branch 'master' into fix-replay-import-statistics 2019-01-07 13:44:01 +09:00
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
722210d8bb Merge remote-tracking branch 'origin/master' into xexxar-angles 2019-01-04 23:52:23 +09:00
3fa5a33fb1 Inline const 2019-01-03 18:58:07 +09:00
273b14b19c Add a maximum length for slider ticks to be generated 2019-01-03 18:51:47 +09:00