Commit Graph

1353 Commits

Author SHA1 Message Date
Dean Herbert 48e54c84c1
Merge branch 'master' into mod-wind 2019-03-08 20:23:02 +09:00
Dean Herbert a73e3d9700 Move cursor construction to BDL 2019-03-08 15:01:45 +09:00
Dean Herbert 2c98ba1c0c Split out consumption and creation into two separate code paths 2019-03-08 14:59:45 +09:00
Dean Herbert 3ccc76e18f Merge remote-tracking branch 'upstream/master' into cursor-in-playfield 2019-03-08 14:50:46 +09:00
Dan Balasescu d1c18c52ab
Merge branch 'master' into fix-cursor-in-scale-container 2019-03-08 12:43:57 +09:00
Dan Balasescu 101009c92e
Merge branch 'master' into fix-autoplay-tests 2019-03-08 12:14:40 +09:00
Dean Herbert 1f44dde96b Fix autoplay tests not working 2019-03-07 18:34:56 +09:00
smoogipoo 04d756524d Adjust with shader changes 2019-03-07 18:30:18 +09:00
Dean Herbert 62716851a1 Revert some unnecessary changes 2019-03-06 17:41:54 +09:00
Dean Herbert 7aa30ca3f6 Change method of cursor creation 2019-03-06 17:41:54 +09:00
Dean Herbert acf518c208 Move cursor inside playfield 2019-03-06 17:41:54 +09:00
Dean Herbert 5411c63093 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-06 17:14:08 +09:00
Dean Herbert 2300e59e91 Formatting and simplification 2019-03-06 14:19:00 +09:00
Dean Herbert d70b373af9
Merge branch 'master' into mod-wind 2019-03-06 14:04:04 +09:00
Dean Herbert 6b042eae94
Merge branch 'master' into fix-cursor-in-scale-container 2019-03-05 22:22:56 +09:00
Dean Herbert 8a6fa0915e
Merge branch 'master' into simplify-gameplay-clock 2019-03-05 20:22:46 +09:00
Dean Herbert 558dbafb71 Use a safer method of setting the clock 2019-03-05 20:14:04 +09:00
Dean Herbert d5943330b1 Fix potential infinite loop 2019-03-05 20:06:04 +09:00
smoogipoo a08086cc8a Fix volume not being considered for file samples 2019-03-05 18:21:29 +09:00
Dean Herbert fc0b297232 Fix menu cursor not displaying outside of gameplay scaling area 2019-03-05 18:06:24 +09:00
Dean Herbert 9a9b4efb8d Fix excess line 2019-03-05 16:41:11 +09:00
Dean Herbert ec063a13db Update RulesetInputManager to support new clock structure more accurately 2019-03-05 16:34:50 +09:00
Dean Herbert 01f1018d02 Tidy up clock logic using DI and a GameplayClock 2019-03-05 13:37:51 +09:00
LeNitrous 74a23edaf7 no longer adjust the clock rate 2019-03-04 17:48:51 +08:00
LeNitrous 86e861ddeb update mod descriptions 2019-03-04 17:39:13 +08:00
LeNitrous b83d44c316 use ternary operator instead 2019-03-03 16:50:31 +08:00
LeNitrous a1a8246c05 trim whitespace 2019-03-03 16:30:08 +08:00
LeNitrous ecc2c28a62 mod rule changes 2019-03-03 16:22:00 +08:00
Dean Herbert 2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
Dean Herbert 0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert 42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert 26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert c8793911a8 Enable more stringent inspectcode style inspections 2019-02-27 21:25:40 +09:00
smoogipoo f66fefb818 Adjust comment + accessibility 2019-02-27 16:30:10 +09:00
smoogipoo a07d797d75 Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization 2019-02-27 12:08:43 +09:00
smoogipoo 8a943a6e65 Fix scores being stored as ints 2019-02-26 13:10:59 +09:00
Dean Herbert 90cae0a69c Simplify RulesetInputManager further 2019-02-23 15:48:34 +09:00
Dean Herbert 6d3c0e3191 Holy sheet 2019-02-23 14:39:55 +09:00
Dean Herbert 0c218eb0d5 Apply new RulesetInputManager logic
Run UpdateSubTree twice to ensure correctness
2019-02-23 14:14:41 +09:00
smoogipoo d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
Dean Herbert 3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert 3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
Dean Herbert 2c9e6adfd4
Merge branch 'master' into bindable-valuechanged 2019-02-22 17:14:05 +09:00
Dean Herbert f919f2252f Add ToString for Judgements to ease debugging 2019-02-22 12:02:54 +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 7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
smoogipoo 0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00