sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-03 20:07:18 +09:00
Code Issues Packages Projects Releases Wiki Activity
19,979 Commits 3 Branches 1 Tag
Commit Graph

19979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
647a30279f
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 11:46:08 +09:00
Dean Herbert
4276805b5a
Merge branch 'master' into letterboxing 2019-01-08 11:41:44 +09:00
Dean Herbert
7bb4a06122
Merge pull request #4006 from peppy/update-framework 
Update framework
 2019-01-08 11:40:36 +09:00
Dean Herbert
8edec10e5f
Merge branch 'master' into fix-replay-import-statistics 2019-01-08 11:26:12 +09:00
Dean Herbert
276014f591
Merge branch 'master' into update-framework 2019-01-08 11:26:10 +09:00
Dean Herbert
2fc3e77be7
Merge branch 'master' into letterboxing 2019-01-08 11:26:09 +09:00
Dean Herbert
11861f4cc9
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 11:26:08 +09:00
Dan Balasescu
74ada4f3a3
Merge pull request #4007 from peppy/fix-leaderboard-nullrefs 
Fix leaderboard not correctly handling cancellation
 2019-01-08 11:25:42 +09:00
Dean Herbert
881b10a18f Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini 2019-01-08 11:01:04 +09:00
Dean Herbert
7eed3ffe75
Merge branch 'master' into moreOptionsFromSkin.ini 2019-01-08 10:02:06 +09:00
Dean Herbert
4cee21f356 Make skinning better 2019-01-07 20:12:39 +09:00
Dean Herbert
8eedef3e86 Move cancellation to safer place 2019-01-07 19:31:05 +09:00
Dean Herbert
d72412d24d Fix leaderboard not correctly handling cancellation 2019-01-07 19:28:46 +09:00
Dean Herbert
70d644406f Merge remote-tracking branch 'origin/update-framework' into letterboxing 
# Conflicts:
#	osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
 2019-01-07 18:53:53 +09:00
Dean Herbert
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Dean Herbert
49ba4e5a14
Merge branch 'master' into update-framework 2019-01-07 18:51:54 +09:00
Dean Herbert
ca98caf84b
Merge pull request #4001 from UselessToucan/linq_temp 
Use Find instead of FirstOrDefault
 2019-01-07 18:50:59 +09:00
Dean Herbert
f6018294b5 Update framework 2019-01-07 18:50:27 +09:00
Dean Herbert
115caa928c
Merge pull request #4005 from smoogipoo/stacking-indices 
Implement stacking by indices
 2019-01-07 18:43:08 +09:00
Dean Herbert
8914585021 Fix implementation of conditional cursor expanding 2019-01-07 18:28:26 +09:00
smoogipoo
b57c1af084 Only update stacking if there are hitobjects 2019-01-07 18:15:44 +09:00
smoogipoo
c6c22b352f More verbose exceptions 2019-01-07 18:13:40 +09:00
Dean Herbert
13b077c83b Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini 2019-01-07 18:11:17 +09:00
Dean Herbert
a5f9ae86a8
Merge pull request #4004 from peppy/remove-settings-label 
Remove broken SettingsLabel class
 2019-01-07 18:07:52 +09:00
smoogipoo
351ab6e9bd Shortcut O(n^2) calculation 2019-01-07 18:01:44 +09:00
smoogipoo
1c5ab6a906 Implement stacking by index 2019-01-07 18:00:59 +09:00
Dean Herbert
73c2fcac08 Remove broken SettingsLabel class 2019-01-07 17:03:59 +09:00
Dean Herbert
e73845172c
Merge branch 'master' into fix-replay-import-statistics 2019-01-07 13:44:01 +09:00
tangalbert919
fc6f484244 Use dev build of framework, make some fixes 2019-01-06 21:53:54 -06:00
tangalbert919
48686bdb30 Fix osu.Android Android manifest 2019-01-06 18:18:11 -06:00
tangalbert919
c2a52b56e7 Set app name and reset default namespace 2019-01-06 12:01:50 -06:00
Dean Herbert
5e87a3a7e2
Merge pull request #3998 from peppy/fix-pp-display 
Fix PP not display on profile overlay
 2019-01-06 22:18:08 +09:00
Matthias Coenraerds
562c9e56fb Fix naming 2019-01-06 13:38:43 +01:00
Matthias Coenraerds
472325b885 Verify leaderboard scope to be local 2019-01-06 13:37:30 +01:00
tangalbert919
4da5ca02eb Merge branch 'master' into android 2019-01-06 00:06:56 -06:00
tangalbert919
bf78c93346 Cleanup Android manifest files 2019-01-06 00:06:00 -06:00
tangalbert919
47268898be Expose internals for Android test projects 2019-01-06 00:04:25 -06:00
tangalbert919
8159905ca0 Code File Sanity 2019-01-05 23:48:57 -06:00
tangalbert919
5fdf4ee67b Add Android's VisualTests project 2019-01-05 23:18:12 -06:00
tangalbert919
e5dd95198a Cleanup project files with common props 2019-01-05 23:17:55 -06:00
tangalbert919
ddce608f97 Setup osu.Android solution and its ruleset tests 2019-01-05 22:15:09 -06:00
Roman Kapustin
469a64a7cd The code must not contain multiple blank lines in a row 2019-01-05 21:03:03 +03:00
Roman Kapustin
4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
jorolf
8bab87c072 update resources and remove unused usings 2019-01-04 23:09:21 +01:00
jorolf
52994c7ee8 Merge branch 'profile-header-update' of github.com:Jorolf/osu into profile-header-update 2019-01-04 22:52:29 +01:00
jorolf
a33a1458a5 update design and make play styles an enum 2019-01-04 22:52:00 +01:00
Matthias Coenraerds
715d5c3a3c Merge branch 'master' of https://github.com/m2307/osu 2019-01-04 20:40:21 +01:00
Matthias Coenraerds
a93c26ccfd Filename does not match contained type 2019-01-04 20:40:07 +01:00
Matthias Coenraerds
6d44672bfa Filename does not match contained type 2019-01-04 20:32:52 +01:00
Matthias Coenraerds
cd5b7dfd8d License header missing 2019-01-04 20:27:02 +01:00