h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 07:27:25 +08:00
Code Issues Releases Wiki Activity
28,533 Commits 3 Branches 653 Tags 368 MiB
ea0ebc8527
Commit Graph

28533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
4b6c139c3e Toolbar buttons should handle on click, not mouse down. 2016-11-15 15:31:48 +09:00
Dean Herbert
867797a089 Change volume control mouse wheel behaviour to not gain full-screen focus. 2016-11-15 15:22:14 +09:00
Dean Herbert
ff20053e79 Merge pull request #172 from Tom94/better-anchors 
Better anchors
 2016-11-15 14:48:21 +09:00
Dean Herbert
51235343fd Fix ChatConsole regression. 2016-11-15 14:46:57 +09:00
Dean Herbert
abdfe42388 Merge branch 'refs/heads/master' into better-anchors 
# Conflicts:
#	osu.Game.Mode.Osu/UI/OsuComboCounter.cs
#	osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
 2016-11-15 14:33:13 +09:00
Dean Herbert
6777ec2d73 Merge pull request #170 from peppy/project-restructure 
Project restructuring
 2016-11-15 10:05:12 +09:00
Thomas Müller
997bc16d63 Fix incorrect positioning of ButtonSystem. 2016-11-14 19:18:16 +01:00
Huo Yaoyuan
97005e033c cctor->Register 2016-11-15 02:08:02 +08:00
Huo Yaoyuan
dcd3ba0915 Make Player.Autoplay can be set. 2016-11-15 01:49:06 +08:00
Huo Yaoyuan
f2f6fe8e00 Set option object to members. 2016-11-15 01:49:06 +08:00
Huo Yaoyuan
c8d23408d7 Fix ChatLine for now. 2016-11-15 01:49:05 +08:00
Huo Yaoyuan
1cddc4eb5b Use EqualityComparer<T> to avoid boxing and casting when comparing. 2016-11-15 01:49:05 +08:00
Tom94
c860eb25f9 Migrate to new anchor system without x/y reversal. 2016-11-14 17:22:20 +01:00
Dean Herbert
08bf7c6d39 Make abstract ruleset no play mode. 2016-11-15 01:06:53 +09:00
Dean Herbert
e01057df3d Add thread safety somewhere it will never be required. 2016-11-14 23:13:47 +09:00
Dean Herbert
9a8003f6fa Merge remote-tracking branch 'refs/remotes/upstream/master' into project-restructure 
# Conflicts:
#	osu.Game/Beatmaps/Objects/Osu/OsuBaseHit.cs
 2016-11-14 22:08:30 +09:00
Dean Herbert
d3f810f72f Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading). 2016-11-14 22:03:39 +09:00
Dean Herbert
0011d7f720 Simplify linq. 2016-11-14 20:24:44 +09:00
Dean Herbert
5dd4e31011 Move DrawableHitObject. 2016-11-14 19:49:29 +09:00
Dean Herbert
07fee61989 Use reflection to load Rulesets. 2016-11-14 19:20:27 +09:00
Dean Herbert
6c7fab0e31 Fix some remaining naming discrepancies. 2016-11-14 19:20:21 +09:00
Dean Herbert
4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +09:00
Dean Herbert
06f4f93918 Move play modes to Modes namespace. 2016-11-14 18:03:20 +09:00
Thomas Müller
63f0a01888 Merge pull request #169 from peppy/general-fixes 
Update framework & minor fixes.
 2016-11-14 09:31:44 +01:00
Dean Herbert
0f4538f69f Rename GameModes namespace to Screens. 2016-11-14 17:23:33 +09:00
Dean Herbert
f6b13bc322 Update framework. 2016-11-14 16:50:27 +09:00
Dean Herbert
0b203a7bf4 Move enum to end of file. 2016-11-14 16:50:17 +09:00
Dean Herbert
dde3a68c8f Account for anchor when dragging MusicController (fixes VisualTest). 2016-11-14 16:40:13 +09:00
Dean Herbert
1d51e6af2a Merge pull request #168 from huoyaoyuan/fixes 
Fixes for music controller
 2016-11-14 16:11:31 +09:00
Dean Herbert
eb32d842cc Use switch instead of if-else. 2016-11-14 16:10:07 +09:00
Dean Herbert
9cb9f3eb08 Merge pull request #165 from Tom94/options-improvements 
Options improvements
 2016-11-14 16:04:15 +09:00
Dean Herbert
57c4314cae Merge remote-tracking branch 'refs/remotes/upstream/master' into options-improvements 2016-11-14 16:00:06 +09:00
Dean Herbert
c37afd7a81 Merge pull request #166 from Tom94/various-improvements 
Various improvements
 2016-11-14 15:59:17 +09:00
Dean Herbert
464c29ab5e Update framework. 2016-11-14 15:56:22 +09:00
Huo Yaoyuan
86a6c7641d Make TransformDirection more clear. 2016-11-14 04:59:41 +08:00
Huo Yaoyuan
aac968eec8 Update res file with latest manifest. 2016-11-14 04:47:08 +08:00
Huo Yaoyuan
7c8ef2a82b Select and unselect BeatmapPanel when selecting BeatmapGroup. 2016-11-14 04:22:06 +08:00
Huo Yaoyuan
33a35ca711 Do not set WorkingBeatmap explicitly in mode stack. 2016-11-14 04:01:48 +08:00
Huo Yaoyuan
afab938794 Strongly typed TransformDirection for music controller. 2016-11-14 03:21:07 +08:00
Thomas Müller
ac99e2d488 Avoid using load to construct the drawable hierarchy whereever possible. 2016-11-12 18:34:36 +01:00
Thomas Müller
16dc74df5b Avoid stack overflow when trying to push a not-yet async loaded background. 2016-11-12 18:33:47 +01:00
Thomas Müller
1fb3c47646 Merge branch 'master' of github.com:ppy/osu into options-improvements 2016-11-12 14:53:16 +01:00
Thomas Müller
be319707cf Merge pull request #152 from SirCmpwn/options-sidebar-tracking 
Track the visible section in options
 2016-11-12 14:35:00 +01:00
Dean Herbert
75be78752b Merge remote-tracking branch 'refs/remotes/upstream/master' into options-sidebar-tracking 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2016-11-12 22:30:15 +09:00
Thomas Müller
6355c8bd45 Hide scrolldragger in options. 2016-11-12 13:10:53 +01:00
Thomas Müller
1c47773e0d Make sidebar behaviour feel a bit nicer. 2016-11-12 13:08:34 +01:00
Thomas Müller
e923da1998 Fix lastKnownScroll never being written to. 2016-11-12 12:30:12 +01:00
Thomas Müller
98b69bc6c6 Merge branch 'master' of github.com:ppy/osu into SirCmpwn/options-sidebar-tracking 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2016-11-12 12:24:02 +01:00
Thomas Müller
c7f8d2450a Merge pull request #130 from SirCmpwn/dependency-injection 
Dependency injection
 2016-11-12 12:21:29 +01:00
Dean Herbert
cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection 
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
 2016-11-12 20:18:26 +09:00