h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 16:07:25 +08:00
Code Issues Releases Wiki Activity
37,732 Commits 3 Branches 653 Tags 366 MiB
ffc28256d0
Commit Graph

502 Commits

Author SHA1 Message Date
Dean Herbert
f8448b8b19 Update to support new framework VisualTests structure 2017-08-04 15:37:31 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon 
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
 2017-08-03 14:36:21 +09:00
Dean Herbert
e7e822ecd5 Fix StableStorage having "Songs" in the path twice 2017-08-01 16:37:43 +09:00
Dean Herbert
941f3f0934 Tidy up osu-stable import process 
Now can locate any osu-stable installation using registry lookup (with ample fallbacks). Also uses a much more controlled access method via StableStorage.
 2017-08-01 15:12:38 +09:00
Dean Herbert
f705589bf2 Rename NotificationManager to NotificationOverlay 2017-07-28 15:03:42 +09:00
Dean Herbert
5f53426a9a *Database -> *Store 
Welcome back BeatmapManager
 2017-07-27 16:56:41 +09:00
Dean Herbert
898a601098 Introduce a reference counting file store 2017-07-26 20:22:02 +09:00
Dean Herbert
9e20a02c0a Split out BeatmapDatabase into BeatmapStore 
Hide database functionality at a lower level in preparation from eventually making it private.
 2017-07-26 16:31:34 +09:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02: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
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
e73382f313 Merge branch 'master' into window-icon-lin-mac 2017-07-13 13:03:44 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Dean Herbert
96189fa749 Fix crash on startup for release builds 2017-07-08 16:16:49 +09:00
Vlad K
5602f04611 CI fix 2017-06-27 04:23:58 +03:00
Vlad K
b105d6d741 Insert icon into osu exe 2017-06-27 02:10:00 +03:00
paparony03
62dee59672 Shapes namespace 
Depends on https://github.com/ppy/osu-framework/pull/837
 2017-06-20 15:54:23 +10:00
Dean Herbert
41d4aee4f5 Update nuget packages 
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
 2017-06-13 11:50:46 +09:00
Dean Herbert
fe7ac20e29 Read menu music from osz resource 2017-05-23 16:38:43 +09:00
Huo Yaoyuan
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
Dean Herbert
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
Dean Herbert
ce12cc20bd
Merge remote-tracking branch 'upstream/master' into remove-playmode 2017-04-17 13:00:53 +09:00
Adrian Kaz Scherzinger
60f7879875 Explicitly set C# 6.0 for now. 2017-04-16 06:44:08 +09:00
smoogipooo
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
Dean Herbert
c0338a82e7
Update nuget packages. 
Includes fix in OpenTK for focus issues.
 2017-04-12 19:35:16 +09:00
Dean Herbert
7d7bea7198
Fix crash on restart after update. 
Also make update process more graceful.
 2017-04-11 18:40:39 +09:00
Huo Yaoyuan
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
smoogipooo
15db37d9e0 Cleanup. 2017-04-03 20:27:25 +09:00
smoogipooo
19b5555ef2 Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo. 2017-04-03 20:26:46 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Dean Herbert
e57de373a8
Add opentk to osu.Desktop's packages. 2017-03-31 09:02:55 +09:00
ElegantMonkey
5393525e3c Fix OpenTK hint on project file 2017-03-24 18:29:19 -03:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
smoogipooo
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
Dean Herbert
6f07930110 Move cursor hiding to OsuGameDesktop (fixes headless). 2017-03-18 21:46:58 +09:00
Dean Herbert
0ec166f701
Remove broken dependency. 2017-03-15 21:50:28 +09:00
Dean Herbert
ba10c3a8db
Revert "Merge pull request #441 from tacchinotacchi/archive-reader" 
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
 2017-03-14 11:46:34 +09:00
