Dean Herbert
|
e8c39b9c37
|
Fix test screen loading
|
2019-01-31 11:00:44 +09:00 |
|
Dean Herbert
|
beab367e6d
|
Add null checks/allowances
|
2019-01-31 11:00:33 +09:00 |
|
Dean Herbert
|
d34aa50613
|
Merge branch 'master' into iscreen
|
2019-01-31 01:08:06 +09:00 |
|
Dean Herbert
|
d9cb0358ed
|
Merge pull request #4183 from smoogipoo/revert-carousel-depth
Revert carousel depth change
|
2019-01-31 00:14:19 +09:00 |
|
smoogipoo
|
ac0bc53c4b
|
Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"
This reverts commit cc8793a45e, reversing
changes made to 94276c8abb.
|
2019-01-31 00:02:05 +09:00 |
|
Dan Balasescu
|
b91281a814
|
Merge pull request #4180 from peppy/fix-download-memory-usage
Fix beatmap downloads using too much memory
|
2019-01-30 23:58:09 +09:00 |
|
smoogipoo
|
a8a34f8f20
|
Update framework
|
2019-01-30 23:56:14 +09:00 |
|
smoogipoo
|
5e78f51e24
|
Fix multiplayer crashing when exiting from lounge
|
2019-01-30 23:56:03 +09:00 |
|
Aergwyn
|
c2297b0c3b
|
Fix incorrect param doc
Co-Authored-By: peppy <pe@ppy.sh>
|
2019-01-29 23:04:48 +09:00 |
|
smoogipoo
|
82dc7f39a3
|
Update licenses
|
2019-01-29 21:48:35 +09:00 |
|
smoogipoo
|
b5d187c4af
|
Fix post-merge errors
|
2019-01-29 21:27:32 +09:00 |
|
smoogipoo
|
91302ea0bc
|
Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
|
2019-01-29 21:21:36 +09:00 |
|
Dean Herbert
|
baea9691cc
|
Fix baetmap downloads using too much memory
|
2019-01-29 18:34:10 +09:00 |
|
Dean Herbert
|
432bc60db6
|
Merge pull request #3839 from smoogipoo/xexxar-angles
Implement xexxar’s aim assessment
|
2019-01-29 16:43:15 +09:00 |
|
Dean Herbert
|
8d4232af45
|
Formatting and minor optimisations
|
2019-01-29 16:35:20 +09:00 |
|
Dean Herbert
|
18512458e8
|
Merge branch 'master' into xexxar-angles
|
2019-01-29 15:59:04 +09:00 |
|
Dean Herbert
|
2025ed70d4
|
Merge pull request #2102 from swoolcock/samah-ios
iOS Compatibility
|
2019-01-28 20:48:16 +09:00 |
|
Shane Woolcock
|
6413e61647
|
Use project-wide *.cs linked include for tests rather than specifying subdirectories
|
2019-01-28 22:04:11 +10:30 |
|
Shane Woolcock
|
c3ba3c4405
|
Update iOS dotsettings file
|
2019-01-28 17:55:54 +10:30 |
|
Dean Herbert
|
1404ba6625
|
Remove unnecessary changes
|
2019-01-28 15:56:55 +09:00 |
|
smoogipoo
|
7b1c1f3728
|
Move toolbar showing and overlay activation to OsuGame
Now exposed through IOsuScreen.
|
2019-01-28 15:42:06 +09:00 |
|
Dean Herbert
|
8cc2583946
|
Target iOS 10
|
2019-01-28 15:41:45 +09:00 |
|
Dean Herbert
|
70a5c54a50
|
Update resources
|
2019-01-28 15:40:21 +09:00 |
|
Dean Herbert
|
354a99f5e1
|
Merge branch 'master' into samah-ios
|
2019-01-28 15:34:46 +09:00 |
|
Dan Balasescu
|
22926bad9f
|
Merge pull request #4162 from ProgrammaticNajel/fix-editor-hitobject-position
Fix hit object placement positions in editor not initializing to cursor position
|
2019-01-28 14:07:06 +09:00 |
|
Dan Balasescu
|
7d5adc5cc3
|
Merge branch 'master' into fix-editor-hitobject-position
|
2019-01-28 13:59:55 +09:00 |
|
Dan Balasescu
|
cc8793a45e
|
Merge pull request #4154 from phosphene47/carousel-wedge-level
Display carousel over beatmap info wedge
|
2019-01-28 13:59:50 +09:00 |
|
Dan Balasescu
|
47f35c423b
|
Merge branch 'master' into carousel-wedge-level
|
2019-01-28 13:49:12 +09:00 |
|
Dan Balasescu
|
94276c8abb
|
Merge pull request #4153 from peppy/dont-always-focus-textboxes
Dont always focus textboxes
|
2019-01-28 13:49:00 +09:00 |
|
Dan Balasescu
|
610c2df2d4
|
Merge branch 'master' into dont-always-focus-textboxes
|
2019-01-28 13:40:08 +09:00 |
|
ProgrammaticNajel
|
2058604ef3
|
Typo fix
|
2019-01-26 23:10:13 +08:00 |
|
ProgrammaticNajel
|
0797f5d644
|
Update SliderPlacementBlueprint.cs
|
2019-01-26 22:56:31 +08:00 |
|
ProgrammaticNajel
|
e71b13683a
|
Add null check
|
2019-01-26 22:55:33 +08:00 |
|
ProgrammaticNajel
|
e939f75f4b
|
Transform screen mouse coordinates to local space coordinates.
|
2019-01-26 18:19:01 +08:00 |
|
Shane Woolcock
|
a14ad4f53f
|
Merge branch 'master' into samah-ios
|
2019-01-25 22:43:21 +10:30 |
|
smoogipoo
|
117703374e
|
Fix logo animations
|
2019-01-25 21:02:35 +09:00 |
|
smoogipoo
|
60cc2314ef
|
Fix ruleset + beatmap being changeable in match
|
2019-01-25 21:02:30 +09:00 |
|
phosphene47
|
5c70be07ab
|
Display carousel over beatmap info wedge
|
2019-01-25 22:58:55 +11:00 |
|
Dean Herbert
|
718136a892
|
Merge pull request #4147 from peppy/fix-texture-loader-stores
Fix remaining cases of not using host-created TextureLoaderStore
|
2019-01-25 20:48:32 +09:00 |
|
Shane Woolcock
|
6fddc36843
|
Move iOS package references to shared props
|
2019-01-25 22:18:29 +10:30 |
|
smoogipoo
|
b3403c78da
|
Fix a few potential crashes
|
2019-01-25 20:47:37 +09:00 |
|
smoogipoo
|
e2891ab1e9
|
Fix anchors + origins
|
2019-01-25 20:47:31 +09:00 |
|
smoogipoo
|
95e6785968
|
Make Multiplayer not an OsuScreen
|
2019-01-25 20:25:55 +09:00 |
|
Dean Herbert
|
2e36d13aba
|
Merge remote-tracking branch 'origin/fix-texture-loader-stores' into fix-texture-loader-stores
|
2019-01-25 20:24:52 +09:00 |
|
Dean Herbert
|
28f529ca19
|
Rename to host
|
2019-01-25 20:24:32 +09:00 |
|
Dean Herbert
|
0b587baab8
|
Merge remote-tracking branch 'upstream/master' into fix-texture-loader-stores
|
2019-01-25 20:23:51 +09:00 |
|
Dean Herbert
|
4d032af26d
|
Merge pull request #3919 from peppy/fix-idle-weirdness
Fix global idle state being entered when overlays are visible
|
2019-01-25 20:18:33 +09:00 |
|
Dean Herbert
|
a110569f56
|
Merge pull request #4151 from peppy/fix-sensitivity-tooltip
Fix cursor sensitivity tooltip not updating instantly
|
2019-01-25 20:17:56 +09:00 |
|
Dean Herbert
|
4d982adf69
|
Merge branch 'master' into fix-idle-weirdness
|
2019-01-25 19:48:52 +09:00 |
|
Dan Balasescu
|
81e2e73589
|
Merge branch 'master' into fix-texture-loader-stores
|
2019-01-25 19:40:49 +09:00 |
|