h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 06:52:55 +08:00
Code Issues Releases Wiki Activity
12,000 Commits 3 Branches 657 Tags 358 MiB
bfad101d17
Commit Graph

12000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
smoogipoo
7a550e3f07 Revert unnecessary change for now 2018-04-19 20:20:56 +09:00
smoogipoo
e666a82e1f Fix cloning 2018-04-19 18:59:09 +09:00
smoogipoo
ac64f9d958 Remove LegacyBeatmap 2018-04-19 18:58:45 +09:00
smoogipoo
b5a55a0dce Make an interface for beatmaps 2018-04-19 18:58:40 +09:00
Dean Herbert
8a243461a6 Expose appveyor artifacts 2018-04-19 17:51:10 +09:00
Dean Herbert
312068d7a2 Add deploy config 2018-04-19 17:51:02 +09:00
Dean Herbert
278a878b09 Add non-interactive deploy mode 2018-04-19 17:14:51 +09:00
Dean Herbert
dd7020d5a4
Merge pull request #2398 from tgi74/rightclickscrolling 
Add right click absolute scrolling in song select
 2018-04-18 19:57:52 +09:00
Dean Herbert
e395a47112 Changes to naming and text 2018-04-18 19:47:13 +09:00
Dean Herbert
bd834dd487 Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling 2018-04-18 19:46:59 +09:00
Dean Herbert
69a91c610d
Merge pull request #2366 from tgi74/ctb_hr_mangling 
Add HardRock position mangling for CatchTheBeat
 2018-04-18 16:57:16 +09:00
Dean Herbert
d307b8dc2e Merge remote-tracking branch 'upstream/master' into tgi74-ctb_hr_mangling 2018-04-18 16:46:02 +09:00
Dean Herbert
1728dd6502 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:42:09 +09:00
Dean Herbert
7e5d5a197b Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 16:41:01 +09:00
Dean Herbert
1be2571d33 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:08:45 +09:00
Dean Herbert
0a292a6ab4
Merge pull request #2415 from smoogipoo/better-test-case 
Update OsuTestCase with framework testing changes
 2018-04-18 15:56:09 +09:00
smoogipoo
560fcfc661 Update framework 2018-04-18 15:32:21 +09:00
smoogipoo
d5ce618d9b Update with framework changes 2018-04-18 15:12:48 +09:00
Dan Balasescu
bc3150776e
Merge pull request #2377 from Joehuu/fix-rank-status 
Fix qualified category on rank status
 2018-04-18 14:33:03 +09:00
Dan Balasescu
533b7d907d
Merge branch 'master' into fix-rank-status 2018-04-18 14:19:53 +09:00
smoogipoo
68a13a5fb5 Update framework 2018-04-18 14:18:56 +09:00
Dan Balasescu
f8a9d9d4fe
Merge pull request #2381 from peppy/app-manifest 
Add back app.manifest
 2018-04-18 14:18:13 +09:00
smoogipoo
ffbe6f2e37 Merge remote-tracking branch 'origin/master' into fix-rank-status 
# Conflicts:
#	osu.Game/Beatmaps/RankStatus.cs
#	osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
#	osu.Game/Overlays/Direct/FilterControl.cs
#	osu.Game/Overlays/DirectOverlay.cs
 2018-04-18 14:16:58 +09:00
Dean Herbert
c32ab7d08c
Merge branch 'master' into app-manifest 2018-04-18 14:10:03 +09:00
Dean Herbert
919f2acccd
Merge pull request #2400 from tgi74/replay_mods 
Add support for replay mods
 2018-04-18 14:09:54 +09:00
Dan Balasescu
33f4f57ee3
Merge branch 'master' into replay_mods 2018-04-18 14:00:32 +09:00
Dan Balasescu
0e640b432d
Merge branch 'master' into app-manifest 2018-04-18 13:59:47 +09:00
Dean Herbert
2b83d49862
Merge pull request #2408 from smoogipoo/fix-leaderboard-nullref 
Fix various leaderboard data races
 2018-04-18 13:48:14 +09:00
Dean Herbert
f62677222c Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 13:08:53 +09:00
Dean Herbert
64f47daff4
Merge branch 'master' into fix-leaderboard-nullref 2018-04-18 12:05:13 +09:00
Dean Herbert
188c8ce1e7 Remove unnecessary score nulling (already happens in PlaceholderState_Set) 2018-04-18 11:58:55 +09:00
Dean Herbert
a27f39a555 Add documentation explaining intertwining logic 2018-04-18 11:57:06 +09:00
Dean Herbert
f678ce1bf5
Merge pull request #2407 from jorolf/profile-badges 
Add badges to ProfileHeader
 2018-04-18 11:53:15 +09:00
Dean Herbert
a827fb51bc Simplify child definition 2018-04-18 11:42:55 +09:00
jorolf
ddd59382e2 Merge branch 'profile-badges' of github.com:Jorolf/osu into profile-badges 2018-04-16 19:37:52 +02:00
jorolf
de9f15f620 add new test case and fix rotation not working 2018-04-16 19:22:11 +02:00
jorolf
046412f962 make hover lost transition instant (similar to hover transition) 2018-04-16 18:52:09 +02:00
jorolf
2a18b4c3f8 add a DRAWABLE_BADGE_SIZE const and center badges 2018-04-16 18:51:35 +02:00
jorolf
af0c49cca8 badge_size is the actual badge size now 
also fixes rotateBadges bug when hover is lost
 2018-04-16 18:27:18 +02:00
tgi74000
1feba556eb CI: unused directive 2018-04-16 14:25:43 +02:00
tgi74000
9b36cf2066 Review changes 2018-04-16 14:14:40 +02:00
smoogipoo
ea0683adb2 Fix hitobject lengths not being calculated for overlapping speed changes 
Fixes #2359
 2018-04-16 20:34:59 +09:00
smoogipoo
9af6ef1864 Remove extra unneded safety 2018-04-16 17:48:49 +09:00
smoogipoo
b9220a1e29 Fix leaderboard placeholder sometimes disappearing indefinitely 2018-04-16 17:39:55 +09:00
smoogipoo
1b9d54a6ad Fix various data races causing crashes or incorrect leaderboard states 2018-04-16 17:39:03 +09:00
jorolf
af755b4a90
Merge branch 'master' into profile-badges 2018-04-15 23:50:52 +02:00
jorolf
6ca714d93b add badges to ProfileHeader 2018-04-15 23:49:45 +02:00
tgi74000
3454ec1ca3 Set Value instead of BindTo 2018-04-15 20:23:57 +02:00
tgi74000
4c08aa3dfb Merge remote-tracking branch 'upstream/master' 2018-04-15 20:22:16 +02:00