Huo Yaoyuan
e1bd168c16 Remaining GameMode -> Screen. 2017-03-14 07:22:46 +08:00
Huo Yaoyuan
db104d04d3 Use AutoGenerateBindingRedirects instead of explicit app.config. 2017-03-14 03:20:33 +08:00
Alex Amadori
c84a9d56f5 Fix namespace, comply with naming rules 2017-03-13 11:36:21 +01:00
Alex Amadori
caa6e9c82b General improvements 2017-03-13 11:29:24 +01:00
Alex Amadori
7374839923 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-09 17:07:00 +01:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
dc5ac6e88f
Add missing access modifiers. 2017-03-09 13:55:29 +09:00
Alex Amadori
1acd51cc90 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-08 21:54:17 +01:00
Dean Herbert
5a42035f88
Update license headers. 2017-03-08 15:50:52 +09:00
Alex Amadori
309019aab3 Merge remote tracking branch 'upstream/master' into archive-reader 2017-03-07 08:41:44 +01:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
 2017-03-07 13:50:08 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
Dean Herbert
9106c45858
Fix remaining errors. 2017-03-07 10:42:59 +09:00
Alex Amadori
fd53d10264 Refactor ArchiveReader for extensibility 2017-03-06 23:56:08 +01:00
Dean Herbert
0ee38571a6
Move version-related properties to OsuGameBase. 2017-03-06 17:30:44 +09:00
Dean Herbert
ff51af94ec
Fail on drag drop operations with mixed files. 2017-03-06 15:03:58 +09:00
Dean Herbert
4e4408cd20 Merge branch 'master' into replay 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
 2017-03-05 17:45:03 +09:00
Dean Herbert
65699eb39d
Fix missing .config files from nuspec. 
These are required to correctly redirect dll dependencies.
 2017-03-05 02:48:44 +09:00
Dean Herbert
95e2e2b027
Replay loading via drag-drop huzzah! 2017-03-04 19:02:43 +09:00
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
Dean Herbert
aa9d85624d
Change IPC to make sense. 2017-03-04 18:51:16 +09:00
Dean Herbert
b294386077
Remove misleading beatmap import method. 2017-03-04 16:47:37 +09:00
Dean Herbert
9e1383fa48
Merge remote-tracking branch 'upstream/master' into replay 
# Conflicts:
#	osu.Game.Modes.Catch/CatchRuleset.cs
#	osu.Game.Modes.Mania/ManiaRuleset.cs
#	osu.Game.Modes.Taiko/TaikoRuleset.cs
#	osu.Game/Screens/Play/Player.cs
 2017-03-04 13:17:01 +09:00
Dean Herbert
9a323226e3
Log errors with updating. 2017-03-03 18:09:38 +09:00
Thomas Müller
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor 
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
 2017-03-01 18:05:58 +01:00
Dean Herbert
b6e7e054c3
wankoz 2017-03-01 22:56:20 +09:00
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
default0
03889e6ca6 Update References to FlowStrategies 
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
 2017-02-27 16:55:55 +01:00
