h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 20:38:33 +08:00
Code Issues Releases Wiki Activity
6,010 Commits 3 Branches 654 Tags 363 MiB
4d8261fe0b
Commit Graph

830 Commits

Author SHA1 Message Date
Thomas Müller
4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs
 2017-07-18 15:16:02 +03:00
Thomas Müller
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
5372b94674 Remove some unnecessary usings 2017-07-14 19:35:44 +03:00
Thomas Müller
a5e610a7ba Update framework and fix compilation 
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
 2017-07-14 19:18:12 +03:00
Huo Yaoyuan
6cf36da389 Merge branch 'master' into profile 2017-07-14 22:52:19 +08:00
Dean Herbert
3aeed86392 Merge branch 'master' into drawable-room-update 2017-07-14 15:29:27 +09:00
Dean Herbert
133bcdec7a Move async loading to a higher level to simplify logic 2017-07-14 14:39:15 +09:00
Dean Herbert
ab5341eadc Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash 2017-07-14 09:46:36 +09:00
Dean Herbert
de46f3ab07 Remove all unnecessary parenthesis where object initialisers are used 
Enforces at CI.
 2017-07-13 15:11:33 +09:00
Dean Herbert
3a4150c6c3 Merge remote-tracking branch 'upstream/master' into profile 
# Conflicts:
#	osu.Game/Graphics/Containers/SectionsContainer.cs
 2017-07-13 13:44:21 +09:00
DrabWeb
0624f578eb Update with online beatmap changes. 2017-07-13 01:06:46 -03:00
DrabWeb
dc5ec319a2 Merge https://github.com/ppy/osu into drawable-room-update 2017-07-13 01:00:32 -03:00
DrabWeb
ca12fd3042 Better medal sprite loading, fade in particles, visual test update. 2017-07-13 00:13:18 -03:00
Dean Herbert
2c1f3de47a Rename 2X resources to be defaults 2017-07-13 10:27:39 +09:00
Dean Herbert
56c817e4b6 Merge branch 'master' into osu-direct-search 2017-07-13 10:16:27 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
DrabWeb
6b0ba1f98d Fix merge error. 2017-07-11 20:44:28 -03:00
Seth
b30721edbe Merge branch 'master' into drawable-room-update 2017-07-11 20:42:44 -03:00
DrabWeb
2ee0f3f5f6 Update with framework changes. 2017-07-11 02:11:08 -03:00
DrabWeb
202e3ca530 Merge https://github.com/ppy/osu into medal-splash 2017-07-11 02:00:36 -03:00
DrabWeb
b448603d6c CI fixes. 2017-07-11 01:42:51 -03:00
DrabWeb
fbe414d780 Cleanup. 2017-07-11 01:03:38 -03:00
DrabWeb
84701846ec Merge https://github.com/ppy/osu into osu-direct-search 2017-07-11 00:26:49 -03:00
Huo Yaoyuan
fd4a054921 Merge branch 'master' into profile 2017-07-11 09:16:32 +08:00
Thomas Müller
7729760017 Add beat timings to TestCaseBeatSyncedContainer 2017-07-10 12:08:15 +03:00
Thomas Müller
dfb484cfbb Restore altered test cases 2017-07-10 11:57:39 +03:00
Dean Herbert
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
Huo Yaoyuan
3290f5a977 Update test case for profile. 2017-07-10 10:42:55 +08:00
Huo Yaoyuan
6f2b49dea8 Merge branch 'master' into profile. 2017-07-10 10:36:23 +08:00
Dean Herbert
f856e89b58 Fix CI issues 2017-07-10 03:37:51 +09:00
Dean Herbert
7952e7caa9 Fix typos 2017-07-10 03:22:08 +09:00
Dean Herbert
8e7e70bd1a Merge branch 'master' into update-loop-logic 2017-07-10 03:19:49 +09:00
Thomas Müller
fec6f2ba65 Remove unnecessary usings 2017-07-09 19:57:22 +03:00
Thomas Müller
dedd4561a1 Display indices rather than one-based numbers 2017-07-09 19:41:36 +03:00
Thomas Müller
934a585b94 Better number formatting 2017-07-09 19:40:57 +03:00
Thomas Müller
1f425c3be8 Simplify existing code 2017-07-09 19:40:36 +03:00
Thomas Müller
8c40b80813 Also display negative beats 2017-07-09 19:33:23 +03:00
EVAST9919
d533ac0e98 Simplify info margin 2017-07-09 13:57:13 +03:00
EVAST9919
62fc55521c Added background colour for better info visibility 2017-07-09 13:54:38 +03:00
EVAST9919
bd45e1f1e7 Make field readonly 2017-07-09 13:48:20 +03:00
EVAST9919
105d57a697 Update Testcase inline with framework 2017-07-09 13:39:48 +03:00
EVAST9919
6e293501e0 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes 2017-07-09 13:23:42 +03:00
Dean Herbert
2c8b8c3f9c Update loop logic in line with framework changes 2017-07-09 18:23:34 +09:00
Dean Herbert
bb8efcc12f Fix CI issues (pass #2) 2017-07-08 18:17:47 +09:00
Dean Herbert
3c425dd07f Fix CI issue 2017-07-08 18:06:59 +09:00
Thomas Müller
22a987f6cc Update test cases to new framework and fix old crashes 2017-07-07 15:05:55 +03:00