smoogipoo
|
4edb17a88a
|
Make hp work + cleanup
|
2019-04-22 18:02:49 +09:00 |
|
smoogipoo
|
144e6012dc
|
Implement hp increase for osu!
|
2019-04-22 17:24:42 +09:00 |
|
David Zhao
|
3c252d79ea
|
Use var, rework dim application logic
|
2019-04-22 15:59:47 +09:00 |
|
iiSaLMaN
|
59da78b0d4
|
nothing.
|
2019-04-20 06:44:59 +03:00 |
|
iiSaLMaN
|
8e485f3283
|
Fix issue
|
2019-04-20 06:41:09 +03:00 |
|
Dean Herbert
|
879f6152b0
|
Merge remote-tracking branch 'upstream/master' into flashlight-dim
|
2019-04-17 22:17:10 +08:00 |
|
David Zhao
|
d9ed68b189
|
Add short fade to flashlight dimming
|
2019-04-12 15:33:31 +09:00 |
|
David Zhao
|
846a4835ca
|
Invert flashlight dim
|
2019-04-12 11:23:40 +09:00 |
|
David Zhao
|
664a4ba540
|
Implement flashlight dimming on slider slide
|
2019-04-12 10:47:22 +09:00 |
|
smoogipoo
|
0222424aef
|
Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
|
2019-04-10 17:20:36 +09:00 |
|
smoogipoo
|
0603ed9ab7
|
Fix post-merge errors
|
2019-04-09 16:27:10 +09:00 |
|
smoogipoo
|
c584967eb1
|
Remove mods from workingbeatmap
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
Dean Herbert
|
9802d8ab11
|
Rename setting
|
2019-04-04 17:18:53 +09:00 |
|
Dean Herbert
|
d54750aa37
|
Remove incorrect class
|
2019-04-04 17:10:29 +09:00 |
|
Dean Herbert
|
109f577b59
|
Merge remote-tracking branch 'upstream/master' into toggle-cursor-trail
|
2019-04-04 17:09:38 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
smoogipoo
|
d8af5e1c5a
|
Update in-line with drawnode changes
|
2019-04-02 11:56:22 +09:00 |
|
Dean Herbert
|
184403c7e1
|
Merge branch 'master' into resume-cursor-2
|
2019-04-01 14:24:00 +09:00 |
|
Dean Herbert
|
2060bad3bc
|
Try applying minimal inspection fixes for latest Rider EAP
|
2019-04-01 13:28:14 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dean Herbert
|
7d6a08d6da
|
Fix a few new inspections in latest Rider EAP
|
2019-04-01 11:39:02 +09:00 |
|
Dean Herbert
|
79b5c2482b
|
Merge pull request #4562 from peppy/fix-editor-blueprints
Fix editor blueprints being misplaced
|
2019-04-01 11:17:17 +09:00 |
|
Dean Herbert
|
d53e6f7e0e
|
Remove unused references
|
2019-03-31 01:34:50 +09:00 |
|
Dean Herbert
|
5d91c3bcfc
|
Fix replay handler nullref crashes
|
2019-03-31 01:33:56 +09:00 |
|
Dean Herbert
|
42eaabe24c
|
Fix editor blueprints being misplaced
Regressed with PlayfieldAdjustmentContainer changes.
|
2019-03-31 01:29:37 +09:00 |
|
Dean Herbert
|
6949c233bf
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 15:02:12 +09:00 |
|
Dean Herbert
|
3e8952b087
|
Merge pull request #4521 from peppy/hitobject-drawable-representation
Fix DrawableRuleset drawable creation method's name
|
2019-03-29 14:08:23 +09:00 |
|
Dean Herbert
|
c72705217a
|
Merge branch 'master' into framed-replay-handler-fixes
|
2019-03-29 12:59:51 +09:00 |
|
Dean Herbert
|
14cef94a53
|
Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation
|
2019-03-29 12:59:26 +09:00 |
|
Dean Herbert
|
fed58fba3a
|
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
|
2019-03-29 12:14:28 +09:00 |
|
Dean Herbert
|
1e369628a5
|
Fix incorrect type specification
|
2019-03-29 11:38:45 +09:00 |
|
Dean Herbert
|
785433bb74
|
Merge branch 'master' into universal-playfield-adjust
|
2019-03-29 11:25:54 +09:00 |
|
Dean Herbert
|
7715606188
|
Merge branch 'master' into sprite-icon-compatibility
|
2019-03-29 11:15:34 +09:00 |
|
Dan Balasescu
|
772f0cac8a
|
Merge branch 'master' into gameplay-cursor-last-state
|
2019-03-29 11:01:13 +09:00 |
|
Dean Herbert
|
8642886ffa
|
Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust
|
2019-03-29 00:39:51 +09:00 |
|
Dean Herbert
|
d770dac3bc
|
Fix interpolation nullrefs
|
2019-03-29 00:35:26 +09:00 |
|
Dean Herbert
|
6e41506766
|
Merge remote-tracking branch 'upstream/master' into framed-replay-handler-fixes
|
2019-03-29 00:32:03 +09:00 |
|
Dean Herbert
|
176b4ecc38
|
Merge branch 'master' into sprite-icon-compatibility
|
2019-03-28 23:47:44 +09:00 |
|
Dean Herbert
|
70f99400ad
|
Fix many behavioural issues and add tests
|
2019-03-28 19:28:13 +09:00 |
|
Dean Herbert
|
148e26a6d4
|
Fix FramedReplayInputHandler starting at frame 0 when it shouldn't
|
2019-03-28 12:42:57 +09:00 |
|
Dean Herbert
|
8f5e769425
|
Fix slider ball not always receiving position in time
|
2019-03-28 12:42:28 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Dean Herbert
|
7cfc2f7dcb
|
Add back adjustment container
|
2019-03-26 17:11:14 +09:00 |
|
Dean Herbert
|
dde7788c44
|
Merge branch 'universal-playfield-adjust' into resume-cursor-2
|
2019-03-26 13:58:48 +09:00 |
|
Dean Herbert
|
2951d3e0e4
|
Apply CI fixes
|
2019-03-26 13:50:30 +09:00 |
|
Dean Herbert
|
fbc97edc55
|
Add base cursor class to retrieve true visibility state
|
2019-03-26 13:41:30 +09:00 |
|
Dean Herbert
|
ed3746e166
|
Make PlayfieldAdjustmentContainer universal
|
2019-03-26 13:32:44 +09:00 |
|
Dean Herbert
|
82140c38fc
|
Apply CI fixes
|
2019-03-25 22:00:33 +09:00 |
|
Dean Herbert
|
a23dfb58ad
|
Add base cursor class to retrieve true visibility state
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
9588944048
|
Fix multiple cursors appearing
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
c79d187a89
|
Add final osu! resume screen implementation
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
38e481686f
|
Make PlayfieldAdjustmentContainer universal
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
650a5c993a
|
Add test
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
8ad4009c33
|
osu! resume overlay
|
2019-03-25 20:31:55 +09:00 |
|
Dean Herbert
|
bc16a82494
|
Move osu! cursor to its own class
|
2019-03-25 14:19:38 +09:00 |
|
Dean Herbert
|
9bf48863b0
|
Fix DrawableRuleset drawable creation method's name
|
2019-03-25 00:00:29 +09:00 |
|
Dean Herbert
|
7254b765b0
|
Fix gameplay cursor showing in editor
|
2019-03-20 19:26:24 +09:00 |
|
Dean Herbert
|
7b6d882ce6
|
Remove double-generic type
|
2019-03-20 11:29:16 +09:00 |
|
Dean Herbert
|
3b7a76aa4e
|
Fix typo
|
2019-03-20 11:22:34 +09:00 |
|
Dean Herbert
|
baea7230bc
|
Rename RulesetContainer to DrawableRuleset
|
2019-03-19 23:47:31 +09:00 |
|
Dean Herbert
|
68f28326a2
|
Refactor RulesetContainer for readability
|
2019-03-19 20:21:31 +09:00 |
|
Santeri Nogelainen
|
b624ecabde
|
Max = 8
|
2019-03-16 12:47:37 +02:00 |
|
Santeri Nogelainen
|
cbb7498a42
|
Border size to float, add min and max size, other small changes
|
2019-03-16 12:41:03 +02:00 |
|
Santeri Nogelainen
|
92595e43f6
|
slider border thickness
|
2019-03-14 21:57:39 +02:00 |
|
Jamie Taylor
|
5cc670cd19
|
Prevent ApplyTransformsAt from propogating to SliderBall children
|
2019-03-14 19:17:28 +09:00 |
|
Dean Herbert
|
1617e2a729
|
Merge branch 'master' into mania-judgemetns
|
2019-03-13 18:17:42 +09:00 |
|
David Zhao
|
527b77b07d
|
Make all inheritors of drawablejudgement use new method
|
2019-03-12 19:52:44 +09:00 |
|
Dean Herbert
|
63fea65c0c
|
Clarify repeat index
|
2019-03-11 14:53:21 +09:00 |
|
Dean Herbert
|
489153579a
|
Add xmldoc and clarify struct variables
|
2019-03-11 14:36:29 +09:00 |
|
Dean Herbert
|
c6194d5487
|
Merge branch 'master' into extract-slider-tick-creation
|
2019-03-08 20:40:03 +09:00 |
|
Dean Herbert
|
48e54c84c1
|
Merge branch 'master' into mod-wind
|
2019-03-08 20:23:02 +09:00 |
|
Dean Herbert
|
28a1baa07e
|
Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation
|
2019-03-08 20:13:58 +09:00 |
|
Dean Herbert
|
93a999396e
|
LegacyFinalTick -> LegacyLastTick to match existing variable
|
2019-03-08 20:13:11 +09:00 |
|
Dean Herbert
|
165a353a83
|
Add extensive commenting about LegacyLastTick usage
|
2019-03-08 20:12:48 +09:00 |
|
Dean Herbert
|
f59b9e933e
|
Merge branch 'master' into extract-slider-tick-creation
|
2019-03-08 20:00:12 +09:00 |
|
Dean Herbert
|
355705f0a5
|
Fix legacy tick handling
|
2019-03-08 19:57:30 +09:00 |
|
Dean Herbert
|
973f29b765
|
Apply review
|
2019-03-08 15:14:57 +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 |
|
Dean Herbert
|
551380dd42
|
Extract slider tick creation so it can be shared with osu!catch
|
2019-03-08 14:46:26 +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
|
340997f505
|
Rename remaining usage of PathWidth naming convention
|
2019-03-07 20:21:59 +09:00 |
|
Dean Herbert
|
5ab9f45a8f
|
Merge branch 'drawnode-changes'
|
2019-03-07 20:10:42 +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 |
|
smoogipoo
|
e430b8a640
|
Merge remote-tracking branch 'nekodex/master' into drawnode-changes
|
2019-03-07 18:15:12 +09:00 |
|
David Zhao
|
b3e046c4d1
|
Rename PathWidth to PathRadius
|
2019-03-07 17:39:19 +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
|
18826b3a59
|
Adjust cursor scale for its new surroundings
|
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
|
d70b373af9
|
Merge branch 'master' into mod-wind
|
2019-03-06 14:04:04 +09:00 |
|
Dean Herbert
|
fc0b297232
|
Fix menu cursor not displaying outside of gameplay scaling area
|
2019-03-05 18:06:24 +09:00 |
|
smoogipoo
|
0322bd8812
|
Make config nullable, removing testcase code
|
2019-03-05 14:40:27 +09:00 |
|
smoogipoo
|
78596dfe80
|
Merge remote-tracking branch 'origin/master' into move-osu-settings
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs
|
2019-03-05 13:25:03 +09:00 |
|