| 
						
					 | 
					
						
						
						
						
							
						
						
							4a64dac6d3
							
						
					 | 
					
						
						
							
							Merge branch 'master' of gitlab.fishrungames.com:salmon-engine-core/engine
						
						
						
						
						
					 | 
					
						2017-02-27 02:27:01 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0bf1c60c9d
							
						
					 | 
					
						
						
							
							ios changes
						
						
						
						
						
					 | 
					
						2017-02-27 02:26:42 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							abff99c491
							
						
					 | 
					
						
						
							
							Added Windows version
						
						
						
						
						
					 | 
					
						2017-01-20 02:59:45 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99a6b3728d
							
						
					 | 
					
						
						
							
							Added support for Android Studio
						
						
						
						
						
					 | 
					
						2017-01-10 07:10:36 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e89f4e3dd3
							
						
					 | 
					
						
						
							
							new xcode update
						
						
						
						
						
					 | 
					
						2014-03-29 09:10:27 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							67bf868991
							
						
					 | 
					
						
						
							
							minor refactoring
						
						
						
						
						
					 | 
					
						2014-01-07 10:35:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							91638909f6
							
						
					 | 
					
						
						
							
							gui manager hacks
						
						
						
						
						
					 | 
					
						2014-01-06 18:57:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a968ce2ad0
							
						
					 | 
					
						
						
							
							ios stuff + keyboard
						
						
						
						
						
					 | 
					
						2014-01-06 07:44:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							33040259bd
							
						
					 | 
					
						
						
							
							Chat messages
						
						
						
						
						
					 | 
					
						2013-12-12 21:07:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							37ba5e51f6
							
						
					 | 
					
						
						
							
							minor fixing
						
						
						
						
						
					 | 
					
						2013-12-01 22:42:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							20f34d89f0
							
						
					 | 
					
						
						
							
							ios stuff
						
						
						
						
						
					 | 
					
						2013-11-24 09:54:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fa0ec572c4
							
						
					 | 
					
						
						
							
							c++11 fixing
						
						
						
						
						
					 | 
					
						2013-11-23 21:27:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b93b6358b5
							
						
					 | 
					
						
						
							
							c++11 fixing
						
						
						
						
						
					 | 
					
						2013-11-23 21:02:55 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3493fc9d63
							
						
					 | 
					
						
						
							
							c++11 fixing
						
						
						
						
						
					 | 
					
						2013-11-23 20:11:53 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db9f155e93
							
						
					 | 
					
						
						
							
							c++11 fixing
						
						
						
						
						
					 | 
					
						2013-11-23 20:03:15 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							94e073eaaa
							
						
					 | 
					
						
						
							
							fixing bugs + InnerOnKeyPress added
						
						
						
						
						
					 | 
					
						2013-11-11 22:12:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec2e6830aa
							
						
					 | 
					
						
						
							
							ios stuff
						
						
						
						
						
					 | 
					
						2013-11-10 22:58:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c0d8650da2
							
						
					 | 
					
						
						
							
							added joystick
						
						
						
						
						
					 | 
					
						2013-11-06 05:49:16 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6d950cab56
							
						
					 | 
					
						
						
							
							line cross line func added
						
						
						
						
						
					 | 
					
						2013-11-05 18:59:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							327a15854c
							
						
					 | 
					
						
						
							
							fixing ui
						
						
						
						
						
					 | 
					
						2013-11-04 06:16:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							144acdd633
							
						
					 | 
					
						
						
							
							ios stuff
						
						
						
						
						
					 | 
					
						2013-08-08 21:09:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9a27aacbab
							
						
					 | 
					
						
						
							
							ios keyboard stuff
						
						
						
						
						
					 | 
					
						2013-07-15 18:44:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e9de663388
							
						
					 | 
					
						
						
							
							Keyboard
						
						
						
						
						
					 | 
					
						2013-06-13 20:42:11 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9195096bcb
							
						
					 | 
					
						
						
							
							keyboard
						
						
						
						
						
					 | 
					
						2013-06-13 08:59:07 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec449cc337
							
						
					 | 
					
						
						
							
							keyboard
						
						
						
						
						
					 | 
					
						2013-06-12 21:10:05 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							95bc7fafac
							
						
					 | 
					
						
						
							
							linux stuff
						
						
						
						
						
					 | 
					
						2013-06-12 19:19:05 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f83fa2be8b
							
						
					 | 
					
						
						
							
							linux stuff
						
						
						
						
						
					 | 
					
						2013-06-12 16:29:18 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							490cdad867
							
						
					 | 
					
						
						
							
							keyboard + linux stuff
						
						
						
						
						
					 | 
					
						2013-06-12 16:09:17 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef3e93beaf
							
						
					 | 
					
						
						
							
							Android stuff
						
						
						
						
						
					 | 
					
						2013-05-28 15:17:21 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							66799311e7
							
						
					 | 
					
						
						
							
							for apple llvm compiler
						
						
						
						
						
					 | 
					
						2013-05-28 04:52:16 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							925225df0e
							
						
					 | 
					
						
						
							
							minor matrix function
						
						
						
						
						
					 | 
					
						2013-05-27 20:15:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							35422db397
							
						
					 | 
					
						
						
							
							minor fixing
						
						
						
						
						
					 | 
					
						2013-05-27 13:24:27 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1e6eeb7e44
							
						
					 | 
					
						
						
							
							fixing bugs with widgets
						
						
						
						
						
					 | 
					
						2013-05-12 20:42:16 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c657c91851
							
						
					 | 
					
						
						
							
							texture manager update + updating panoramic camera
						
						
						
						
						
					 | 
					
						2013-04-18 20:21:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8fdd1da938
							
						
					 | 
					
						
						
							
							Changes for Jedi Knight 2
						
						
						
						
						
					 | 
					
						2013-04-11 20:49:41 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da5bd119ab
							
						
					 | 
					
						
						
							
							ios stuff
						
						
						
						
						
					 | 
					
						2013-03-04 20:27:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							013b1dc344
							
						
					 | 
					
						
						
							
							fixing bugs
						
						
						
						
						
					 | 
					
						2013-03-04 19:09:56 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3c974a33de
							
						
					 | 
					
						
						
							
							network stuff
						
						
						
						
						
					 | 
					
						2013-02-27 14:03:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5d13869324
							
						
					 | 
					
						
						
							
							Added server + network stuff
						
						
						
						
						
					 | 
					
						2013-02-26 13:57:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7d8bcec025
							
						
					 | 
					
						
						
							
							Namespace ST for global vars
						
						
						
						
						
					 | 
					
						2013-02-21 13:14:46 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							61ada33ee1
							
						
					 | 
					
						
						
							
							IoService included
						
						
						
						
						
					 | 
					
						2013-02-21 08:35:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							407ee3868f
							
						
					 | 
					
						
						
							
							ios stuff + need some work
						
						
						
						
						
					 | 
					
						2013-02-20 17:41:51 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a68e798a89
							
						
					 | 
					
						
						
							
							boost::asio for resource manager threads
						
						
						
						
						
					 | 
					
						2013-02-20 05:10:38 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							06652bfa0d
							
						
					 | 
					
						
						
							
							Network stuff and Utils Engine
						
						
						
						
						
					 | 
					
						2013-02-19 12:37:56 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9627247bdc
							
						
					 | 
					
						
						
							
							network stuff
						
						
						
						
						
					 | 
					
						2013-02-16 21:05:10 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bfdaef5643
							
						
					 | 
					
						
						
							
							not need this
						
						
						
						
						
					 | 
					
						2013-02-10 19:08:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							87f4d81238
							
						
					 | 
					
						
						
							
							Cleaning everything
						
						
						
						
						
					 | 
					
						2013-02-10 12:41:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9c85ebd1f8
							
						
					 | 
					
						
						
							
							Android code stuff
						
						
						
						
						
					 | 
					
						2013-02-08 06:23:46 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d412a88f20
							
						
					 | 
					
						
						
							
							Cleaning up
						
						
						
						
						
					 | 
					
						2013-02-06 20:45:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6ec81a421e
							
						
					 | 
					
						
						
							
							ios stuff
						
						
						
						
						
					 | 
					
						2013-02-06 20:37:32 +00:00 | 
					
					
						
						
							
							
							
						
					 |