ANDY840119-PC\andy840119
|
cc0520d722
|
1. because set stage's width doesn't help, so use margin instead
2. adjust spacing when has different number of stages
|
2018-01-10 23:47:38 +09:00 |
|
為什麼
|
fb857c5e37
|
Merge branch 'master' into master
|
2018-01-10 18:48:00 +09:00 |
|
Dean Herbert
|
5b6ddb984f
|
Merge pull request #1873 from peppy/rulesetinfo-refactor
Allow rulesets to create their own instantiation info
|
2018-01-10 17:34:01 +09:00 |
|
為什麼
|
97a3ad775c
|
Merge branch 'master' into master
|
2018-01-10 17:05:36 +09:00 |
|
Dean Herbert
|
58626e3b30
|
Allow rulesets to create their own instantiation info
|
2018-01-10 17:04:07 +09:00 |
|
Dean Herbert
|
fe7ce26b84
|
Merge pull request #1754 from ColdVolcano/background-blur
Add setting to adjust background blur level during gameplay
|
2018-01-10 13:50:08 +09:00 |
|
Dean Herbert
|
338eaad0e5
|
Merge remote-tracking branch 'upstream/master' into background-blur
|
2018-01-10 13:38:53 +09:00 |
|
Dan Balasescu
|
4f8ce272ae
|
Merge pull request #1853 from peppy/drop-fruit
Drop fruit when last in combo is not caught
|
2018-01-10 13:35:18 +09:00 |
|
Dean Herbert
|
9ec8f130a6
|
Ensure changes are only applied when we are the current screen
|
2018-01-10 13:24:26 +09:00 |
|
Dean Herbert
|
1c20fba6bc
|
Merge branch 'master' into drop-fruit
|
2018-01-10 12:29:53 +09:00 |
|
Dan Balasescu
|
632e6fcdd3
|
Merge pull request #1852 from peppy/fix-catcher-width
Fix catcher width and playfield scaling
|
2018-01-10 12:19:37 +09:00 |
|
Dean Herbert
|
32e237d138
|
Merge branch 'master' into drop-fruit
|
2018-01-10 11:39:46 +09:00 |
|
Dean Herbert
|
9d099feadc
|
Merge branch 'master' into fix-catcher-width
|
2018-01-10 10:04:10 +09:00 |
|
Dean Herbert
|
77276e3e8e
|
Merge pull request #1864 from peppy/fix-dotsettings-file
FIx incorrect licence header template
|
2018-01-10 09:45:15 +09:00 |
|
Dan Balasescu
|
9afd823d6e
|
Merge branch 'master' into fix-dotsettings-file
|
2018-01-10 09:35:49 +09:00 |
|
Dan Balasescu
|
d0fd7fe1f4
|
Merge pull request #1848 from peppy/drawable-fruit-improvements
Improvements to osu!catch visuals
|
2018-01-10 09:34:49 +09:00 |
|
Dean Herbert
|
c4490b5fe8
|
Fix incorrect licence header
|
2018-01-09 22:24:12 +09:00 |
|
Dean Herbert
|
fcb197f7b6
|
Simplify logic
|
2018-01-09 22:21:15 +09:00 |
|
ANDY840119-PC\andy840119
|
4060583b10
|
Merge branch 'master' of https://github.com/ppy/osu
# Conflicts:
# osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs
|
2018-01-09 22:09:25 +09:00 |
|
Dan Balasescu
|
9c602f8770
|
Merge branch 'master' into drawable-fruit-improvements
|
2018-01-09 22:06:16 +09:00 |
|
Dean Herbert
|
2518d16a77
|
Denote unused variable
|
2018-01-09 21:34:31 +09:00 |
|
Dean Herbert
|
c2fadcfc1f
|
Merge branch 'master' into background-blur
|
2018-01-09 21:20:05 +09:00 |
|
Dean Herbert
|
51513b45eb
|
Merge branch 'master' into fix-dotsettings-file
|
2018-01-09 14:32:40 +09:00 |
|
Dan Balasescu
|
96226e1f27
|
Merge pull request #1870 from peppy/mod-per-file
Move mod implementations to individual files
|
2018-01-09 14:30:51 +09:00 |
|
Dean Herbert
|
b8bb0a52e3
|
Move mod implementations to individual files
|
2018-01-09 14:08:18 +09:00 |
|
Dean Herbert
|
bb57d33239
|
Merge pull request #1819 from LittleEndu/fix-randomizer
Don't allow randomizer to select invisible maps
|
2018-01-09 12:52:25 +09:00 |
|
Dean Herbert
|
722eb2515f
|
Improve variable names
|
2018-01-09 12:44:52 +09:00 |
|
Dean Herbert
|
a3f05ca9ec
|
Avoid unnecessary use of linq
|
2018-01-09 12:43:10 +09:00 |
|
Dean Herbert
|
b90b1e326e
|
Merge branch 'master' into fix-randomizer
|
2018-01-09 12:00:21 +09:00 |
|
Dean Herbert
|
cab702cc94
|
Merge pull request #1854 from james58899/fix-storyboard-variables
Fix storyboard variable parsing
|
2018-01-09 11:59:53 +09:00 |
|
Dean Herbert
|
4c0259a040
|
Merge branch 'master' into fix-storyboard-variables
|
2018-01-09 11:50:03 +09:00 |
|
Dean Herbert
|
e7f9c9f22b
|
Merge pull request #1869 from Aergwyn/ingame-keybinds
Add skip cutscene as "in game" keybinding
|
2018-01-09 11:49:32 +09:00 |
|
Aergwyn
|
f6c168be27
|
add skip cutscene as "in game" keybinding
|
2018-01-08 18:22:43 +01:00 |
|
ANDY840119-PC\andy840119
|
d5b436d91b
|
use public List<Column> Columns => listColumnStages.SelectMany(x => x.Columns).ToList(); instead
|
2018-01-08 23:11:20 +09:00 |
|
為什麼
|
0426327149
|
Merge branch 'master' into master
|
2018-01-08 21:46:20 +09:00 |
|
Dean Herbert
|
805e91c625
|
Merge pull request #1858 from Aergwyn/fix-leaderboard-requests
Fix Leaderboard loading scores multiple times
|
2018-01-08 20:30:34 +09:00 |
|
Dean Herbert
|
22665337a5
|
Merge branch 'master' into fix-leaderboard-requests
|
2018-01-08 20:21:18 +09:00 |
|
Dean Herbert
|
8fe319286f
|
Merge branch 'master' into fix-dotsettings-file
|
2018-01-08 20:18:24 +09:00 |
|
Dean Herbert
|
bf98c16595
|
Merge pull request #1865 from Aergwyn/improve-hidden
Minor standard hidden improvements
|
2018-01-08 09:35:10 +09:00 |
|
Aergwyn
|
54c0197eb0
|
remove early fadeout of sliderball on hidden
it shouldn't have been done because it makes fast sliders unplayable as they never appear in the first place, ooops
|
2018-01-07 09:08:33 +01:00 |
|
Aergwyn
|
006b63eb42
|
remove unnecessary change of spinner end sequence
it wasn't really visible anyways *shrug*
|
2018-01-07 09:05:36 +01:00 |
|
為什麼
|
ec38669145
|
Merge branch 'master' into master
|
2018-01-07 13:58:26 +09:00 |
|
為什麼
|
0acceba2fe
|
Merge branch 'master' into master
|
2018-01-07 13:57:51 +09:00 |
|
Dean Herbert
|
f660eff4d4
|
FIx incorrect licence header template
|
2018-01-07 12:02:42 +09:00 |
|
Dean Herbert
|
8a4ab6c03d
|
Merge pull request #1862 from FreezyLemon/fix-mania-hitobject-test
Fix TestCaseManiaHitObjects exception on load
|
2018-01-07 11:37:45 +09:00 |
|
FreezyLemon
|
47f5b23dcf
|
fix child size == 0 exception
|
2018-01-07 00:53:44 +01:00 |
|
ANDY840119-PC\andy840119
|
6437efb54f
|
update framework again....
|
2018-01-06 11:38:22 +09:00 |
|
ANDY840119-PC\andy840119
|
6585610dfe
|
update resource branch
|
2018-01-06 11:28:57 +09:00 |
|
ANDY840119-PC\andy840119
|
ca7cd40fba
|
1. update from ppy master
2. update header
|
2018-01-06 11:21:10 +09:00 |
|
為什麼
|
98929952e3
|
Merge branch 'master' into master
|
2018-01-06 11:17:15 +09:00 |
|