h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-18 18:52:55 +08:00
Code Issues Releases Wiki Activity
2,655 Commits 4 Branches 661 Tags 359 MiB
34b734275b
Commit Graph

2655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smoogipooo
34b734275b Add license headers. 2017-03-20 18:24:28 +09:00
smoogipooo
aaa368e014 Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-20 18:12:16 +09:00
smoogipooo
75fb7a3eb3 Suppress Resharper. 2017-03-20 18:10:09 +09:00
smoogipooo
a27dae0beb Merge branch 'master' into taiko_hitobject_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-20 18:09:05 +09:00
smoogipooo
409160859d Remove explicit namespacing. 2017-03-20 18:07:44 +09:00
smoogipooo
70be33bde0 Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable 2017-03-20 18:06:00 +09:00
smoogipooo
a3e406af6a Merge branch 'master' into taiko_drumroll_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-20 18:05:54 +09:00
Dean Herbert
df17f2c996 Merge pull request #510 from smoogipooo/remove_type_enums 
Remove hit object types solution-wide.
 2017-03-20 13:16:36 +09:00
smoogipooo
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +09:00
smoogipooo
b3b8fadf03 Remove Type. 2017-03-20 13:02:52 +09:00
smoogipooo
7b7255863c Merge remote-tracking branch 'origin/master' into taiko_drumroll_base 2017-03-20 13:01:43 +09:00
Thomas Müller
139dd456fb Merge pull request #509 from peppy/fix-beatmap-options 
Fix beatmap options overlay inconsistencies
 2017-03-19 09:37:59 +01:00
Thomas Müller
44f71b3975 Merge branch 'master' into fix-beatmap-options 2017-03-19 09:34:53 +01:00
Thomas Müller
36414e964a Merge pull request #508 from Tom94/hide-cursor 
Hide cursor
 2017-03-19 09:28:55 +01:00
Thomas Müller
66cdc76621 Merge branch 'master' into hide-cursor 2017-03-19 09:23:30 +01:00
Dean Herbert
034d818427 Update framework. 2017-03-19 17:22:47 +09:00
Dean Herbert
af85bcaf1d Merge pull request #500 from smoogipooo/explicit_expires 
Make DrawableHitObject expires explicit.
 2017-03-19 12:47:43 +09:00
Dean Herbert
6c12da54f1 Merge pull request #499 from smoogipooo/legacy_beatmap_flag 
Add legacy beatmap flag.
 2017-03-19 12:39:41 +09:00
Dean Herbert
f237b5f1b8 Merge pull request #498 from smoogipooo/taiko_hitobject_base 
Taiko hitobject base
 2017-03-19 12:03:29 +09:00
Dean Herbert
73ffbf8142 Remove unnecessary using. 2017-03-19 11:52:16 +09:00
Dean Herbert
7337cb5f62 Merge branch 'master' into taiko_hitobject_base 2017-03-19 11:37:39 +09:00
Dean Herbert
af82a49127 Fix test case not containing any buttons. 2017-03-19 02:33:28 +09:00
Dean Herbert
3d8ec4fa05 FIx transition not always being correct. 2017-03-19 02:33:25 +09:00
Dean Herbert
f56b84a1ca Fix mouse cursor in VisualTestGame. 2017-03-19 02:32:21 +09:00
Dean Herbert
3c7b4a8ffa Fix cursor being displayed during disclaimer. 2017-03-19 01:59:13 +09:00
Dean Herbert
8f75032b64 Fix incorrect abs. 2017-03-18 22:37:50 +09:00
Dean Herbert
125936bad0 Fix double-assignment. 2017-03-18 22:23:53 +09:00
Dean Herbert
87622f9349 Update framework. 2017-03-18 22:21:51 +09:00
Dean Herbert
919ec2d3a5 Spend more when wound up. 2017-03-18 22:17:23 +09:00
Dean Herbert
6f07930110 Move cursor hiding to OsuGameDesktop (fixes headless). 2017-03-18 21:46:58 +09:00
Thomas Müller
f636f59289 Nicer cursor orientation when dragging 2017-03-18 12:47:49 +01:00
Thomas Müller
9af0104e3e Fix NaN when dragging music controller 
When dragging music controller we divide by the dragged distance.
When dragging to the origin of the drag this resulted in NaN.
Now, we check for this and use 0 in this case.
 2017-03-18 12:46:12 +01:00
Thomas Müller
3649b432a1 Update framework 2017-03-18 12:04:42 +01:00
Thomas Müller
341f36be5f Add tests service reference 2017-03-18 12:00:44 +01:00
Thomas Müller
3ee2b68215 Hide the OS cursor in OsuGameBase 2017-03-18 12:00:31 +01:00
smoogipooo
4b3308fd1d Remove TaikoHitObject Type, we won't be using this going forward. 2017-03-18 18:40:26 +09:00
smoogipooo
b68b017a49 What even was this lol. 2017-03-18 18:38:51 +09:00
smoogipooo
26b0bb02d8 Remove IIsLegacy, expose LegacyBeatmap without a public constructor. 2017-03-18 18:32:54 +09:00
Dean Herbert
33d70b9bbc
Update framework. 2017-03-18 13:23:58 +09:00
Dan Balasescu
124efe8126 Merge pull request #504 from peppy/song-select-loading-reoptimisation 
Song select performance / code cleanup.
 2017-03-18 02:19:02 +09:00
Dan Balasescu
e529f5e439 Merge branch 'master' into song-select-loading-reoptimisation 2017-03-18 02:12:56 +09:00
smoogipooo
bcaf12e3d9 Rename Criteria -> CreateCriteria and make into method. 2017-03-18 02:11:14 +09:00
Dan Balasescu
af55bc4a12 Merge pull request #505 from peppy/menu-cursor 
Add menu cursor.
 2017-03-18 02:09:10 +09:00
smoogipooo
77067b7e64 Re-style. 2017-03-18 02:04:23 +09:00
Dan Balasescu
1fda7ee33e Merge branch 'master' into menu-cursor 2017-03-18 01:51:41 +09:00
Dan Balasescu
cd30958086 Merge branch 'master' into song-select-loading-reoptimisation 2017-03-18 01:25:22 +09:00
Dean Herbert
3e3cde01ef
Fix missing permitNulls. 2017-03-17 21:21:16 +09:00
Dean Herbert
cefb59caa0 Merge pull request #497 from smoogipooo/controlpoint_effects 
Add reading of KiaiMode/OmitFirstBarLine from legacy control points.
 2017-03-17 21:11:13 +09:00
Dean Herbert
317dc94b4c
Adjust appearance. 2017-03-17 21:09:31 +09:00
Dean Herbert
ba67e63ffa
Update resources. 2017-03-17 20:53:20 +09:00