Commit Graph

8838 Commits

Author SHA1 Message Date
127084ba74 Merge remote-tracking branch 'origin/master' into labelled-text-box 2018-07-25 18:35:04 +09:00
b60e4b0728 Cleanup 2018-07-25 18:34:47 +09:00
53e55c2f14 Merge branch 'master' into fix-always-skipping 2018-07-25 15:30:24 +09:00
38f221cd60 Merge branch 'master' into fix-turkish-i 2018-07-25 08:15:20 +02:00
da8fc0ee5d ToLower -> ToLowerInvariant 2018-07-25 07:37:05 +02:00
425b5e4119 Merge remote-tracking branch 'upstream/master' into peppy-fix-turkish-i 2018-07-25 07:36:24 +02:00
affecccabc Merge branch 'master' into fix-invalid-operation 2018-07-25 14:35:36 +09:00
6675c455f3 Trim whitespace that magically appeared 2018-07-24 22:33:19 +03:00
3ca112aef0 Clean code and apply requested changes 2018-07-24 22:04:02 +03:00
5364a6148a Use ToUpperInvariant 2018-07-24 14:42:06 +02:00
1d86083981 Hide unnecessary log output 2018-07-24 12:13:48 +02:00
b38da34da9 Fix resetting database failing due to incorrect disposal logic 2018-07-24 12:13:48 +02:00
ab9340f4be Fix usage of culture local ToUpper causing incorrect display on Turkish machines
Closes #3098.
2018-07-24 11:37:43 +02:00
0e50e4ee34 Clean code 2018-07-24 10:10:17 +03:00
765c6e4ecc Remove custom text box 2018-07-24 09:46:24 +03:00
2f452c162c Make text colour white 2018-07-24 09:21:01 +03:00
a833fa3d92 Update framework and apply suggested changes 2018-07-24 09:19:45 +03:00
cd37b0df23 Merge branch 'master' into labelled-text-box 2018-07-24 09:19:22 +03:00
dd56a2d95f Apply proposed changes (untested) 2018-07-23 15:44:10 +03:00
1b456fd716 Fix a potential InvalidOperationException when entering song select
Closes #3052.
2018-07-23 13:11:06 +02:00
2169a47325 Prevent fatal failures on delete failures 2018-07-23 10:39:43 +02:00
44a2ae5f9a Fix incorrect variable usage 2018-07-23 08:33:47 +02:00
aead4be134 Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container 2018-07-23 06:36:10 +02:00
479fe98335 Add more prominent sound when skipping 2018-07-22 22:57:55 +02:00
6fa70ed696 Merge branch 'master' into centralise-judgement-display 2018-07-23 05:23:52 +09:00
3c59ccadd0 Fix gameplay always skipping to first hitobject time
Regresssed with previous build
2018-07-22 22:19:58 +02:00
d561f54282 Merge branch 'master' into per-object-css 2018-07-23 03:01:17 +09:00
d868d81b59 Merge branch 'master' into centralise-judgement-display 2018-07-23 02:58:49 +09:00
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
a2f744b05e Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas 2018-07-21 00:03:17 +09:00
77da100c0f Merge branch 'master' into fix-model-import 2018-07-20 23:30:41 +09:00
f200cfe40d Add labelled text box files 2018-07-20 13:05:19 +03:00
3fc7f33e90 Merge branch 'master' into centralise-judgement-display 2018-07-20 17:29:15 +09:00
7cc999027d Merge branch 'master' into pause-input-fixes 2018-07-20 17:20:19 +09:00
241437c819 Remove unnecessary counting change logic 2018-07-20 17:08:25 +09:00
1139f0dbf2 Centralise method of disabling playfield judgements 2018-07-20 17:04:33 +09:00
fc6deb6ab5 Merge remote-tracking branch 'upstream/master' into peppy-fix-model-import 2018-07-20 16:42:46 +09:00
7fea2b3a8b Add ToList 2018-07-20 16:38:02 +09:00
92fe996a8b Merge branch 'master' into fix-model-import 2018-07-20 16:17:39 +09:00
0e7bb3b548 Merge branch 'master' into no-more-memory-sqlite 2018-07-20 16:17:36 +09:00
c087a73f40 Implement per-hitobject custom sample banks 2018-07-20 15:12:44 +09:00
de8d05bb0c Remove unnecessary setting of sample name to same value 2018-07-20 15:12:21 +09:00
64ead0fdf7 Add more tests and fix one remaining issue case 2018-07-20 11:55:17 +09:00
9eb69a1e76 Restructure + corrects converting to support all systems 2018-07-19 17:47:55 +02:00
4e72794101 Converts float to int. 2018-07-19 15:55:38 +02:00
5dba048c46 Merge branch 'master' into mania-mask-container 2018-07-19 19:38:43 +09:00
d7f1766ee2 wip 2018-07-19 18:51:08 +09:00
c31676f8f1 Rework update methods to separate out ruleset and beatmap changes
Combining them was causing complexity and logic errors.
2018-07-19 18:48:40 +09:00
693ba8e994 Add more ToString output 2018-07-19 18:43:11 +09:00
b7721edc80 Remove more unnecessary changes 2018-07-19 18:25:28 +09:00