h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 03:02:54 +08:00
Code Issues Releases Wiki Activity
3,507 Commits 3 Branches 657 Tags 366 MiB
c615762da6
Commit Graph

3507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smoogipooo
be4ab13f4d Rename finisher -> accented. 2017-03-25 20:30:26 +09:00
Dean Herbert
73d2f91086 Merge branch 'master' into taiko_hit_drawables 2017-03-25 20:23:33 +09:00
Dean Herbert
1e34d5e9b4 Merge pull request #548 from smoogipooo/replay_extensibility 
Replay extensibility
 2017-03-25 20:21:18 +09:00
smoogipooo
4762e043a0 Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawable 2017-03-25 20:20:16 +09:00
Dean Herbert
64378f6445 Merge branch 'master' into replay_extensibility 2017-03-25 20:16:41 +09:00
smoogipooo
cb189bd006 Merge remote-tracking branch 'origin/master' into taiko_hit_drawables 2017-03-25 20:16:25 +09:00
Dean Herbert
0888234d36 Merge pull request #553 from ElegantMonkey/rename-dropdown-files 
Rename OptionDropdown and OptionEnumDropdown files
 2017-03-25 20:08:51 +09:00
ElegantMonkey
0678274118 Rename OptionDropdown and OptionEnumDropdown files 2017-03-25 07:45:04 -03:00
Dean Herbert
7a834a6cc1 Merge pull request #550 from smoogipooo/better_centre_symbol 
Use less scaling factors.
 2017-03-25 12:43:11 +09:00
ElegantMonkey
5393525e3c Fix OpenTK hint on project file 2017-03-24 18:29:19 -03:00
smoogipooo
7a220e7348 Using. 2017-03-24 22:17:18 +09:00
smoogipooo
c03bf4a5c3 Use less scaling factors. 2017-03-24 22:11:11 +09:00
Dean Herbert
55d7b027d2 Merge branch 'master' into taiko_drumroll_drawable 2017-03-24 21:26:42 +09:00
Dean Herbert
796218cb00 Merge pull request #549 from smoogipooo/taiko_drawable_drawing 
Add circle to DrawableTaikoHitObject.
 2017-03-24 21:17:37 +09:00
smoogipooo
e079263205 Remove unused texture. 2017-03-24 20:54:09 +09:00
smoogipooo
81c592c04a Resources... 2017-03-24 20:11:06 +09:00
smoogipooo
2ee68ae75a Make CirclePiece use relative width (leaving length control to DrawableDrumRoll). 2017-03-24 20:10:17 +09:00
smoogipooo
fdd17c1575 Rewrite circle pieces to use custom graphics again. 
Also using FontAwesome for now to enforce the same size, because otherwise you have to mess around with sprites + the custom graphics. This will all be changed when sprites are fixed to maintain aspect ratios and when glow/border use relative axes.
 2017-03-24 20:08:40 +09:00
smoogipooo
405c6f9691 More explicative xmldoc. 2017-03-24 19:05:45 +09:00
smoogipooo
369e3903ac Don't use a magic number. 2017-03-24 19:04:46 +09:00
smoogipooo
feecf23d9f Don't force the size. 2017-03-24 19:04:32 +09:00
smoogipooo
df46d0f446 Cleanup. 2017-03-24 18:49:10 +09:00
smoogipooo
5281842965 Rewrite CirclePiece to be referenced to 128x128px and handle accented hits more sanely. 2017-03-24 18:37:56 +09:00
smoogipooo
47065d8031 Remove explicit alpha = 1. 2017-03-24 16:15:14 +09:00
smoogipooo
6753a22512 Fix post-merge issues. 2017-03-24 16:03:38 +09:00
smoogipooo
33c160efeb Merge branch 'taiko_note_circle' into taiko_drawable_drawing 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-24 16:02:49 +09:00
smoogipooo
d6d3eb99b7 Adjust comment. 2017-03-24 15:55:25 +09:00
smoogipooo
82752e0988 Moar cleanup. 2017-03-24 15:50:18 +09:00
smoogipooo
8f7ed813a3 Cleanup. 2017-03-24 15:45:21 +09:00
smoogipooo
95183279f3 Rename ScrollingCirclePiece -> ScrollingPiece. 2017-03-24 15:44:43 +09:00
smoogipooo
eea24b2d82 Make sure icon is only instantiated once. 2017-03-24 15:43:17 +09:00
smoogipooo
aa9a65d69c Move load below CreateIcon(). 2017-03-24 15:42:48 +09:00
smoogipooo
99f1e86a5e Fix something that was removed during merge conflicts. 2017-03-24 15:19:58 +09:00
smoogipooo
3cecffbc48 Merge branch 'taiko_note_circle' into taiko_drawable_drawing 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-24 15:17:17 +09:00
smoogipooo
bb4b6b783c Fix post-merge errors. 2017-03-24 15:14:49 +09:00
smoogipooo
20e80a758a Merge branch 'master' into taiko_drawable_drawing 
Conflicts:
	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-24 15:11:56 +09:00
smoogipooo
79fa9daec8 Fix post-merge errors. 2017-03-24 15:05:54 +09:00
smoogipooo
ce1257ba56 Merge branch 'master' into taiko_bash_drawable 
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
 2017-03-24 15:03:55 +09:00
smoogipooo
75dba19e7b Merge branch 'master' into taiko_drumroll_drawable 2017-03-24 15:00:35 +09:00
smoogipooo
45b013c85f Fix post-merge errors. 2017-03-24 14:59:59 +09:00
Dan Balasescu
bf3846eedb Merge branch 'master' into taiko_hit_drawables 2017-03-24 14:55:07 +09:00
smoogipooo
cce5b4f80f Make readonly. 2017-03-24 14:42:42 +09:00
Dan Balasescu
ac2d36da3b Merge branch 'master' into taiko_note_circle 2017-03-24 14:33:08 +09:00
smoogipooo
136665e52e Add virtual method to instantiate legacy replays. 2017-03-24 14:28:17 +09:00
smoogipooo
fcf9a599dd Implement taiko auto replays. 2017-03-24 14:24:10 +09:00
smoogipooo
730051520e Add a way to determine the type of a Hit. 2017-03-24 14:23:32 +09:00
smoogipooo
99b9623671 Implement taiko replays + key conversion. 2017-03-24 14:09:58 +09:00
smoogipooo
dcb9d2903b Add virtual method to instantiate legacy replays. 2017-03-24 14:03:46 +09:00
smoogipooo
b225ae82be GetInputHandler -> CreateInputHandler. 2017-03-24 13:59:05 +09:00
smoogipooo
93029aec3e Change accessibilities to make replays more extensible. 2017-03-24 13:58:45 +09:00