h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 03:55:30 +08:00
Code Issues Releases Wiki Activity
5,728 Commits 3 Branches 661 Tags 357 MiB
4045083dcd
Commit Graph

5728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Müller
4045083dcd Update sorting comparers in line with framework changes 2017-07-11 21:21:58 +03:00
Dean Herbert
39d20565aa Merge pull request #1006 from peppy/fix-unit-test-on-linux 
Remove assert which is not always true on some operating systems
 2017-07-11 15:27:21 +09:00
Dean Herbert
c398ea764a Merge branch 'master' into fix-unit-test-on-linux 2017-07-11 15:17:50 +09:00
Dean Herbert
b2ee7d55b6 Merge pull request #1007 from peppy/fix-osu-logo-transforms 
Fix osu! logo on main menu ending up in the wrong place
 2017-07-11 15:17:32 +09:00
Dean Herbert
e6deef5963 Merge branch 'master' into fix-unit-test-on-linux 2017-07-11 15:12:40 +09:00
Dean Herbert
cbb521e395 Merge master in 2017-07-11 15:11:44 +09:00
Dean Herbert
896582fc06 Update framework 2017-07-11 14:54:24 +09:00
Dean Herbert
a9c50786b2 Fix osu! logo on main menu ending up in the wrong place 
Also switch to using BeginDelayedSequence where possible.
 2017-07-11 13:27:45 +09:00
Dean Herbert
55d999e4a1 Fix comment 2017-07-11 10:45:43 +09:00
Dean Herbert
327327ea92 Remove custom windows configuration from tasks.json 
No longer required as mono 5.0 upwards handles this gracefully (while not yet adding full parallel support).
 2017-07-11 10:43:43 +09:00
Dean Herbert
e9b397f06f Remove assert which is not always true on some operating systems 2017-07-11 10:41:18 +09:00
Dan Balasescu
7f719257d4 Merge pull request #1004 from peppy/update-framework 
Update framework
 2017-07-11 10:38:36 +09:30
Dean Herbert
d6d79432c9 Update framework 2017-07-11 09:59:08 +09:00
Thomas Müller
2d21a7d2bf Merge pull request #1001 from peppy/update-loop-logic 
Update transform usage in line with framework changes
 2017-07-10 13:05:13 +03:00
Thomas Müller
4134f84559 Increase test timeout to 1 minute 2017-07-10 12:54:11 +03:00
Thomas Müller
e8ce3e16b0 Address CI concern 2017-07-10 12:52:29 +03:00
Thomas Müller
7729760017 Add beat timings to TestCaseBeatSyncedContainer 2017-07-10 12:08:15 +03:00
Thomas Müller
d9b362489b Fix incorrect TimeUntilNextBeat and add TimeSinceLastBeat 2017-07-10 12:07:38 +03:00
Thomas Müller
dfb484cfbb Restore altered test cases 2017-07-10 11:57:39 +03:00
Thomas Müller
c4e378571b Update framework 2017-07-10 11:54:23 +03:00
Dean Herbert
0e0c32008b More changes 2017-07-10 15:40:40 +09:00
Dean Herbert
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09: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
15fe01d5ee Update framework 2017-07-10 03:20:05 +09:00
Dean Herbert
8e7e70bd1a Merge branch 'master' into update-loop-logic 2017-07-10 03:19:49 +09:00
Thomas Müller
adf2f1e4c4 Merge pull request #958 from EVAST9919/beatsync_fixes 
TestCase for BeatSyncedContainer
 2017-07-09 20:45:10 +03: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
bde06d466a Merge pull request #980 from Tom94/better-fill-mode 
Set RelativeSizeAxes for updated FillMode behavior
 2017-07-08 22:18:53 +09:00
Thomas Müller
1b55692368 Merge branch 'master' into better-fill-mode 2017-07-08 12:49:46 +03:00
Thomas Müller
9928d9225a Merge pull request #972 from MrTheMake/settingsoverlay-scrollto 
Changes in line with framework updates
 2017-07-08 12:49:28 +03:00
Thomas Müller
45d07e39c1 Update framework & change logic slightly 2017-07-08 12:41:15 +03:00
Thomas Müller
d1ae12b4f7 Merge branch 'master' into settingsoverlay-scrollto 2017-07-08 12:26:08 +03:00
Thomas Müller
912cac318f Update framework 2017-07-08 12:25:18 +03:00
Thomas Müller
178685292a Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode 2017-07-08 12:25:08 +03:00
Dean Herbert
3570ec52a5 Merge pull request #993 from Tom94/better-test-cases 
Update test cases to new framework and fix old crashes
 2017-07-08 02:24:54 -07:00
Thomas Müller
b6f90dada5 Merge branch 'master' into settingsoverlay-scrollto 2017-07-08 12:21:11 +03: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
Dean Herbert
f2fa8dc2d2 Update framework 2017-07-08 18:01:30 +09:00