4796 Commits

Author	SHA1	Message	Date
Damnae	47cd1d486b	Merge branch 'master' into storyboards	2017-09-11 12:29:19 +02:00
Damnae	cd15cfc864	Use case insensitive paths to find storyboard textures.	2017-09-11 12:06:13 +02:00
Damnae	9eaa1cb5cd	Fix sprites not being visible when all their commands are inside loops.	2017-09-11 12:06:00 +02:00
Shane Woolcock	262aea8b6b	Fix osu! logo triangles going super fast when the track is paused	2017-09-11 19:16:44 +09:30
Dean Herbert	ba4b9e3411	Merge branch 'master' into mania-hit-explosions	2017-09-11 18:32:36 +09:00
Dean Herbert	18ad0956b4	Merge branch 'master' into maybefix	2017-09-11 18:23:00 +09:00
Dean Herbert	7b92bbfa86	Merge branch 'master' into mania-hit-explosions	2017-09-11 17:34:14 +09:00
Dean Herbert	838fcca9c4	Merge branch 'master' into mania-hit-explosions	2017-09-11 15:14:35 +09:00
smoogipooo	f3c6f6f959	Merge branch 'blending-equations' into mania-holdnote-niceness	2017-09-11 15:09:01 +09:00
smoogipooo	58c875bdca	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 15:02:12 +09:00
smoogipooo	4683319156	Merge remote-tracking branch 'origin/master' into mania-hit-explosions	2017-09-11 14:48:40 +09:00
Dean Herbert	5ce76d8023	Merge remote-tracking branch 'upstream/master' into judgement-revamp	2017-09-11 14:36:51 +09:00
Dean Herbert	512232c1c8	Fix regression causing autoplay to fail	2017-09-11 14:25:01 +09:00
smoogipooo	0cadee998c	Set default AccentColour for hit objects	2017-09-11 13:44:05 +09:00
Dean Herbert	7170fbd087	Target .NET 4.6.1	2017-09-11 12:39:00 +09:00
Dean Herbert	adba5b5ba6	Merge branch 'master' into beatmap-details-rewrite	2017-09-11 12:30:32 +09:00
Dan Balasescu	24f7b6823e	Merge branch 'master' into nullref-fix	2017-09-11 12:13:43 +09:00
Dean Herbert	eedfbdc0e8	Add nullref check in KeyCounterCollection's Add method	2017-09-11 11:41:09 +09:00
Dean Herbert	8d919e42c9	Fix nullref when loading MusicController VisualTest after Player VisualTest	2017-09-11 11:18:53 +09:00
Dean Herbert	cb24b5c436	Merge branch 'master' into beatmap-details-rewrite	2017-09-11 10:18:34 +09:00
Dean Herbert	f33bd700c5	Fix individual volume controls not being adjustable via wheel ... They were blocking each others' input unnecessarily.	2017-09-11 08:27:29 +09:00
smoogipooo	2086ed209d	Fix hold note tick input.	2017-09-11 04:51:44 +09:00
Damnae	59d9dc5ee7	Ignore storyboard sprites with invalid positions.	2017-09-10 20:08:56 +02:00
smoogipooo	cde22865b9	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 02:42:23 +09:00
Dean Herbert	ea35b69f2f	Merge branch 'master' into fix-mono-crash	2017-09-10 11:49:20 +09:00
Dean Herbert	6d33e39c5e	Merge branch 'master' into beatmap-details-rewrite	2017-09-10 11:26:00 +09:00
Damnae	bc01d9a1b0	Animate Additive / FlipH and FlipV.	2017-09-09 15:41:56 +02:00
Damnae	8d55cb7f92	Improve command sorting.	2017-09-09 11:00:58 +02:00
naoey	0c2bad1de4	Get rid of some properties and todos.	2017-09-09 12:44:27 +05:30
naoey	d12a5e927a	Rename property.	2017-09-09 11:03:25 +05:30
naoey	e67606e203	Return existing download if it exists.	2017-09-09 10:25:28 +05:30
naoey	5f5dd54f9d	Use a List instead of a Dictionary.	2017-09-09 09:56:01 +05:30
naoey	20becbe576	Use the specifically created progress action, add license header.	2017-09-09 01:53:42 +05:30
Damnae	12de737084	Merge branch 'master' into storyboards ... # Conflicts: # osu.Game/Beatmaps/Beatmap.cs	2017-09-08 21:46:34 +02:00
Damnae	57e53ff03a	Fix diff-specific storyboard content being lost after loading.	2017-09-08 21:36:30 +02:00
naoey	5a3814b02e	XMLdoc fixes and a cautionary check.	2017-09-09 01:04:55 +05:30
naoey	0e4973020a	Resharper and test case fixes.	2017-09-09 00:58:54 +05:30
naoey	00306b6e38	Maintain download progress between switching result views. ... - Check for existing download requests on creating DirectPanel - Actually remove downloaded beatmap from results	2017-09-09 00:57:48 +05:30
naoey	31a507372a	Don't show beatmaps that are already added.	2017-09-09 00:57:48 +05:30
naoey	20f93c83d6	Make downloads happen in BeatmapManager.	2017-09-09 00:57:40 +05:30
Damnae	4ab243d885	CI fixes.	2017-09-08 21:23:24 +02:00
Damnae	e8ab853f6f	Make storyboard loops work.	2017-09-08 21:07:40 +02:00
Damnae	e4a2ad5eb5	Fix storyboard sprite flipping.	2017-09-08 20:39:17 +02:00
Dean Herbert	386147cc77	Merge branch 'master' into channelselection-minimum-size	2017-09-09 02:51:47 +09:00
DrabWeb	d95940ed5e	CI fixes.	2017-09-08 14:25:41 -03:00
DrabWeb	ce68b6661e	Update visual test.	2017-09-08 14:15:28 -03:00
MrTheMake	15dd8d9071	Mind the minimum size of the channel selection overlay	2017-09-08 18:21:42 +02:00
Damnae	3f2598543c	Fix CommandLoop start and end time.	2017-09-08 18:03:04 +02:00
MrTheMake	5c125737cb	Fix wrong initial topic color of not joined channels in the channel selection	2017-09-08 17:47:23 +02:00
Dean Herbert	9b790157d8	Merge branch 'master' into non-null-beatmap	2017-09-08 23:33:03 +09:00
Dan Balasescu	3166394a59	Merge branch 'master' into home-hides-overlays	2017-09-08 23:23:20 +09:00
Damnae	e63fb5720c	Make CI happy.	2017-09-08 13:04:53 +02:00
Damnae	6cde687d87	Fix V commands parsing.	2017-09-08 12:36:13 +02:00
MrTheMake	0b1403683b	Moved OnlineScore inside GetScoresRequest.cs	2017-09-08 12:21:35 +02:00
MrTheMake	526ee107b8	Use a method to apply a beatmap, its ruleset and the mods.	2017-09-08 12:17:16 +02:00
Damnae	e02b481c69	An attempt at implementing storyboard loops.	2017-09-08 12:11:57 +02:00
Damnae	13322b4293	Improve compatibility with older storyboards.	2017-09-08 12:09:45 +02:00
Dean Herbert	a528173943	Ensure that WorkingBeatmap's Beatmap is never null ... Also ensures some extra fields inside Beatmap have non-null defaults.	2017-09-08 19:05:14 +09:00
Dean Herbert	80c35801a6	Hide all overlays when home button is pressed	2017-09-08 16:18:57 +09:00
Damnae	e547416193	Storyboards implementation.	2017-09-08 09:08:52 +02:00
MrTheMake	01553fc9ef	Moved all online related score parsing to its class	2017-09-08 02:46:54 +02:00
DrabWeb	55e8bdfb05	CI fixes.	2017-09-07 15:38:23 -03:00
DrabWeb	109531b66c	Cleanup, remove unneeded files.	2017-09-07 15:21:18 -03:00
DrabWeb	2153865de5	Adjust fail on missing logic to match original.	2017-09-07 15:09:50 -03:00
DrabWeb	fd2700a5b4	Fix .00 being displayed for star difficulty when the value is 0.	2017-09-07 15:01:31 -03:00
DrabWeb	5e685ff5b1	Rewrite BeatmapDetails to be more modular for future code sharing.	2017-09-07 14:53:53 -03:00
MrTheMake	e71f907f89	CI fix	2017-09-07 18:36:16 +02:00
MrTheMake	a7f874e5b6	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
MrTheMake	709aa1ed3d	Moved all online score related parsing to its own class	2017-09-07 18:20:14 +02:00
Dean Herbert	b9bec6a983	CI fixes	2017-09-07 23:06:35 +09:00
Dean Herbert	b135dc1f18	Merge remote-tracking branch 'upstream/master' into menu-bar	2017-09-07 22:58:41 +09:00
smoogipooo	19db7a8f72	Update in line with framework changes.	2017-09-07 22:46:21 +09:00
Dean Herbert	41398f57d6	Changes in line with framework	2017-09-07 20:36:32 +09:00
smoogipooo	871ca7520f	Merge remote-tracking branch 'origin/master' into menu-bar	2017-09-07 15:32:01 +09:00
Dean Herbert	af0eaab78c	maybe fix	2017-09-07 01:46:07 +09:00
naoey	69ff4bfa46	Fix startup crash on mono.	2017-09-06 20:04:21 +05:30
Dean Herbert	13c3ef65a8	Merge branch 'master' into fix-mania-input	2017-09-06 23:18:23 +09:00
Dean Herbert	e5308b6247	Method rename	2017-09-06 23:12:32 +09:00
Dean Herbert	da294c9605	Don't use base call when we don't have to	2017-09-06 23:10:08 +09:00
Dean Herbert	4f49a0c183	Simplify action	2017-09-06 22:58:21 +09:00
Dean Herbert	a7fa66b9f9	Fix CI issue	2017-09-06 22:41:03 +09:00
Dean Herbert	940c45b6d1	Fix visual styling and code styling	2017-09-06 21:43:20 +09:00
Dean Herbert	c6fa899b15	Merge remote-tracking branch 'upstream/master' into quit-chat-channels	2017-09-06 21:43:03 +09:00
smoogipooo	06fac913bf	Re-implement EditorMenuBar.	2017-09-06 21:14:29 +09:00
Dean Herbert	e834e0e958	Fix incorrect initialisation order causing mania key bindings to not work	2017-09-06 21:07:57 +09:00
Dean Herbert	4f4b0a1f35	Allow posting to chat in all channels	2017-09-06 20:26:01 +09:00
smoogipooo	df79d8918d	Merge branch 'master' into menu-bar	2017-09-06 18:26:18 +09:00
smoogipooo	0cc443e618	Remove all generic judgements.	2017-09-06 18:05:51 +09:00
smoogipooo	e85d511645	No more partial judgements.	2017-09-06 17:48:01 +09:00
smoogipooo	63b61ce669	Make TimeOffset internal set.	2017-09-06 17:20:51 +09:00
smoogipooo	f158ce814c	Fix state never getting set.	2017-09-06 17:20:41 +09:00
smoogipooo	ac8ec31b61	Make judgements able to be "added" plus make everything compile and run.	2017-09-06 17:02:13 +09:00
Dean Herbert	84c22df3f5	Combine Judgement.HitResults into one.	2017-09-06 17:01:48 +09:00
Dean Herbert	968c61902a	Merge branch 'master' into new-menus	2017-09-05 23:42:33 +09:00
Tom	05f5dfba81	Change difficulty colors and add ExpertPlus ... ExpertPlus is for beatmaps above 6.75*	2017-09-05 13:57:30 +02:00
smoogipooo	b871323ed8	Fix BeatmapGroup initialization not correctly setting panels to Hidden.	2017-09-05 19:26:28 +09:00
smoogipooo	5508fa0fd9	Merge remote-tracking branch 'origin/master' into new-menus	2017-09-05 19:14:42 +09:00
smoogipooo	1904b5edfe	Only store native position instead of input state.	2017-09-05 10:38:19 +09:00
smoogipooo	e9f0762440	Don't query GetContainingInputManager every Update.	2017-09-05 10:29:51 +09:00
smoogipooo	ad966f41f5	Fix CI error.	2017-09-04 15:26:09 +09:00
smoogipooo	722b7419d6	Clamp at the end points.	2017-09-04 15:06:21 +09:00
smoogipooo	04c3801fcc	Add scrolling points so items can be dragged beyond the list.	2017-09-04 14:58:28 +09:00
smoogipooo	2ed20f5a6f	Add better fix for items swapping erratically.	2017-09-04 14:20:40 +09:00
smoogipooo	3b575444be	Rewrite PlaylistList as CompositeDrawable and remove all backwards PlaylistList references ... Now handles drag at a PlaylistList.ItemsScrollContainer level (private class), and PlaylistList itself is no longer a Container so it only supports adding BeatmapSets. Sorry for the rewrite x.x.	2017-09-04 13:12:12 +09:00
smoogipooo	9b0309e683	Use TakeWhile instead of reversing the list.	2017-09-04 11:28:15 +09:00
smoogipooo	9078444a62	Fix items jumping between two indices in the edge case, use a linear search for now.	2017-09-04 11:03:53 +09:00
smoogipooo	c72a9b1301	Merge remote-tracking branch 'origin/master' into pr/n1202_2yangk23	2017-09-04 09:42:24 +09:00
smoogipooo	2a64bcda85	Fix resizing bug(?).	2017-09-04 09:32:44 +09:00
smoogipooo	57678a13d9	Update in-line with framework changes.	2017-09-04 09:32:35 +09:00
Dean Herbert	543a71efcc	Fix ObjectDisposal exceptions due to lingering event binds	2017-09-04 08:21:07 +09:00
Dean Herbert	dd26c80837	Delete -> Hide	2017-09-04 07:59:32 +09:00
Dan Balasescu	19ad5d5328	Merge branch 'master' into song-select-context-menus	2017-09-04 07:56:31 +09:00
Dean Herbert	3ede685ee9	Fix crash on random selection from a previously null selection	2017-09-01 18:44:51 +09:00
Dean Herbert	8e0d18d36f	Add a button to restore all hidden difficulties	2017-09-01 18:26:01 +09:00
Dean Herbert	3d61cde266	Correctly delay loading of PlaySongSelect-specific components	2017-09-01 18:22:38 +09:00
Dean Herbert	f9d02afb00	Don't allow selection of a hidden beatmap	2017-09-01 18:13:21 +09:00
Dean Herbert	1f646e6d54	Add hiding support for beatmap difficulties	2017-09-01 17:57:12 +09:00
Dean Herbert	5a58489adf	Hook up play and edit (kinda)	2017-08-30 21:12:58 +09:00
Dean Herbert	3b4b4b669b	Add framework for deleting difficulties	2017-08-30 21:12:46 +09:00
Dean Herbert	2fb4126ffc	Use BeatmapSetInfo instead of WorkingBeatmap	2017-08-30 20:53:33 +09:00
Dean Herbert	8619f28ced	Add context menu to beatmap difficulty (wip)	2017-08-30 20:41:53 +09:00
Dean Herbert	07da29ea1c	Add context menu to beatmap set header	2017-08-30 20:41:41 +09:00
Kelvin	0e363fce1e	Try to fix stuttering behavior	2017-08-29 22:26:06 -07:00
Dan Balasescu	cabf671811	Merge branch 'master' into menu-bar	2017-08-30 12:31:12 +09:00
Dean Herbert	dba3c9a0e2	Merge branch 'master' into menu-mvvm	2017-08-29 18:37:21 +09:00
Dan Balasescu	0431a9afdd	Merge branch 'master' into menu-mvvm	2017-08-29 18:36:41 +09:00
Dean Herbert	24a2dc3d1e	Don't use child	2017-08-29 18:31:51 +09:00
Dan Balasescu	adfc304a22	Merge branch 'master' into caps-warning	2017-08-29 18:19:50 +09:00
smoogipooo	2535313f4f	Use using.	2017-08-29 18:18:36 +09:00
Dean Herbert	39b5b04700	Don't use Bindable for AccentColour ... Implements IHasAccentColour for conformity to rest of project. Also fixes a nullref when opening the login menu.	2017-08-29 18:17:01 +09:00
smoogipooo	5b8349f90e	Revert DummyWorkingBeatmap changes.	2017-08-29 18:05:27 +09:00
Huo Yaoyuan	fb3ba4fe0c	Add comment for DeletePending.	2017-08-29 16:18:50 +08:00
Kelvin	e5bf3f6a6a	Fix out of bounds	2017-08-29 00:46:11 -07:00
Kelvin	1eb31afd14	Get destination index using binarysearch	2017-08-29 00:39:17 -07:00
Dean Herbert	e53f2cb359	Merge branch 'master' into menu-mvvm	2017-08-29 15:57:19 +09:00
Kelvin	458c3a355f	Rearrange dragging using cheeseburger icon only	2017-08-28 23:28:58 -07:00
Dean Herbert	85f876a934	Remove unused using statement	2017-08-29 15:23:32 +09:00
Kelvin	636492b9cf	Rearrange tracks in OnDrag	2017-08-28 22:59:28 -07:00
Kelvin	12be5b417d	Use MathHelper.Clamp ... - Fix formatting	2017-08-28 22:51:26 -07:00
Huo Yaoyuan	4aa5ce8b41	Always load background and info wedge when no beatmap available.	2017-08-28 17:53:57 +08:00
Huo Yaoyuan	1617189475	Set DummyWorkingBeatmap's DeletePending to true.	2017-08-28 17:53:03 +08:00
smoogipooo	b17d9ac06e	Move EditorMenuBar into the Edit namespace, and fix a minor styling issue.	2017-08-28 17:55:50 +09:00
Kelvin	2f5d8a7f88	Fixed code style errors	2017-08-28 01:08:51 -07:00
Kelvin	97ebf38288	Use PlaylistList to manage Prev/Next tracks	2017-08-28 00:56:03 -07:00
Kelvin	5c3b7ac12c	Allow rearranging playlist tracks	2017-08-28 00:29:44 -07:00
smoogipooo	83fe8514a4	Remove unnecessary exception, replace with default value.	2017-08-28 15:44:05 +09:00
smoogipooo	7bf6d4aa65	Rename DrawableOsuContextMenuItem -> DrawableOsuMenuItem, and move to OsuMenu.	2017-08-28 15:33:24 +09:00
smoogipooo	fc6c682d88	Update in-line with framework changes.	2017-08-28 14:42:52 +09:00
smoogipooo	66db3389f6	Update in line with framework changes.	2017-08-28 12:49:33 +09:00
smoogipooo	b5c1c05af5	Remove poop.	2017-08-28 11:03:51 +09:00
smoogipooo	4385edeb45	Update usages of Menu to reflect ValueChanged events.	2017-08-28 11:01:53 +09:00
Jorolf	9374bf925e	only show warning when focused	2017-08-25 16:39:49 +02:00
Jorolf	26323caf6f	Merge branch 'master' of git://github.com/ppy/osu into caps-warning	2017-08-25 16:33:29 +02:00
Dean Herbert	ee85515d95	Changes in line with framework changes	2017-08-25 19:18:07 +09:00
smoogipooo	3ffc467704	Fix crappy resizing.	2017-08-25 16:27:01 +09:00
smoogipooo	9f02000174	Update FilterControl using new AccentColour definition	2017-08-25 15:58:42 +09:00
smoogipooo	ce644138b9	Update OsuTabControl in line with framework	2017-08-25 15:58:30 +09:00
smoogipooo	a3a5a89636	Update OsuDropdown in line with framework	2017-08-25 15:58:21 +09:00
smoogipooo	e83a554ffc	Update CollectionsDropdown in line with framework	2017-08-25 15:58:09 +09:00
smoogipooo	923ffae42c	Update SlimEnumDropdown in line with framework	2017-08-25 15:57:55 +09:00
smoogipooo	b42c9d21fe	Update LoginSettings in line with framework.	2017-08-25 15:57:43 +09:00
smoogipooo	4fb9570618	Create IHasOsuContextMenu and update OsuContextMenuContainer in line with framework.	2017-08-25 15:10:29 +09:00
smoogipooo	7467d24d35	Update OsuContextMenu in line with framework.	2017-08-25 15:10:12 +09:00
smoogipooo	06c392d6f2	Update OsuMenu in line with framework.	2017-08-25 15:09:07 +09:00
Dean Herbert	782ab81a88	Merge branch 'master' into update-edge-effect-fades	2017-08-25 15:01:01 +09:00
Dean Herbert	70154d1036	Update usage of FadeEdgeEffect ... Improves the visual appearance of DirectPanels' shadows too.	2017-08-25 14:58:19 +09:00
Dean Herbert	c0cf26ed21	Merge branch 'master' into concurrent-overlay-limits	2017-08-25 14:50:45 +09:00
Dan Balasescu	0d7592d9a6	Merge branch 'master' into beatmap-background-disposal-fix	2017-08-25 13:35:38 +09:00
Dean Herbert	72a16e31dd	Remove unnecessary old code	2017-08-25 13:07:10 +09:00
Dan Balasescu	ebf3300cb6	Merge branch 'master' into beatmap-background-disposal-fix	2017-08-25 13:06:33 +09:00
Dan Balasescu	1385a6a969	Merge branch 'master' into correct-direct-toolbar-icon	2017-08-25 13:05:47 +09:00
Dean Herbert	67b3cbce2f	Fix beatmap background being disposed too early ... Causes weird transitions on the music controller	2017-08-25 13:04:32 +09:00
Dean Herbert	86bde4b6b2	Use the correct icon for osu!direct in the toolbar	2017-08-25 13:03:34 +09:00
Dean Herbert	7055cb581d	Load direct panels more asynchronously to avoid stutter	2017-08-25 11:54:35 +09:00
Dean Herbert	ca0d1b79b2	Disallow multiple download requests for the same panel	2017-08-25 11:54:18 +09:00
Dean Herbert	7f617e2c36	Remove downloaded beatmap panels from osu!direct	2017-08-25 11:53:41 +09:00
Dean Herbert	2dd3e51373	Ensure other full-screen overlays are closed when direct is open (and vice-versa)	2017-08-25 10:51:28 +09:00
Jorolf	f8cc4238ff	cleanup code	2017-08-24 22:13:20 +02:00
Dean Herbert	307c4dd392	Merge branch 'master' into direct-downloads	2017-08-24 21:30:38 +09:00
Dean Herbert	febf0348be	Permit nulls to allow test cases to run successfully	2017-08-24 21:26:50 +09:00
Dean Herbert	2b667cf789	Fix typos	2017-08-24 20:32:55 +09:00
Dean Herbert	c9f90efb8a	Add more checks and remove direct cast	2017-08-24 20:31:57 +09:00
Dean Herbert	0082640548	Add missing licence header	2017-08-24 20:25:18 +09:00
Dean Herbert	9adff5f697	Add osu!direct toggle to toolbar	2017-08-24 20:18:47 +09:00
Dean Herbert	32a23c7fe4	Add initial osu!direct beatmap download and import process	2017-08-24 20:16:03 +09:00
Dean Herbert	9c82593c9e	Add cancel event to ProgressNotification	2017-08-24 20:15:45 +09:00
Dean Herbert	3c10b2d3d9	Populate set IDs in GetBeatmapSetsResponse	2017-08-24 20:14:35 +09:00
Dean Herbert	314108146a	Add a download API request	2017-08-24 20:14:17 +09:00
Dean Herbert	cacf256aad	Add placeholder download method with progress bar	2017-08-24 18:51:50 +09:00
Dean Herbert	36629f5207	Make ProgressBar usable in more places than just MusicController	2017-08-24 18:51:34 +09:00
Dean Herbert	a2549157ca	Add hover effects	2017-08-24 18:18:03 +09:00
Dean Herbert	4e1cf329c8	Move background logic to base class; reduce overdraw after set fades in	2017-08-24 17:39:39 +09:00
Dean Herbert	76a95495d3	Move shared code to base class	2017-08-24 17:30:10 +09:00
Dean Herbert	f0635af40d	Add documentation and regions to RulesetInputManager	2017-08-24 15:51:31 +09:00
Dean Herbert	a7a7e0323f	Update autoplay and replay handling to result in actions, not keys	2017-08-24 15:36:42 +09:00
Dean Herbert	189988236b	Move PlayerInputManager logic inside RulesetInputManager	2017-08-24 15:23:17 +09:00
naoey	6291bd5ced	Handle null current channel in setter, update framework.	2017-08-24 10:40:42 +05:30
naoey	3f403ba524	Merge remote-tracking branch 'upstream/master' into quit-chat-channels	2017-08-24 10:06:29 +05:30
naoey	2cace0e1ab	Don't use virtual methods in ctor, always create closeButton.	2017-08-24 09:48:53 +05:30
Dean Herbert	7c3ef81d9c	Merge branch 'master' into mania_reversing	2017-08-23 22:02:25 +09:00