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
c86701f1cc
Merge pull request #353 from Tom94/horizontal-scroll
...
Update framework.
2017-02-13 17:54:04 +09:00
Thomas Müller
aaaf7163e0
Update framework.
2017-02-13 17:46:50 +09:00
Dean Herbert
6e0a2ec7da
Merge pull request #351 from peppy/installer-updater
...
Minor fixes / framework update.
2017-02-12 20:45:11 +09:00
Dean Herbert
c4446c8074
Update licence year.
2017-02-12 20:39:21 +09:00
Dean Herbert
a32bef55bc
Remove line from license which shouldn't have been included in the first place.
2017-02-12 20:37:37 +09:00
Dean Herbert
0ff054f887
Bump version.
2017-02-12 20:30:35 +09:00
Dean Herbert
0793942f6f
Update framework.
2017-02-12 20:26:42 +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
Thomas Müller
ff6838f88c
Merge pull request #349 from peppy/installer-updater
...
Automatic updates.
2017-02-12 12:16:03 +01:00
Dean Herbert
e32ccb6153
Move scene graph init to ctors.
2017-02-12 19:39:54 +09:00
Dean Herbert
5d4be35c5e
Update framework.
2017-02-12 19:20:48 +09:00
Dean Herbert
874af48de6
Merge remote-tracking branch 'upstream/master' into installer-updater
2017-02-12 17:18:04 +09:00
Dean Herbert
f4c6b5cb7f
Merge pull request #348 from ZLima12/warnings-fix
...
Prevent warnings as errors
2017-02-12 16:49:59 +09:00
John Leuenhagen
7ad9cd6b6e
add explicit false values to prevent warnings as errors
2017-02-12 02:32:11 -05:00
Dean Herbert
3d65c468ae
Merge remote-tracking branch 'upstream/master' into installer-updater
2017-02-12 16:30:12 +09:00
Dean Herbert
dd80c3a1bc
Merge pull request #350 from peppy/general-fixes
...
Add null check when loading beatmap background.
2017-02-12 16:27:53 +09:00
Dean Herbert
37e75e9a54
Add null check when loading beatmap background.
2017-02-12 16:13:44 +09: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
870aa2750f
Don't attempt to import command line arguments as beatmaps.
2017-02-12 14:53:33 +09:00
Dean Herbert
49ae976af6
Add squirrel dependencies.
2017-02-12 14:52:10 +09:00
Dean Herbert
ac548dc9ec
Rework notifications to be more flexible.
2017-02-12 14:50:42 +09:00
Dean Herbert
a14b7eb598
NotificationManager should become visible when receiving a notification (until we implement toasts).
2017-02-12 14:50:02 +09:00
Dean Herbert
1c3eca8813
Update framework.
2017-02-12 03:18:15 +09:00
Dean Herbert
b0b4c09181
Merge pull request #345 from Tom94/audio-options
...
Audio options
2017-02-12 01:22:04 +09:00
Thomas Müller
85d3337257
Bump framework
2017-02-11 16:52:26 +01:00
Thomas Müller
d3380631e8
Handle preferred audio device correctly when it is unavailable
...
This commit allows loading, storing, and displaying a preferred audio
device from config even when it is unavailable.
2017-02-11 16:33:54 +01:00
Thomas Müller
d79c8b9695
Update AudioDevicesOptions when devices are found or lost
...
This commit hooks up AudioDevicesOptions to the new events exposed by
the AudioManager of osu-framework. The device list is now updated when
new devices become available or are lost.
2017-02-11 16:29:33 +01:00
Thomas Müller
8394e2ff38
Update OptionDropDown value when items change
...
Items of OptionDropDown could previously already be changes on-the-fly,
but the selected value was not correctly updated (it kept the same index).
This commit addresses this problem.
2017-02-11 16:27:15 +01:00
Thomas Müller
2c4ecb990d
Remove line break in MusicController
2017-02-11 16:23:15 +01:00
Dean Herbert
2da8e8fc9b
Merge pull request #337 from peppy/desktop-unit-tests
...
Unit tests for desktop game project.
2017-02-10 17:27:31 +09:00
Dean Herbert
e23202c449
Merge remote-tracking branch 'upstream/master' into desktop-unit-tests
2017-02-10 17:22:38 +09:00
Dean Herbert
370107142b
Merge pull request #344 from peppy/notifications-manager
...
Implement notifications.
2017-02-10 17:07:30 +09:00
Dean Herbert
398ac6f459
Add assert to ensure complete is only called once.
2017-02-10 16:58:40 +09:00
Dean Herbert
dd8ec70bd5
Remove excess newline.
2017-02-10 16:57:49 +09:00
Dean Herbert
2da5628184
Merge remote-tracking branch 'upstream/master' into notifications-manager
2017-02-10 16:54:56 +09:00
Thomas Müller
0f7cee230b
Merge pull request #343 from peppy/general-fixes
...
Add pink glow to cursor because I can't fucking see it against white.
2017-02-10 08:45:00 +01:00
Dean Herbert
456fc5e375
Update framework.
2017-02-10 16:43:11 +09:00
Dean Herbert
8ec927899f
Implement notifications.
2017-02-10 16:30:23 +09:00
Dean Herbert
d5b7a8ce9e
Add pink glow to cursor because I can't fucking see it against white.
2017-02-10 16:24:40 +09:00
Damnae
a504c73f33
Load beatmap data from an optional osb file.
2017-02-09 15:19:09 +01:00
Dean Herbert
c5cf6a6909
Merge pull request #338 from EVAST9919/warnings_fixes
...
Some Warning Fixes
2017-02-09 22:23:47 +09:00
Andrey Zavadskiy
e06aa44c4c
Warning Fixes
2017-02-09 16:18:08 +03:00
Dean Herbert
4f7069520a
Framework bump.
2017-02-09 19:25:10 +09:00
Dean Herbert
becb65f702
Fix ParallaxContainer breaking with no mouse state present.
2017-02-09 19:25:04 +09:00
Dean Herbert
e0b7517535
Add desktop unit tests project.
2017-02-09 19:24:53 +09:00