h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 08:07:40 +08:00
Code Issues Releases Wiki Activity
16,807 Commits 3 Branches 654 Tags 364 MiB
861d5eeb65
Commit Graph

16807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dan Balasescu
e4cbe31ba0
Merge branch 'master' into resources-via-nuget 2019-01-30 13:59:40 +09:00
Joseph Madamba
3a2919780e
Fix markdown error in readme change 
Co-Authored-By: peppy <pe@ppy.sh>
 2019-01-30 11:37:11 +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
23d0399e51 Allow deselection of textboxes on registration screen on mobile devices 2019-01-29 17:23:23 +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
ekrctb
8955d5de04 Update hit object result when lifetime is end 2019-01-29 15:25:27 +09:00
Dean Herbert
910528b4cb Update iOS project in line with changes 2019-01-29 13:09:50 +09:00
Dean Herbert
bbbedd2c36 Remove iOS build configurations from main sln 2019-01-29 12:20:16 +09:00
Dean Herbert
bbc24bbfdd Merge remote-tracking branch 'upstream/master' into resources-via-nuget 
# Conflicts:
#	osu-resources
#	osu.sln
 2019-01-29 12:19:35 +09:00
ekrctb
504e79b968 Merge branch 'master' into use-lifetime-optimization 2019-01-29 12:15:02 +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
Dean Herbert
8d4faafdbe Rename file to match class 2019-01-28 18:41:57 +09:00
Dean Herbert
bf57f80d6e Update readme 2019-01-28 18:33:56 +09:00
Dean Herbert
628b3e1119 Move osu-resources to nuget 2019-01-28 18:33:39 +09:00
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
Dean Herbert
a208874e74 Fix incorrect handling of download failures 2019-01-28 11:59:25 +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
ekrctb
ea48d6a88a reduce code duplication / allocations 2019-01-26 16:16:49 +09:00
ekrctb
1a5a238752 Use integer count for tiny droplet generation 2019-01-26 16:14:37 +09: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