Andrey Zavadskiy
9444ffd849 Removed redundant qualifiers 2017-02-27 17:37:38 +03:00
Dean Herbert
a22216d0b0
Update nuget packages. 2017-02-27 20:38:30 +09:00
default0
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Dean Herbert
686372a7f9
Update with framework structural changes. 2017-02-26 20:54:32 +09:00
Dean Herbert
5ff4028c29
Make beatmap importing async. 2017-02-24 18:12:50 +09:00
Dean Herbert
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Thomas Müller
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Dean Herbert
74ea5e7343 Fix updates downloading in non-deploy builds. 2017-02-23 00:41:04 +09:00
Dean Herbert
b744f3a3a7
Re-nest code and handle even more potential exceptions. 2017-02-21 14:15:46 +09:00
Dean Herbert
461a22bccb
Add resiliency to update process when delta patching fails. 2017-02-21 13:52:52 +09:00
Dean Herbert
cbd061d573
Improve appearance of notifications. 2017-02-21 13:52:37 +09:00
Dean Herbert
bc032aa0a6
Catch http errors in full update process (could happen during downloads too). 2017-02-21 12:58:56 +09:00
Andrey Zavadskiy
3106c52098 Removed unnecessary references 2017-02-19 13:25:41 +03:00
Andrey Zavadskiy
f028188398 Merge remote-tracking branch 'refs/remotes/ppy/master' into connection_fix 2017-02-18 13:47:45 +03:00
Andrey Zavadskiy
e803564b5a Added the specific exception 2017-02-18 13:46:47 +03:00
Dean Herbert
bf33cc6f53
Make disclaimer actually be a thing. 2017-02-18 14:16:46 +09:00
Andrey Zavadskiy
2f4855b00f Added exception 2017-02-17 21:07:59 +03:00
Dean Herbert
fe3a6248ec
Add better screen hierarchy and placeholder for dev build disclaimer. 2017-02-17 20:07:16 +09:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen. 2017-02-17 19:23:58 +09:00
Dean Herbert
25e7a08cca
Reset local version and explicitly show release/debug builds. 2017-02-15 13:41:12 +09:00
Dean Herbert
ba7b61521f Merge pull request #354 from peppy/builder 
Deploy automation
 2017-02-15 01:28:05 +09:00
Dean Herbert
f207da6041
Add/update license headers. 2017-02-14 18:17:35 +09:00
Dean Herbert
bad501c018 Merge branch 'master' into builder 2017-02-14 08:35:38 +09:00
Dean Herbert
5c6e895644 Exclude vshost executables from packages. 2017-02-13 21:33:48 +09:00
Dean Herbert
d73c48c73d
Only show first three segments of version (ignore revision number). 2017-02-13 20:23:47 +09:00
Dean Herbert
85e85d32fc
Add dev build footer. 2017-02-13 20:06:51 +09:00
Dean Herbert
f52e9ddb05
Fix escape key being unnecessarily handled by VersionManager. 2017-02-13 19:08:59 +09:00
Dean Herbert
11643d2e09
Remove unnecessary methods and local variables. 2017-02-13 18:30:51 +09:00
Dean Herbert
1aeb48b920
Merge remote-tracking branch 'upstream/master' into osb_loading 2017-02-13 18:22:29 +09:00
Dean Herbert
a073b1db0d very simple build automation. 2017-02-13 01:02:44 +09:00
Dean Herbert
0ff054f887 Bump version. 2017-02-12 20:30:35 +09:00
Thomas Müller
e3f35cd66e Merge branch 'master' into osb_loading 2017-02-12 12:26:25 +01:00
Dean Herbert
01e774b1ec Don't attempt to install/update on a non-installed version for now. 2017-02-12 20:25:42 +09:00
Dean Herbert
874af48de6 Merge remote-tracking branch 'upstream/master' into installer-updater 2017-02-12 17:18:04 +09:00
John Leuenhagen
7ad9cd6b6e
add explicit false values to prevent warnings as errors 2017-02-12 02:32:11 -05:00
Dean Herbert
6aa0e7729c Add icon and window title. 2017-02-12 15:03:36 +09:00
Dean Herbert
045edb6ab7 Add very simple in-game update checker/display. 2017-02-12 14:54:56 +09:00
Dean Herbert
0cd149eda4 Stop using embedded manifest, add AssemblyInfo. 2017-02-12 14:54:07 +09:00
Dean Herbert
49ae976af6 Add squirrel dependencies. 2017-02-12 14:52:10 +09:00
Damnae
a504c73f33 Load beatmap data from an optional osb file. 2017-02-09 15:19:09 +01:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
default0
299c4923c3 Implement Beatmap Import via drag&drop 2017-02-05 13:32:08 +01:00
Drew DeVault
0861eb79e4 Minor cleanups 2017-01-31 19:55:36 -05:00
Drew DeVault
66d104394f Add comments around cwd handling 2017-01-30 09:36:26 -05:00
Drew DeVault
46e7bcef8c Improve beatmap import 2017-01-17 17:05:06 -05:00
Dean Herbert
40ea6e0d72 Fix incorrect folder name. 2016-12-08 21:36:34 +09:00
Dean Herbert
f356640cb7 Add missing licence headers. 2016-12-06 19:07:15 +09:00
Huo Yaoyuan
95600f872d Expression body and spacing. 2016-11-16 10:53:10 +08:00
Huo Yaoyuan
53deaf2a00 Merge branch 'master' 2016-11-16 10:51:39 +08:00
Huo Yaoyuan
97005e033c cctor->Register 2016-11-15 02:08:02 +08: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
4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +09:00
Huo Yaoyuan
aac968eec8 Update res file with latest manifest. 2016-11-14 04:47:08 +08:00
Drew DeVault
1bca78f4b6 Wire up one of the settings to the config 
One step at a time, right
 2016-11-07 22:36:24 -05:00
