yugecin 9320767f21 Merge branch 'master' into replaystuff ... # Conflicts: # src/itdelatrisu/opsu/states/Game.java		2017-12-16 16:35:11 +01:00
..
Configuration.java	change back to previous theme song	2017-12-16 13:44:23 +01:00
GenericOption.java	refactor options	2017-03-26 22:57:10 +02:00
ListOption.java	refactor options	2017-03-26 22:57:10 +02:00
NumericOption.java	move bubble notification colors to Colors file	2017-05-26 21:44:23 +02:00
Option.java	option menu: when search filter doesn't have results, ignore it and show an effect on the filter text	2017-05-28 19:30:41 +02:00
OptionGroups.java	add icons to option menu nav	2017-05-28 22:59:48 +02:00
Options.java	Merge branch 'master' into replaystuff	2017-12-16 16:35:11 +01:00
OptionsService.java	move bubble notification colors to Colors file	2017-05-26 21:44:23 +02:00
OptionTab.java	add navigation to optionmenu	2017-05-28 16:11:05 +02:00
ToggleOption.java	refactor options	2017-03-26 22:57:10 +02:00