| 
						
					 | 
					
						
						
						
						
							
						
						
							64faf81a0d
							
						
					 | 
					
						
						
							
							fixed reflector size & android game starting
						
						
						
						
						
					 | 
					
						2018-12-01 19:45:38 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3d0bbe7ca8
							
						
					 | 
					
						
						
							
							interface fixes
						
						
						
						
						
					 | 
					
						2018-12-01 16:05:43 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cee9693119
							
						
					 | 
					
						
						
							
							removed debug code
						
						
						
						
						
					 | 
					
						2018-11-30 13:19:55 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3248d72416
							
						
					 | 
					
						
						
							
							merged gl-reinit, try to fix crash on reiniting
						
						
						
						
						
					 | 
					
						2018-11-29 08:37:06 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							21c4c2a685
							
						
					 | 
					
						
						
							
							save
						
						
						
						
						
					 | 
					
						2018-11-19 00:02:23 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d2431e9f1c
							
						
					 | 
					
						
						
							
							fixes
						
						
						
						
						
					 | 
					
						2018-10-18 20:22:47 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99cd961d44
							
						
					 | 
					
						
						
							
							master
						
						
						
						
						
					 | 
					
						2018-10-18 13:24:17 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a9f6a9be2b
							
						
					 | 
					
						
						
							
							working with screen resizing
						
						
						
						
						
					 | 
					
						2018-10-17 08:59:08 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							55b042a979
							
						
					 | 
					
						
						
							
							working on opengl resources reinitialization
						
						
						
						
						
					 | 
					
						2018-10-15 17:29:14 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ce905daa85
							
						
					 | 
					
						
						
							
							minor fix
						
						
						
						
						
					 | 
					
						2018-10-05 02:34:44 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Emil Kabirov
							
						 
					 | 
					
						
						
						
						
							
						
						
							695f4f7a6d
							
						
					 | 
					
						
						
							
							minor fix
						
						
						
						
						
					 | 
					
						2018-10-05 02:24:55 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ba9cba22eb
							
						
					 | 
					
						
						
							
							fixed bugs, added progress saving, setted MIN API to 19
						
						
						
						
						
					 | 
					
						2018-10-05 02:16:10 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e3daf6c0c
							
						
					 | 
					
						
						
							
							added kotlin plugin for successfull compilation
						
						
						
						
						
					 | 
					
						2018-10-05 00:08:07 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7a2f0154fb
							
						
					 | 
					
						
						
							
							fixed some GUI issues
						
						
						
						
						
					 | 
					
						2018-10-04 06:55:37 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c7290d0d0f
							
						
					 | 
					
						
						
							
							merged
						
						
						
						
						
					 | 
					
						2018-10-03 01:05:22 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8b2950f9fb
							
						
					 | 
					
						
						
							
							added star highlighting, progress saving
						
						
						
						
						
					 | 
					
						2018-10-03 01:03:29 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							650ef4f460
							
						
					 | 
					
						
						
							
							added new stars
						
						
						
						
						
					 | 
					
						2018-10-02 22:45:26 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							216d85cfd7
							
						
					 | 
					
						
						
							
							fix
						
						
						
						
						
					 | 
					
						2018-08-14 18:51:34 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							63049c7d27
							
						
					 | 
					
						
						
							
							added missing header
						
						
						
						
						
					 | 
					
						2018-08-14 17:01:21 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							47c632946d
							
						
					 | 
					
						
						
							
							add cpp code for sound calls
						
						
						
						
						
					 | 
					
						2018-08-14 16:53:02 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							584b48c3ab
							
						
					 | 
					
						
						
							
							added sound players from obj-c
						
						
						
						
						
					 | 
					
						2018-08-13 21:29:26 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4ff8b0b88a
							
						
					 | 
					
						
						
							
							minor fix
						
						
						
						
						
					 | 
					
						2018-08-12 19:18:46 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e7fc943114
							
						
					 | 
					
						
						
							
							added cpp functions for sounds
						
						
						
						
						
					 | 
					
						2018-08-12 19:16:12 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							218ac42d6e
							
						
					 | 
					
						
						
							
							add exaple sounds for native calls
						
						
						
						
						
					 | 
					
						2018-08-09 20:01:49 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db6b60d304
							
						
					 | 
					
						
						
							
							removed unneeded data from CMakeList
						
						
						
						
						
					 | 
					
						2018-08-07 23:25:37 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9ea4ad4b93
							
						
					 | 
					
						
						
							
							minor fix
						
						
						
						
						
					 | 
					
						2018-08-07 23:13:18 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							128c330f48
							
						
					 | 
					
						
						
							
							added example sounds for JNI calls
						
						
						
						
						
					 | 
					
						2018-08-07 23:01:35 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							69cb2f7cd3
							
						
					 | 
					
						
						
							
							workaround to fix broken boost variant, changed minSdkVersion
						
						
						
						
						
					 | 
					
						2018-08-06 21:51:51 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b4b42561eb
							
						
					 | 
					
						
						
							
							fixed debug background images names
						
						
						
						
						
					 | 
					
						2018-08-03 23:55:41 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ea6e4ff654
							
						
					 | 
					
						
						
							
							Major changes
						
						
						
						
						
					 | 
					
						2018-07-23 01:56:46 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d605cf62f6
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.fishrungames.com:salmon-engine-projects/double-hit-balls
						
						
						
						
						
					 | 
					
						2018-07-22 16:36:35 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b054872af9
							
						
					 | 
					
						
						
							
							Ading menu
						
						
						
						
						
					 | 
					
						2018-07-22 16:36:06 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5af1984671
							
						
					 | 
					
						
						
							
							add abi filtres
						
						
						
						
						
					 | 
					
						2018-07-19 16:48:37 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4e35c0e218
							
						
					 | 
					
						
						
							
							Remove console output
						
						
						
						
						
					 | 
					
						2018-07-14 16:53:59 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7d411110a6
							
						
					 | 
					
						
						
							
							Prepare for Android
						
						
						
						
						
					 | 
					
						2018-07-14 15:49:31 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2c8440db52
							
						
					 | 
					
						
						
							
							Adjust for Android
						
						
						
						
						
					 | 
					
						2018-07-14 14:10:13 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ae352e0590
							
						
					 | 
					
						
						
							
							minor changes
						
						
						
						
						
					 | 
					
						2018-06-10 00:51:32 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							74e947b6f3
							
						
					 | 
					
						
						
							
							added levels snapshoting, quick debug loading, some level name refactoring
						
						
						
						
						
					 | 
					
						2018-06-10 00:29:55 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e25f4e3237
							
						
					 | 
					
						
						
							
							need fix at galaxy_menu.cpp #222
						
						
						
						
						
					 | 
					
						2018-06-01 16:45:16 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1abfa608b2
							
						
					 | 
					
						
						
							
							textures fix
						
						
						
						
						
					 | 
					
						2018-05-31 16:47:18 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c8d69040b3
							
						
					 | 
					
						
						
							
							start menu is now working
						
						
						
						
						
					 | 
					
						2018-05-30 16:21:50 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							82812eecb0
							
						
					 | 
					
						
						
							
							level selection dev
						
						
						
						
						
					 | 
					
						2018-05-29 16:44:55 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							457541edf5
							
						
					 | 
					
						
						
							
							level selection dev
						
						
						
						
						
					 | 
					
						2018-05-28 16:31:01 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c97c95baa6
							
						
					 | 
					
						
						
							
							menu interact
						
						
						
						
						
					 | 
					
						2018-05-25 16:51:26 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c30a2115dc
							
						
					 | 
					
						
						
							
							menu proc
						
						
						
						
						
					 | 
					
						2018-05-24 16:44:58 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							95bf02bd36
							
						
					 | 
					
						
						
							
							some menu position math
						
						
						
						
						
					 | 
					
						2018-05-23 16:46:02 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6e610664b0
							
						
					 | 
					
						
						
							
							menu dev
						
						
						
						
						
					 | 
					
						2018-05-22 17:00:30 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0d9d77769c
							
						
					 | 
					
						
						
							
							galaxy obj
						
						
						
						
						
					 | 
					
						2018-05-21 16:19:56 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							16a89a6ae2
							
						
					 | 
					
						
						
							
							assets changes
						
						
						
						
						
					 | 
					
						2018-05-21 12:31:19 +05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d8518bd7b9
							
						
					 | 
					
						
						
							
							background texture scaling
						
						
						
						
						
					 | 
					
						2018-05-17 12:56:46 +05:00 | 
					
					
						
						
							
							
							
						
					 |