Dean Herbert
a11d534067 Add beatmap backgrounds. 2016-11-05 20:00:14 +09:00
Drew DeVault
063fdd9a2d Add test data to db for VisualTests 
Also fixes the broken IPC condition
 2016-10-24 14:57:00 -04:00
Dean Herbert
d3a857edb9 Make importing work properly. 
Moves import code to BeatmapDatabase.
 2016-10-24 11:39:53 -04:00
Drew DeVault
8e31965fb4 Refactor beatmap import secondary process 
Doesn't launch a new game window and now supports several files at once.
 2016-10-24 11:39:18 -04:00
Drew DeVault
449f04c07b Refactor the database code 2016-10-18 13:38:27 -04:00
John Leuenhagen
fedfb8a22a
Converted all .cs files to use CRLF line endings. 2016-10-13 23:33:58 -04:00
Drew DeVault
25d08c8e2c Improve beatmap loading and hydration 2016-10-13 10:29:30 -04:00
Drew DeVault
fd10e6e582 Copy imported beatmaps into beatmap storage 2016-10-13 10:15:08 -04:00
Drew DeVault
deff5ad61e Use @strings where appropriate 2016-10-13 12:19:10 +09:00
Drew DeVault
94f2898f52 Implement beatmap sending/receiving over IPC 2016-10-13 12:18:04 +09:00
Drew DeVault
880399f5a5 Fix casing on private properties 2016-10-13 12:17:52 +09:00
Drew DeVault
30f2eeda7c Implement IDisposable in ArchiveReaders 2016-10-13 12:17:18 +09:00
Drew DeVault
e9a45de51f Refactor database to reuse existing types 2016-10-12 11:32:40 -04:00
Drew DeVault
23bc26ddac Implement OszArchiveReader 2016-10-12 11:32:40 -04:00
Drew DeVault
bc69aa1455 Initial support code for beatmap loading 2016-10-12 11:32:40 -04:00
Drew DeVault
2d810f72fa Add initial DB schema and support code 2016-10-12 11:32:07 -04:00
Drew DeVault
eb7486f109 Update osu-framework and specify game name 2016-10-08 10:26:35 -04:00
Dean Herbert
656aee41e2 Never Prefer32bit. 2016-10-08 15:54:04 +09:00
Dean Herbert
4f2bb25853 Remove "Deploy" configuration. 2016-10-08 15:54:03 +09:00
Dean Herbert
a5adbc0615 Update namespace references. 2016-10-08 15:54:02 +09:00
Dean Herbert
e5dc8bad2f Bring up-to-date with latest framework. 2016-10-08 15:53:52 +09:00
Huo Yaoyuan
e75b559eb3 Enhanced app.manifest for Windows 10. 2016-09-24 18:37:28 +08:00
Dean Herbert
49a0e3d9ac Framework namespace rename. 2016-09-04 18:32:19 +09:00
Dean Herbert
81f9ce657f License -> Licence. 2016-08-26 17:27:49 +09:00
Dean Herbert
6cbbeaaac0 Initial commit. 2016-08-26 14:41:47 +09:00